872 files changed, 73526 insertions, 97846 deletions

diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml
index 8c0acfad2..aec1d6632 100644
--- a/sdnr/wt/apigateway/feature/pom.xml
+++ b/sdnr/wt/apigateway/feature/pom.xml
@@ -22,41 +22,40 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-apigateway-feature</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
-
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <dependencyManagement>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-apigateway-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-      
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-apigateway-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-apigateway-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-  </dependencies>
+    </dependencies>
 </project>
diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml
index 96888e243..19425cc65 100755
--- a/sdnr/wt/apigateway/installer/pom.xml
+++ b/sdnr/wt/apigateway/installer/pom.xml
@@ -1,115 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-apigateway-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-apigateway-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-apigateway</application.name>
-    <include.transitive.dependencies>false</include.transitive.dependencies>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencies>
+    <properties>
+        <application.name>sdnr-wt-apigateway</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+    <dependencies>
 
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-  </dependencies>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-<!--           <execution> -->
-<!--             <id>copy-dependencies</id> -->
-<!--             <goals> -->
-<!--               <goal>copy-dependencies</goal> -->
-<!--             </goals> -->
-<!--             <phase>prepare-package</phase> -->
-<!--             <configuration> -->
-<!--               <transitive>true</transitive> -->
-<!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-<!--               <overWriteReleases>false</overWriteReleases> -->
-<!--               <overWriteSnapshots>true</overWriteSnapshots> -->
-<!--               <overWriteIfNewer>true</overWriteIfNewer> -->
-<!--               <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--               <addParentPoms>false</addParentPoms> -->
-<!--               <copyPom>false</copyPom> -->
-<!--               <includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
-<!--               <scope>provided</scope> -->
-<!--             </configuration> -->
-<!--           </execution> -->
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-              <!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds>-->
-              <!--<scope>provided</scope>-->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!--           <execution> -->
+                    <!--             <id>copy-dependencies</id> -->
+                    <!--             <goals> -->
+                    <!--               <goal>copy-dependencies</goal> -->
+                    <!--             </goals> -->
+                    <!--             <phase>prepare-package</phase> -->
+                    <!--             <configuration> -->
+                    <!--               <transitive>true</transitive> -->
+                    <!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
+                    <!--               <overWriteReleases>false</overWriteReleases> -->
+                    <!--               <overWriteSnapshots>true</overWriteSnapshots> -->
+                    <!--               <overWriteIfNewer>true</overWriteIfNewer> -->
+                    <!--               <useRepositoryLayout>true</useRepositoryLayout> -->
+                    <!--               <addParentPoms>false</addParentPoms> -->
+                    <!--               <copyPom>false</copyPom> -->
+                    <!--               <includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
+                    <!--               <scope>provided</scope> -->
+                    <!--             </configuration> -->
+                    <!--           </execution> -->
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds>-->
+                            <!--<scope>provided</scope>-->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml
index 8189a2ce8..66b9cb8e9 100755
--- a/sdnr/wt/apigateway/pom.xml
+++ b/sdnr/wt/apigateway/pom.xml
@@ -24,12 +24,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-        <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-apigateway-top</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
@@ -37,6 +31,13 @@
         <relativePath/>
     </parent>
 
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-apigateway-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
     <modules>
         <module>feature</module>
         <module>provider</module>
diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml
index a989874f8..dd133ff55 100644
--- a/sdnr/wt/apigateway/provider/pom.xml
+++ b/sdnr/wt/apigateway/provider/pom.xml
@@ -11,24 +11,27 @@
     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========================================================= -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-apigateway-provider</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
     <properties>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
+
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -49,6 +52,7 @@
         </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <!-- fixed bug for sonarcube -->
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MsServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MsServlet.java
index c0b6c99a2..aee7a3b09 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MsServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MsServlet.java
@@ -38,14 +38,25 @@ public class MsServlet extends BaseServlet {
 	private static Logger LOG = LoggerFactory.getLogger(MsServlet.class);
 	private static final long serialVersionUID = -5361461082028405171L;
 	private static final String OFFLINE_RESPONSE_MESSAGE = "MediatorServer interface is offline";
-	private static final String DATABASE_REQUEST_URI_REGEX = "/mwtn/mediator-server";
+	private static final String DATABASE_REQUEST_URI_REGEX = "/mediator-server/mediator-server";
 	private final DatabaseEntryProvider entryProvider;
+	private boolean isSecure;
+	public void setIsSecure(boolean secure) {
+		if(this.isSecure!=secure) {
+			this.isSecure=secure;
+			this.entryProvider.setBaseUrl(this.getDBBaseUrl());
+		}
+	}
 	public MsServlet() {
 		super();
-		this.entryProvider = new DatabaseEntryProvider("http://localhost:9200/",60);
+		this.entryProvider = new DatabaseEntryProvider(this.getDBBaseUrl(),60);
 		EsServlet.registerRequestCallback(DATABASE_REQUEST_URI_REGEX, this.dbRequestCallback);
 	}
 
+	private String getDBBaseUrl() {
+		return MyProperties.getInstance().getEsBaseUrl();
+	}
+
 	private final IRequestCallback dbRequestCallback = new IRequestCallback() {
 		
 		@Override
@@ -64,7 +75,11 @@ public class MsServlet extends BaseServlet {
 	protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		resp.setStatus(200);
 	}
-
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		super.doGet(req, resp);
+		this.isSecure=req.getScheme().equals("https");
+	}
 	@Override
 	protected String getOfflineResponse() {
 		return OFFLINE_RESPONSE_MESSAGE;
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MyProperties.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MyProperties.java
index 3d66f526e..36fce2081 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MyProperties.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/MyProperties.java
@@ -40,7 +40,7 @@ public class MyProperties {
 	private static final String DEFAULT_AAI_HEADERS = "[\"X-FromAppId:SDNR\",\"Authorization:Basic QUFJOkFBSQ==\"]";
 	private static final String DEFAULT_CORSENABLED = "0";
 	private static final String DEFAULT_TRUSTINSECURE = "0";
-	private static final String DEFAULT_ESDATABASE = "http://localhost:9200";
+	private static final String DEFAULT_ESDATABASE = "http://sdnrdb:9200";
 	private static final String DEFAULT_AAI = "off";
 
 	@Override
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseEntryProvider.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseEntryProvider.java
index 086c3c977..b467e27a0 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseEntryProvider.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseEntryProvider.java
@@ -102,5 +102,8 @@ public class DatabaseEntryProvider implements AutoCloseable {
 		}
 		return s;
 	}
+	public void setBaseUrl(String baseUrl) {
+		this.httpClient.setBaseUrl(baseUrl);
+	}
 
 }
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseHttpClient.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseHttpClient.java
index af46509e9..d0f575362 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseHttpClient.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/DatabaseHttpClient.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 public class DatabaseHttpClient extends BaseHTTPClient {
 
 	private static Logger LOG = LoggerFactory.getLogger(DatabaseHttpClient.class);
-	private static final String URI = "/mwtn/mediator-server/_search";
+	private static final String URI = "/mediator-server/mediator-server/_search";
 	private final Map<String, String> headers;
 
 	public DatabaseHttpClient(String base, boolean trustAllCerts) {
@@ -44,7 +44,7 @@ public class DatabaseHttpClient extends BaseHTTPClient {
 
 	private Map<String, String> getHeaders() {
 		Map<String, String> h = new HashMap<String, String>();
-
+		h.put("Content-Type", "application/json");
 		return h;
 	}
 
@@ -80,4 +80,6 @@ public class DatabaseHttpClient extends BaseHTTPClient {
 		}
 		return entries;
 	}
+
+	
 }
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/http/BaseHTTPClient.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/http/BaseHTTPClient.java
index f8f95b386..9c89eeff3 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/http/BaseHTTPClient.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/database/http/BaseHTTPClient.java
@@ -40,154 +40,161 @@ import org.slf4j.LoggerFactory;
 
 public class BaseHTTPClient {
 
-    private static Logger LOG = LoggerFactory.getLogger(BaseHTTPClient.class);
-    private static final int BUFSIZE = 1024;
-    private static final Charset CHARSET = StandardCharsets.UTF_8;
-    private static final String SSLCONTEXT = "TLSv1.2";
-    private static final int DEFAULT_HTTP_TIMEOUT_MS = 30000; // in ms
-
-    private final boolean trustAll;
-    private final String baseUrl;
-
-    private int timeout = DEFAULT_HTTP_TIMEOUT_MS;
-    private SSLContext sc = null;
-
-    public BaseHTTPClient(String base) {
-        this(base, false);
-    }
-
-
-    public BaseHTTPClient(String base, boolean trustAllCerts) {
-        this.baseUrl = base;
-        this.trustAll = trustAllCerts;
-        try {
-            sc = setupSsl(trustAll);
-        } catch (KeyManagementException | NoSuchAlgorithmException e) {
-            LOG.warn("problem ssl setup: " + e.getMessage());
-        }
-    }
-
-    protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, String body, Map<String, String> headers)
-            throws IOException {
-        return this.sendRequest(uri, method, body != null ? body.getBytes(CHARSET) : null, headers);
-    }
-
-    protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, byte[] body, Map<String, String> headers)
-            throws IOException {
-        if (uri == null) {
-            uri = "";
-        }
-        String surl = this.baseUrl;
-        if (!surl.endsWith("/") && uri.length() > 0) {
-            surl += "/";
-        }
-        if (uri.startsWith("/")) {
-            uri = uri.substring(1);
-        }
-        surl += uri;
-        LOG.debug("try to send request with url=" + this.baseUrl + uri + " as method=" + method);
-        LOG.trace("body:" + (body == null ? "null" : new String(body, CHARSET)));
-        URL url = new URL(surl);
-        URLConnection http = url.openConnection();
-        http.setConnectTimeout(this.timeout);
-        if (surl.toString().startsWith("https")) {
-            if (sc != null) {
-                ((HttpsURLConnection) http).setSSLSocketFactory(sc.getSocketFactory());
-                if (trustAll) {
-                    LOG.debug("trusting all certs");
-                    HostnameVerifier allHostsValid = (hostname, session) -> true;
-                    ((HttpsURLConnection) http).setHostnameVerifier(allHostsValid);
-                }
-            } else // Should never happen
-            {
-                LOG.warn("No SSL context available");
-                return new BaseHTTPResponse(-1, "");
-            }
-        }
-        ((HttpURLConnection) http).setRequestMethod(method);
-        http.setDoOutput(true);
-        if (headers != null && headers.size() > 0) {
-            for (String key : headers.keySet()) {
-                http.setRequestProperty(key, headers.get(key));
-                LOG.trace("set http header " + key + ": " + headers.get(key));
-            }
-        }
-        byte[] buffer = new byte[BUFSIZE];
-        int len = 0, lensum = 0;
-        // send request
-        // Send the message to destination
-        if (!method.equals("GET") && body != null && body.length > 0) {
-            try (OutputStream output = http.getOutputStream()) {
-                output.write(body);
-            }
-        }
-        // Receive answer
-        int responseCode = ((HttpURLConnection) http).getResponseCode();
-        String sresponse = "";
-        InputStream response = null;
-        try {
-            if (responseCode >= 200 && responseCode < 300) {
-                response = http.getInputStream();
-            } else {
-                response = ((HttpURLConnection) http).getErrorStream();
-                if (response == null) {
-                    response = http.getInputStream();
-                }
-            }
-            if (response != null) {
-                while (true) {
-                    len = response.read(buffer, 0, BUFSIZE);
-                    if (len <= 0) {
-                        break;
-                    }
-                    lensum += len;
-                    sresponse += new String(buffer, 0, len, CHARSET);
-                }
-            } else {
-                LOG.debug("response is null");
-            }
-        } catch (Exception e) {
-            LOG.debug("No response. ", e);
-        } finally {
-            if (response != null) {
-                response.close();
-            }
-        }
-        LOG.debug("ResponseCode: " + responseCode);
-        LOG.trace("Response (len:{}): {}", String.valueOf(lensum), sresponse);
-        return new BaseHTTPResponse(responseCode, sresponse);
-    }
-
-  
-    public static SSLContext setupSsl(boolean trustall) throws KeyManagementException, NoSuchAlgorithmException{
-
-        SSLContext sc = SSLContext.getInstance(SSLCONTEXT);
-        TrustManager[] trustCerts = null;
-        if (trustall) {
-            trustCerts = new TrustManager[] {new javax.net.ssl.X509TrustManager() {
-                @Override
-                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                    return null;
-                }
-
-                @Override
-                public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
-
-                @Override
-                public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
-            }};
-
-        }
-        KeyManager[] kms = null;
-        // Init the SSLContext with a TrustManager[] and SecureRandom()
-        sc.init(kms, trustCerts, new java.security.SecureRandom());
-        return sc;
-    }
-
-    public static String getAuthorizationHeaderValue(String username, String password) {
-        return "Basic " + new String(Base64.getEncoder().encode((username + ":" + password).getBytes()));
-    }
-
-  
-  
+	private static Logger LOG = LoggerFactory.getLogger(BaseHTTPClient.class);
+	private static final int BUFSIZE = 1024;
+	private static final Charset CHARSET = StandardCharsets.UTF_8;
+	private static final String SSLCONTEXT = "TLSv1.2";
+	private static final int DEFAULT_HTTP_TIMEOUT_MS = 30000; // in ms
+
+	private final boolean trustAll;
+	private String baseUrl;
+
+	private int timeout = DEFAULT_HTTP_TIMEOUT_MS;
+	private SSLContext sc = null;
+
+	public BaseHTTPClient(String base) {
+		this(base, false);
+	}
+
+	public void setBaseUrl(String baseUrl) {
+		this.baseUrl = baseUrl;
+		try {
+			sc = setupSsl(trustAll);
+		} catch (KeyManagementException | NoSuchAlgorithmException e) {
+			LOG.warn("problem ssl setup: " + e.getMessage());
+		}
+	}
+
+	public BaseHTTPClient(String base, boolean trustAllCerts) {
+		this.baseUrl = base;
+		this.trustAll = trustAllCerts;
+		try {
+			sc = setupSsl(trustAll);
+		} catch (KeyManagementException | NoSuchAlgorithmException e) {
+			LOG.warn("problem ssl setup: " + e.getMessage());
+		}
+	}
+
+	protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, String body, Map<String, String> headers)
+			throws IOException {
+		return this.sendRequest(uri, method, body != null ? body.getBytes(CHARSET) : null, headers);
+	}
+
+	protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, byte[] body, Map<String, String> headers)
+			throws IOException {
+		if (uri == null) {
+			uri = "";
+		}
+		String surl = this.baseUrl;
+		if (!surl.endsWith("/") && uri.length() > 0) {
+			surl += "/";
+		}
+		if (uri.startsWith("/")) {
+			uri = uri.substring(1);
+		}
+		surl += uri;
+		LOG.debug("try to send request with url=" + this.baseUrl + uri + " as method=" + method);
+		LOG.trace("body:" + (body == null ? "null" : new String(body, CHARSET)));
+		URL url = new URL(surl);
+		URLConnection http = url.openConnection();
+		http.setConnectTimeout(this.timeout);
+		if (surl.toString().startsWith("https")) {
+			if (sc != null) {
+				((HttpsURLConnection) http).setSSLSocketFactory(sc.getSocketFactory());
+				if (trustAll) {
+					LOG.debug("trusting all certs");
+					HostnameVerifier allHostsValid = (hostname, session) -> true;
+					((HttpsURLConnection) http).setHostnameVerifier(allHostsValid);
+				}
+			} else // Should never happen
+			{
+				LOG.warn("No SSL context available");
+				return new BaseHTTPResponse(-1, "");
+			}
+		}
+		((HttpURLConnection) http).setRequestMethod(method);
+		http.setDoOutput(true);
+		if (headers != null && headers.size() > 0) {
+			for (String key : headers.keySet()) {
+				http.setRequestProperty(key, headers.get(key));
+				LOG.trace("set http header " + key + ": " + headers.get(key));
+			}
+		}
+		byte[] buffer = new byte[BUFSIZE];
+		int len = 0, lensum = 0;
+		// send request
+		// Send the message to destination
+		if (!method.equals("GET") && body != null && body.length > 0) {
+			try (OutputStream output = http.getOutputStream()) {
+				output.write(body);
+			}
+		}
+		// Receive answer
+		int responseCode = ((HttpURLConnection) http).getResponseCode();
+		String sresponse = "";
+		InputStream response = null;
+		try {
+			if (responseCode >= 200 && responseCode < 300) {
+				response = http.getInputStream();
+			} else {
+				response = ((HttpURLConnection) http).getErrorStream();
+				if (response == null) {
+					response = http.getInputStream();
+				}
+			}
+			if (response != null) {
+				while (true) {
+					len = response.read(buffer, 0, BUFSIZE);
+					if (len <= 0) {
+						break;
+					}
+					lensum += len;
+					sresponse += new String(buffer, 0, len, CHARSET);
+				}
+			} else {
+				LOG.debug("response is null");
+			}
+		} catch (Exception e) {
+			LOG.debug("No response. ", e);
+		} finally {
+			if (response != null) {
+				response.close();
+			}
+		}
+		LOG.debug("ResponseCode: " + responseCode);
+		LOG.trace("Response (len:{}): {}", String.valueOf(lensum), sresponse);
+		return new BaseHTTPResponse(responseCode, sresponse);
+	}
+
+	public static SSLContext setupSsl(boolean trustall) throws KeyManagementException, NoSuchAlgorithmException {
+
+		SSLContext sc = SSLContext.getInstance(SSLCONTEXT);
+		TrustManager[] trustCerts = null;
+		if (trustall) {
+			trustCerts = new TrustManager[] { new javax.net.ssl.X509TrustManager() {
+				@Override
+				public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+					return null;
+				}
+
+				@Override
+				public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+				}
+
+				@Override
+				public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+				}
+			} };
+
+		}
+		KeyManager[] kms = null;
+		// Init the SSLContext with a TrustManager[] and SecureRandom()
+		sc.init(kms, trustCerts, new java.security.SecureRandom());
+		return sc;
+	}
+
+	public static String getAuthorizationHeaderValue(String username, String password) {
+		return "Basic " + new String(Base64.getEncoder().encode((username + ":" + password).getBytes()));
+	}
+
 }
diff --git a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestDatabaseHttpClient.java b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestDatabaseHttpClient.java
index 795228834..791e9bad0 100644
--- a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestDatabaseHttpClient.java
+++ b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestDatabaseHttpClient.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.apigateway.test;
 
 import static org.junit.Assert.*;
diff --git a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestHttpClient.java b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestHttpClient.java
index 6e21bc133..18e84853a 100644
--- a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestHttpClient.java
+++ b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestHttpClient.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.apigateway.test;
 
 import static org.junit.Assert.fail;
diff --git a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestProperties.java b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestProperties.java
index 1a63240d8..6efd06feb 100644
--- a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestProperties.java
+++ b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestProperties.java
@@ -27,6 +27,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.onap.ccsdk.features.sdnr.wt.apigateway.MyProperties;
 
@@ -38,7 +40,7 @@ public class TestProperties {
 	private static final boolean DEFAULT_TRUSTINSECURE = false;
 	private static final String DEFAULT_AAIBASEURL = "off";
 	private static Map<String, String> DEFAULT_AAIHEADERS = new HashMap<String, String>();
-	private static final String DEFAULT_ESBASEURL = "http://localhost:9200";
+	private static final String DEFAULT_ESBASEURL = "http://sdnrdb:9200";
 
 	private static final boolean CUSTOM_CORSENABLED = true;
 	private static final boolean CUSTOM_AAIOFF = false;
@@ -49,10 +51,18 @@ public class TestProperties {
 	private static final String CUSTOM_ESBASEURL = "http://localhost:9200";
 
 	private static final String LR = "\n";
-
+	final String tmpFilename = "tmp2.cfg";
+	
+	@Before
+	@After
+	public void init() {
+		File f = new File(tmpFilename);
+		if(f.exists()) {
+			f.delete();
+		}
+	}
 	@Test
 	public void test() {
-		final String tmpFilename = "tmp2.cfg";
 		DEFAULT_AAIHEADERS.put("X-FromAppId", "SDNR");
 		DEFAULT_AAIHEADERS.put("Authorization", "Basic QUFJOkFBSQ==");
 		CUSTOM_AAIHEADERS.put("X-FromAppId", "SDNC");
@@ -62,9 +72,6 @@ public class TestProperties {
 				+ "\"]" + LR + "database=" + CUSTOM_ESBASEURL + LR + "insecure=" + (CUSTOM_TRUSTINSECURE ? "1" : "0")
 				+ LR + "cors=" + (CUSTOM_CORSENABLED ? "1" : "0");
 		File ftest = new File(tmpFilename);
-		// delete autogenerated testfile
-		if (ftest.exists())
-			ftest.delete();
 		MyProperties prop = null;
 		ftest = new File(tmpFilename);
 		try {
diff --git a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestQueryCallback.java b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestQueryCallback.java
index 78341dfad..3340ec66c 100644
--- a/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestQueryCallback.java
+++ b/sdnr/wt/apigateway/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/apigateway/test/TestQueryCallback.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.apigateway.test;
 
 import static org.junit.Assert.*;
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index 144cb6648..adce977c3 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -16,147 +16,150 @@
     ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-common</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-	<packaging>jar</packaging>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-common</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<properties>
-		<checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
-		<maven.javadoc.skip>true</maven.javadoc.skip>
-		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-		<buildtime>${maven.build.timestamp} UTC</buildtime>
-		<elasticsearch.version>6.4.3</elasticsearch.version>
-		<databaseport>49400</databaseport>
-	</properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-		</license>
-	</licenses>
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <databaseport>49400</databaseport>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId>
-			<version>${elasticsearch.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>${elasticsearch.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
+    </dependencies>
 
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/gen/**</exclude>
-						<exclude>**/generated-sources/**</exclude>
-						<exclude>**/yang-gen-sal/**</exclude>
-						<exclude>**/pax/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generateDTOs</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>${basedir}/../data-provider/database/src/main/resources/es-init.sh</executable>
-							<arguments>
-								<argument>initfile</argument>
-								<argument>-f</argument>
-								<argument>${project.build.directory}/EsInit.script</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.github.alexcojocaru</groupId>
-				<artifactId>elasticsearch-maven-plugin</artifactId>
-				<version>6.14</version>
-				<configuration>
-					<clusterName>testCluster</clusterName>
-					<transportPort>9500</transportPort>
-					<httpPort>${databaseport}</httpPort>
-					<version>6.4.3</version>
-					<pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
-				</configuration>
-				<executions>
-					<execution>
-						<id>start-elasticsearch</id>
-						<phase>process-test-classes</phase>
-						<goals>
-							<goal>runforked</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>stop-elasticsearch</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<systemProperties>
-						<property>
-							<name>databaseport</name>
-							<value>${databaseport}</value>
-						</property>
-					</systemProperties>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../data-provider/database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/EsBaseRequireNetworkElement.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/HtAssert.java
index 7c78a4aed..873b5c947 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/EsBaseRequireNetworkElement.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/HtAssert.java
@@ -6,26 +6,30 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
 
-public class EsBaseRequireNetworkElement extends EsObject {
-    public static final String ESDATATYPENAME = "required-networkelement";
+package org.onap.ccsdk.features.sdnr.wt.common;
 
-    public EsBaseRequireNetworkElement() {
+public class HtAssert {
 
-    }
 
-    public EsBaseRequireNetworkElement(String mountpountName) {
-        super();
-        this.setEsId(mountpountName);
+    public static class HtNullable<T> {
     }
+
+    public static void nonnull(Object ... oList) {
+        for (Object o : oList) {
+            if (o == null) {
+                throw new IllegalArgumentException("Null not allowed here.");
+            }
+        }
+    };
+
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/Resources.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/Resources.java
index 3597f2e57..fe608a503 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/Resources.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/Resources.java
@@ -20,22 +20,15 @@ package org.onap.ccsdk.features.sdnr.wt.common;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
@@ -48,7 +41,7 @@ public class Resources {
     private static final String RESSOURCEROOT = "src/main/resources";
 
     private static URL getFileURL(Class<?> cls,String resFile) {
-    	Bundle b = FrameworkUtil.getBundle(cls);
+        Bundle b = FrameworkUtil.getBundle(cls);
         URL u = null;
         LOG.debug("try to get file {}", resFile);
         if (b == null) {
@@ -83,7 +76,7 @@ public class Resources {
 
     private static String readFile(final InputStream s) throws IOException {
         // read file
-    	final String LR = "\n";
+        final String LR = "\n";
         BufferedReader in = new BufferedReader(new InputStreamReader(s));
         StringBuilder sb = new StringBuilder();
         String inputLine;
@@ -97,7 +90,7 @@ public class Resources {
 
     private static List<URL> getFileURLs(Bundle b,String folder, final String filter, final boolean recursive)
             throws IOException {
-        
+
         List<URL> list = new ArrayList<>();
         if (b == null) {
             FileFilter ff = pathname -> {
@@ -185,7 +178,7 @@ public class Resources {
 //        return list;
 //    }
     public static String getFileContent( Class<?> cls, String resFile) {
-    	 LOG.debug("loading file {} from res", resFile);
+         LOG.debug("loading file {} from res", resFile);
          URL u = getFileURL(cls,resFile);
          String s=null;
          if (u == null) {
@@ -199,7 +192,7 @@ public class Resources {
          }
          return s;
 
-	}
+    }
 //    public static JSONObject getJSONFile(Class<?> cls,String resFile) {
 //        LOG.debug("loading json file {} from res", resFile);
 //        JSONObject o = null;
@@ -269,11 +262,11 @@ public class Resources {
 //        Collection<URL> urlCollection = new ArrayList<>();
 //        URL url = getUrlForRessource(cls,folder);
 //        if(url==null) {
-//        	return Collections.enumeration(urlCollection);
+//            return Collections.enumeration(urlCollection);
 //        }
 //        String path = url.getPath();
 //        File[] files = new File(path).listFiles();
-//        
+//
 //        if (files != null) {
 //            for (File f : files) {
 //                try {
@@ -290,7 +283,7 @@ public class Resources {
 //        }
 //
 //        return Collections.enumeration(urlCollection);
-//        
+//
 //    }
 
     public static URL getUrlForRessource(Class<?> cls,String fileOrDirectory) {
@@ -298,7 +291,7 @@ public class Resources {
         ClassLoader loader = cls.getClassLoader();
         URL url = loader.getResource(fileOrDirectory);
         if(url==null && fileOrDirectory.startsWith("/")) {
-        	url = loader.getResource(fileOrDirectory.substring(1));
+            url = loader.getResource(fileOrDirectory.substring(1));
         }
         return url;
     }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/ResourcesFromDeviceManager.java
index 3a899f884..32a21a801 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Resources.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/ResourcesFromDeviceManager.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.common;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -33,6 +33,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.osgi.framework.Bundle;
@@ -40,14 +41,14 @@ import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Resources {
+public class ResourcesFromDeviceManager {
 
-    private static final Logger LOG = LoggerFactory.getLogger(Resources.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ResourcesFromDeviceManager.class);
 
     private static final String RESSOURCEROOT = "src/main/resources";
 
     private static URL getFileURL(String resFile) {
-        Bundle b = FrameworkUtil.getBundle(Resources.class);
+        Bundle b = FrameworkUtil.getBundle(ResourcesFromDeviceManager.class);
         URL u = null;
         LOG.debug("try to get file {}", resFile);
         if (b == null) {
@@ -61,7 +62,7 @@ public class Resources {
     }
 
     private static File getFile(String resFile) {
-        Bundle b = FrameworkUtil.getBundle(Resources.class);
+        Bundle b = FrameworkUtil.getBundle(ResourcesFromDeviceManager.class);
         File f = null;
         LOG.debug("try to get file {}", resFile);
         if (b == null) {
@@ -96,7 +97,7 @@ public class Resources {
 
     public static List<URL> getFileURLs(String folder, final String filter, final boolean recursive)
             throws IOException {
-        Bundle b = FrameworkUtil.getBundle(Resources.class);
+        Bundle b = FrameworkUtil.getBundle(ResourcesFromDeviceManager.class);
         List<URL> list = new ArrayList<>();
         if (b == null) {
             FileFilter ff = pathname -> {
@@ -213,7 +214,7 @@ public class Resources {
     public static boolean copyFolderInto(String resFolder, String dstFolder, String rootDirToRemove) {
 
         Enumeration<URL> urls = null;
-        Bundle b = FrameworkUtil.getBundle(Resources.class);
+        Bundle b = FrameworkUtil.getBundle(ResourcesFromDeviceManager.class);
         if (b == null) {
             LOG.info("Running in file text.");
             urls = getResourceFolderFiles(resFolder);
@@ -282,8 +283,11 @@ public class Resources {
 
     private static URL getUrlForRessource(String fileOrDirectory) {
         //ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        ClassLoader loader = Resources.class.getClassLoader();
+        ClassLoader loader = ResourcesFromDeviceManager.class.getClassLoader();
         URL url = loader.getResource(fileOrDirectory);
+        if(url==null && fileOrDirectory.startsWith("/")) {
+        	url = loader.getResource(fileOrDirectory.substring(1));
+        }
         return url;
     }
 
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
index a0e21be01..094da6389 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
@@ -50,7 +50,7 @@ public class Section {
     }
 
     public String getProperty(String key) {
-        return this.getProperty(key, null);
+        return this.getProperty(key, "");
     }
 
     public String getProperty(String key, String defValue) {
@@ -61,7 +61,7 @@ public class Section {
     }
 
     public String getName() {
-    	return name;
+        return name;
     }
 
     public void setProperty(String key, String value) {
@@ -70,7 +70,7 @@ public class Section {
             key = key.substring(1);
         }
         if (this.values.containsKey(key)) {
-        	this.values.get(key).setValue(value).setIsUncommented(isuncommented);
+            this.values.get(key).setValue(value).setIsUncommented(isuncommented);
         } else {
             this.values.put(key, new SectionValue(value,isuncommented));
         }
@@ -128,7 +128,7 @@ public class Section {
             lines.add("[" + this.name + "]");
         }
         for (Entry<String, SectionValue> entry : this.values.entrySet()) {
-        	SectionValue sectionValue = entry.getValue();
+            SectionValue sectionValue = entry.getValue();
             if (sectionValue.getComments().size() > 0) {
                 for (String comment : sectionValue.getComments()) {
                     lines.add(comment);
@@ -173,11 +173,11 @@ public class Section {
 
     public Optional<Long> getLong(String key) {
         String v = this.getProperty(key);
-		try {
-			return Optional.of(Long.parseLong(v));
-		} catch (NumberFormatException e) {
-		}
-       	return Optional.empty();
+        try {
+            return Optional.of(Long.parseLong(v));
+        } catch (NumberFormatException e) {
+        }
+           return Optional.empty();
     }
 
     public boolean hasValues() {
@@ -188,9 +188,9 @@ public class Section {
         return this.values.containsKey(key);
     }
 
-	@Override
-	public String toString() {
-		return "Section [name=" + name + ", rawLines=" + rawLines + ", values=" + values + "]";
-	}
+    @Override
+    public String toString() {
+        return "Section [name=" + name + ", rawLines=" + rawLines + ", values=" + values + "]";
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/http/BaseHTTPClient.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClientFromDevicemanager.java
index b0404eed6..e330fb42a 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/http/BaseHTTPClient.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClientFromDevicemanager.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http;
+package org.onap.ccsdk.features.sdnr.wt.common.http;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -45,6 +45,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
 import java.util.Map;
+
 import javax.annotation.Nonnull;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -53,12 +54,13 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.xml.bind.DatatypeConverter;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BaseHTTPClient {
+public class BaseHTTPClientFromDevicemanager {
 
-    private static Logger LOG = LoggerFactory.getLogger(BaseHTTPClient.class);
+    private static Logger LOG = LoggerFactory.getLogger(BaseHTTPClientFromDevicemanager.class);
     private static final int SSLCERT_NONE = -1;
     private static final int SSLCERT_PCKS = 0;
     private static final int SSLCERT_PEM = 1;
@@ -73,15 +75,15 @@ public class BaseHTTPClient {
     private int timeout = DEFAULT_HTTP_TIMEOUT_MS;
     private SSLContext sc = null;
 
-    public BaseHTTPClient(String base) {
+    public BaseHTTPClientFromDevicemanager(String base) {
         this(base, false);
     }
 
-    public BaseHTTPClient(String base, boolean trustAllCerts) {
+    public BaseHTTPClientFromDevicemanager(String base, boolean trustAllCerts) {
         this(base, trustAllCerts, null, null, SSLCERT_NONE);
     }
 
-    public BaseHTTPClient(String base, boolean trustAllCerts, String certFilename, String passphrase, int sslCertType) {
+    public BaseHTTPClientFromDevicemanager(String base, boolean trustAllCerts, String certFilename, String passphrase, int sslCertType) {
         this.baseUrl = base;
         this.trustAll = trustAllCerts;
         try {
@@ -92,12 +94,12 @@ public class BaseHTTPClient {
         }
     }
 
-    protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, String body, Map<String, String> headers)
+    protected @Nonnull BaseHTTPResponseFromDevicemanager sendRequest(String uri, String method, String body, Map<String, String> headers)
             throws IOException {
         return this.sendRequest(uri, method, body != null ? body.getBytes(CHARSET) : null, headers);
     }
 
-    protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, byte[] body, Map<String, String> headers)
+    protected @Nonnull BaseHTTPResponseFromDevicemanager sendRequest(String uri, String method, byte[] body, Map<String, String> headers)
             throws IOException {
         if (uri == null) {
             uri = "";
@@ -126,7 +128,7 @@ public class BaseHTTPClient {
             } else // Should never happen
             {
                 LOG.warn("No SSL context available");
-                return new BaseHTTPResponse(-1, "");
+                return new BaseHTTPResponseFromDevicemanager(-1, "");
             }
         }
         ((HttpURLConnection) http).setRequestMethod(method);
@@ -180,7 +182,7 @@ public class BaseHTTPClient {
         }
         LOG.debug("ResponseCode: " + responseCode);
         LOG.trace("Response (len:{}): {}", String.valueOf(lensum), sresponse);
-        return new BaseHTTPResponse(responseCode, sresponse);
+        return new BaseHTTPResponseFromDevicemanager(responseCode, sresponse);
     }
 
     public static SSLContext setupSsl(boolean trustall)
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/http/BaseHTTPResponse.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponseFromDevicemanager.java
index ddadd1149..0fd0a6459 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/http/BaseHTTPResponse.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponseFromDevicemanager.java
@@ -15,17 +15,17 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http;
+package org.onap.ccsdk.features.sdnr.wt.common.http;
 
-public class BaseHTTPResponse {
+public class BaseHTTPResponseFromDevicemanager {
 
 	public static final int CODE404 = 404;
 	public static final int CODE200 = 200;
-	public static final BaseHTTPResponse UNKNOWN = new BaseHTTPResponse(-1, "");
+	public static final BaseHTTPResponseFromDevicemanager UNKNOWN = new BaseHTTPResponseFromDevicemanager(-1, "");
 	public final int code;
 	public final String body;
 
-	public BaseHTTPResponse(int code,String body)
+	public BaseHTTPResponseFromDevicemanager(int code,String body)
 	{
 		this.code=code;
 		this.body=body;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Environment.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/Environment.java
index b56fe12b3..1ac55ad15 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/Environment.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/Environment.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.common.util;
 
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/FileWatchdog.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java
index 90bb8432a..55fe83300 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/FileWatchdog.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/util/FileWatchdog.java
@@ -30,9 +30,10 @@
  * the License.
  */
 
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.common.util;
 
 import java.io.File;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdnr/wt/data-provider/database/pom.xml b/sdnr/wt/data-provider/database/pom.xml
new file mode 100644
index 000000000..d8812e4ea
--- /dev/null
+++ b/sdnr/wt/data-provider/database/pom.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.data-provider.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-database</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <databaseport>49401</databaseport>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- 		<dependency> -->
+        <!-- 			<groupId>org.json</groupId> -->
+        <!-- 			<artifactId>json</artifactId> -->
+        <!-- 			<scope>provided</scope> -->
+        <!-- 		</dependency> -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-data-provider-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- 		<dependency> -->
+        <!-- 			<groupId>org.elasticsearch.client</groupId> -->
+        <!-- 			<artifactId>elasticsearch-rest-client</artifactId> -->
+        <!-- 			<version>6.4.3</version> -->
+        <!-- 		</dependency> -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/base/netconf/util/InternalConnectionStatus.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/base/netconf/util/InternalConnectionStatus.java
new file mode 100644
index 000000000..81876b75b
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/base/netconf/util/InternalConnectionStatus.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.base.netconf.util;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
+
+public class InternalConnectionStatus {
+	public static ConnectionLogStatus statusFromNodeStatus(ConnectionStatus nodeStatus) {
+		switch(nodeStatus) {
+		case Connected:
+			return ConnectionLogStatus.Connected;
+		case Connecting:
+			return ConnectionLogStatus.Connecting;
+		case UnableToConnect:
+			return ConnectionLogStatus.UnableToConnect;
+		default:
+			return ConnectionLogStatus.Undefined;
+		}
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/NetconfTimeStamp.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/base/netconf/util/NetconfTimeStamp.java
index 94913c40e..4857da661 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/NetconfTimeStamp.java
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/base/netconf/util/NetconfTimeStamp.java
@@ -15,9 +15,9 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util;
+package org.onap.ccsdk.features.sdnr.wt.base.netconf.util;
 
-import java.text.ParseException;
+import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -77,16 +77,16 @@ public class NetconfTimeStamp {
     /**
      * Specify the input format expected from netconf, and from specific devices.
      */
-	private static DateTimeFormatter formatterInput = DateTimeFormatter.ofPattern(""
-		    + "[yyyy-MM-dd'T'HH:mm[:ss][.SSS][.SS][.S][xxx][xx][X][Z]]"
-		    + "[yyyyMMddHHmmss[.SSS][.SS][.S][xxx][xx][X][Z]]"
-			).withZone(ZoneOffset.UTC);
+    private static DateTimeFormatter formatterInput = DateTimeFormatter.ofPattern(""
+            + "[yyyy-MM-dd'T'HH:mm[:ss][.SSS][.SS][.S][xxx][xx][X][Z]]"
+            + "[yyyyMMddHHmmss[.SSS][.SS][.S][xxx][xx][X][Z]]"
+            ).withZone(ZoneOffset.UTC);
 
-	/**
-	 * Specify output format that is used internally
-	 */
-	private static DateTimeFormatter formatterOutput = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.S'Z'")
-			.withZone(ZoneOffset.UTC);
+    /**
+     * Specify output format that is used internally
+     */
+    private static DateTimeFormatter formatterOutput = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.S'Z'")
+            .withZone(ZoneOffset.UTC);
 
     /**
      * Use static access
@@ -112,7 +112,7 @@ public class NetconfTimeStamp {
      * @return String with Date in NETCONF/YANG Format Version 1.0.
      */
     public String getTimeStampAsNetconfString() {
-    	return ZonedDateTime.now(ZoneOffset.UTC).format(formatterOutput);
+        return ZonedDateTime.now(ZoneOffset.UTC).format(formatterOutput);
     }
 
     /**
@@ -143,7 +143,14 @@ public class NetconfTimeStamp {
     public DateAndTime getTimeStamp(Date date) {
         return DateAndTime.getDefaultInstance(getTimeStampAsNetconfString(date));
     }
-
+    /**
+     * Get time from date as NETCONF specific type NETCONF/YANG 1.0 Format in GMT
+     * @param date specifying the date and time
+     * @return DateAndTime Type 1.0. Date in NETCONF/YANG Format Version 1.0.
+     */
+    public DateAndTime getTimeStamp(String date) {
+        return DateAndTime.getDefaultInstance(date);
+    }
 
     /**
      * Return the String with a NETCONF time converted to long
@@ -151,17 +158,16 @@ public class NetconfTimeStamp {
      * @param netconfTime as String according the formats given above
      * @return Epoch milliseconds
      * @throws IllegalArgumentException In case of no compliant time format definition for the string
-     * @throws ParseException Time parsing failed
      */
-	public long getTimeStampFromNetconfAsMilliseconds(String netconfTime) throws IllegalArgumentException {
-		try {
-			long utcMillis = doParse(netconfTime).toInstant().toEpochMilli();
-			return utcMillis;
-		} catch (DateTimeParseException e) {
-			throw new IllegalArgumentException(
-					"No pattern for NETCONF data string: " + netconfTime + " Msg:" + e.getMessage());
-		}
-	   }
+    public long getTimeStampFromNetconfAsMilliseconds(String netconfTime) throws IllegalArgumentException {
+        try {
+            long utcMillis = doParse(netconfTime).toInstant().toEpochMilli();
+            return utcMillis;
+        } catch (DateTimeParseException e) {
+            throw new IllegalArgumentException(
+                    "No pattern for NETCONF data string: " + netconfTime + " Msg:" + e.getMessage());
+        }
+       }
 
     /**
      * Deliver String result.
@@ -171,12 +177,12 @@ public class NetconfTimeStamp {
      *         input" the Input string with the prefix "Maleformed date" is delivered back.
      */
     public String getTimeStampFromNetconf(String netconfTime) {
-		try {
-			String inputUTC = doParse(netconfTime).format(formatterOutput);
-			return inputUTC;
-		} catch (Exception e) {
+        try {
+            String inputUTC = doParse(netconfTime).format(formatterOutput);
+            return inputUTC;
+        } catch (Exception e) {
             LOG.info(e.getMessage());
- 		}
+         }
         LOG.debug("No pattern for NETCONF data string: {}", netconfTime);
         return "Malformed date: " + netconfTime; // Error handling
     }
@@ -185,8 +191,16 @@ public class NetconfTimeStamp {
      * Private functions
      */
 
-	private OffsetDateTime doParse(String netconfTime) {
-		return OffsetDateTime.parse(netconfTime, formatterInput);
-	}
+    private OffsetDateTime doParse(String netconfTime) {
+        return OffsetDateTime.parse(netconfTime, formatterInput);
+    }
+
+    public Date getDateFromNetconf(String netconfTime) {
+        return Date.from(LocalDateTime.parse(netconfTime, formatterInput).atZone(ZoneOffset.UTC).toInstant());
+    }
+
+    public String getTimeStampAsNetconfString(LocalDateTime dt) {
+        return formatterOutput.format(dt);
+    }
 
 }
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter.java
new file mode 100644
index 000000000..ac676024f
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter.java
@@ -0,0 +1,339 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.database;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.DatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+/**
+ * Class to rw yang-tool generated objects into elasticsearch database. For "ES _id" exchange the esIdAddAtributteName is used.
+ * This attribute mast be of type String and contains for read and write operations the object id.
+ * The function can be used without id handling.
+ * If id handling is required the parameter needs to be specified by class definition in yang and  setting the name by using setAttributeName()
+ *
+ * @param <T> Yang tools generated class object.
+ */
+public class EsDataObjectReaderWriter<T extends DataObject> {
+
+ 	private final Logger LOG = LoggerFactory.getLogger(EsDataObjectReaderWriter.class);
+
+ 	/** Typename for elastic search data schema **/
+	private String dataTypeName;
+
+	/** Elasticsearch Database client to be used **/
+	private DatabaseClient db;
+
+	/** Mapper with configuration to use opendaylight yang-tools builder pattern for object creation **/
+	private YangToolsMapper yangtoolsMapper;
+
+	/** Class of T as attribute to allow JSON to Class object mapping **/
+	private Class<T> clazz;
+
+	/** Field is used to write id. If null no id handling **/
+	private @Nullable Field field;
+
+	/** Attribute that is used as id field for the database object **/
+	private @Nullable String esIdAddAtributteName;
+
+	/** Interface to be used for write operations. Rule for write: T extends S and  **/
+	private Class<? extends DataObject> writeInterfaceClazz; // == "S"
+
+	/**
+	 * Elasticsearch database read and write for specific class, defined by opendaylight yang-tools.
+	 *
+	 * @param db Database access client
+	 * @param dataTypeName typename in database schema
+	 * @param clazz class of type to be handled
+	 * @throws ClassNotFoundException
+	 */
+	public EsDataObjectReaderWriter(DatabaseClient db, Entity dataTypeName, Class<T> clazz) throws ClassNotFoundException {
+		this(db, dataTypeName.getName(), clazz);
+	}
+	public EsDataObjectReaderWriter(DatabaseClient db, String dataTypeName, Class<T> clazz) throws ClassNotFoundException {
+		LOG.info("Create {} for datatype {} class {}", this.getClass().getName(), dataTypeName, clazz.getName());
+
+		this.esIdAddAtributteName = null;
+		this.field = null;
+		this.writeInterfaceClazz = clazz;
+		this.db = db;
+		this.dataTypeName = dataTypeName;
+		this.yangtoolsMapper = new YangToolsMapper();
+		//this.yangtoolsMapper.assertBuilderClass(clazz);
+		this.clazz = clazz;
+//
+//		if (! db.isExistsIndex(dataTypeName)) {
+//			throw new IllegalArgumentException("Index "+dataTypeName+" not existing.");
+//		}
+	}
+
+	public String getDataTypeName() {
+		return dataTypeName;
+	}
+	public Class<T> getClazz() {
+		return clazz;
+	}
+	/**
+	 * Simlar to {@link #setEsIdAttributeName()}, but adapts the parameter to yangtools attribute naming schema
+	 * @param esIdAttributeName is converted to UnderscoreCamelCase
+	 * @return this for further operations.
+	 */
+	public EsDataObjectReaderWriter<T> setEsIdAttributeNameCamelized(String esIdAttributeName) {
+		return setEsIdAttributeName(YangToolsMapper.toCamelCaseAttributeName(esIdAttributeName));
+	}
+
+	/**
+	 * Attribute name of class that is containing the object id
+	 * @param esIdAttributeName of the implementation class for the yangtools interface.
+	 *        Expected attribute name format is CamelCase with leading underline. @
+	 * @return this for further operations.
+	 * @throws SecurityException if no access or IllegalArgumentException if wrong type or no attribute with this name.
+	 */
+	public EsDataObjectReaderWriter<T> setEsIdAttributeName(String esIdAttributeName) {
+		LOG.debug("Set attribute '{}'", esIdAttributeName);
+		this.esIdAddAtributteName = null; // Reset status
+		this.field = null;
+
+		Field attributeField;
+		try {
+			Builder<T> builder = yangtoolsMapper.getBuilder(clazz);
+			T object = builder.build();
+			attributeField = object.getClass().getDeclaredField(esIdAttributeName);
+			if (attributeField.getType().equals(String.class)) {
+				attributeField.setAccessible(true);
+				this.esIdAddAtributteName = esIdAttributeName; //Set new status if everything OK
+				this.field = attributeField;
+			} else {
+				String msg = "Wrong field type " + attributeField.getType().getName() + " of " + esIdAttributeName;
+				LOG.debug(msg);
+				throw new IllegalArgumentException(msg);
+			}
+		} catch (NoSuchFieldException e) {
+			// Convert to run-time exception
+			String msg = "NoSuchFieldException for '" + esIdAttributeName + "' in class " + clazz.getName();
+			LOG.debug(msg);
+			throw new IllegalArgumentException(msg);
+		} catch (SecurityException e) {
+			LOG.debug("Access problem "+esIdAttributeName,e);
+			throw e;
+		}
+		return this;
+	}
+
+	/**
+	 * Specify subclass of T for write operations.
+	 * @param writeInterfaceClazz
+	 */
+	public EsDataObjectReaderWriter<T> setWriteInterface( @Nonnull Class<? extends DataObject> writeInterfaceClazz ) {
+		LOG.debug("Set write interface to {}", writeInterfaceClazz);
+		if (writeInterfaceClazz == null)
+			throw new IllegalArgumentException("Null not allowed here.");
+
+		this.writeInterfaceClazz = writeInterfaceClazz;
+		return this;
+	}
+
+	/**
+	 * Write child object to database with specific id
+	 * @param object
+	 * @param @Nullable esId use the id or if null generate unique id
+	 * @return String with id or null
+	 */
+	public @Nullable <S extends DataObject> String write(S object, @Nullable String esId) {
+		if (writeInterfaceClazz.isInstance(object)) {
+			try {
+				String json = yangtoolsMapper.writeValueAsString(object);
+				return db.doWriteRaw(dataTypeName, esId, json);
+			} catch (JsonProcessingException e) {
+				LOG.error("Write problem: ", e);
+			}
+		} else {
+			LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+					writeInterfaceClazz.getName());
+		}
+		return null;
+	}
+	/**
+	 * Update partial child object to database with match/term query
+	 * @param object
+	 * @param esId
+	 * @return String with esId or null
+	 */
+	public @Nullable <S extends DataObject> String update(S object, QueryBuilder query) {
+		if (writeInterfaceClazz.isInstance(object)) {
+			try {
+				String json = yangtoolsMapper.writeValueAsString(object);
+				return db.doUpdate(this.dataTypeName,json,query);
+			} catch (JsonProcessingException e) {
+				LOG.error("Update problem: ", e);
+			}
+		} else {
+			LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+					writeInterfaceClazz.getName());
+		}
+		return null;
+	}
+	/**
+	 * Write/ update partial child object to database with specific id Write if not
+	 * exists, else update
+	 * @param object
+	 * @param esId
+	 * @return String with esId or null
+	 */
+	public @Nullable <S extends DataObject> String update(S object, String esId) {
+		return this.update(object, esId,null);
+	}
+	public @Nullable <S extends DataObject> String update(S object, String esId,List<String> onylForInsert) {
+		if (writeInterfaceClazz.isInstance(object)) {
+			try {
+				String json = yangtoolsMapper.writeValueAsString(object);
+				return db.doUpdateOrCreate(dataTypeName, esId, json,onylForInsert);
+			} catch (JsonProcessingException e) {
+				LOG.error("Update problem: ", e);
+			}
+		} else {
+			LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+					writeInterfaceClazz.getName());
+		}
+		return null;
+	}
+
+    /**
+     * Read object from database, by using the id field
+     * @param object
+     * @return
+     */
+    public @Nullable T read(String esId) {
+    	@Nullable T res = (T)null;
+		if (esId != null) {
+			String json = db.doReadJsonData(dataTypeName, esId);
+			try {
+				res = yangtoolsMapper.readValue(json.getBytes(), clazz);
+			} catch (IOException e) {
+				LOG.error("Problem: ", e);
+			}
+		}
+        return res;
+    }
+
+    /**
+     * Remove object
+     * @param esId to identify the object.
+     * @return success
+     */
+    public boolean remove(String esId) {
+    	return db.doRemove(this.dataTypeName, esId);
+    }
+
+	public int remove(QueryBuilder query) {
+		return this.db.doRemove(this.dataTypeName, query);
+	}
+    /**
+     * Get all elements of related type
+     * @return all Elements
+     */
+    public SearchResult<T> doReadAll() {
+        return doReadAll(null);
+    }
+    public SearchResult<T> doReadAll(QueryBuilder query) {
+    	return this.doReadAll(query,false);
+	}
+    /**
+     * Read all existing objects of a type
+     * @param query for the elements
+     * @return the list of all objects
+     */
+
+    public SearchResult<T> doReadAll(QueryBuilder query, boolean ignoreException) {
+
+    	SearchResult<T> res = new SearchResult<T>();
+        int idx = 0;                //Idx for getAll
+        int iterateLength = 100;    //Step width for iterate
+
+        SearchResult<SearchHit> result;
+        List<SearchHit> hits;
+        do {
+            if(query!=null) {
+                LOG.debug("read data in {} with query {}",dataTypeName,query.toJSON());
+                result=db.doReadByQueryJsonData( dataTypeName, query,ignoreException);
+            }
+            else {
+            	result = db.doReadAllJsonData(dataTypeName,ignoreException);
+            }
+            hits=result.getHits();
+            LOG.debug("Read: {} elements: {}  Failures: {}",dataTypeName,hits.size(), yangtoolsMapper.getMappingFailures());
+
+            T object;
+            idx += result.getHits().size();
+			for (SearchHit hit : hits) {
+				object = getT(hit.getSourceAsString());
+				LOG.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n Failures: {}", hit.getId(),
+						hit.getSourceAsString(), object, yangtoolsMapper.getMappingFailures());
+				if (object != null) {
+					setEsId(object, hit.getId());
+					res.add(object);
+				} else {
+					LOG.warn("Mapp result null Object: {}\n Source: '{}'\n : '", hit.getId(), hit.getSourceAsString());
+				}
+			}
+
+		} while (hits.size() == iterateLength); // Do it until end indicated, because less hits than iterateLength
+												// allows.
+        res.setTotal(result.getTotal());
+        return res;
+    }
+
+	/* ---------------------------------------------
+     * Private functions
+     */
+
+	private void setEsId(T object, String esId) {
+		if (field != null) {
+			try {
+				field.set(object, esId);
+			} catch (IllegalArgumentException | IllegalAccessException e) {
+				LOG.debug("Field set problem.", e);			}
+		}
+	}
+
+    private @Nullable T getT(String jsonString) {
+    	try {
+			return yangtoolsMapper.readValue( jsonString, clazz );
+		} catch (IOException e) {
+			LOG.info("Mapping problem", e);
+			return (T)null;
+		}
+    }
+
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter2.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter2.java
new file mode 100644
index 000000000..b585b0c60
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/EsDataObjectReaderWriter2.java
@@ -0,0 +1,360 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.database;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.common.database.DatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+/**
+ * Class to rw yang-tool generated objects into elasticsearch database. For "ES _id" exchange the esIdAddAtributteName is used.
+ * This attribute mast be of type String and contains for read and write operations the object id.
+ * The function can be used without id handling.
+ * If id handling is required the parameter needs to be specified by class definition in yang and  setting the name by using setAttributeName()
+ *
+ * Due to using Jackson base interfaces the org.eclipse.jdt.annotation.NonNull needs to be used here to get rid of warnings
+ *
+ * @param <T> Yang tools generated class object.
+ */
+public class EsDataObjectReaderWriter2<T extends DataObject> {
+
+     private final Logger LOG = LoggerFactory.getLogger(EsDataObjectReaderWriter2.class);
+
+     /** Typename for elastic search data schema **/
+    private String dataTypeName;
+
+    /** Elasticsearch Database client to be used **/
+    private DatabaseClient db;
+
+    /** Mapper with configuration to use opendaylight yang-tools builder pattern for object creation **/
+    private YangToolsMapper2<T> yangtoolsMapper;
+
+    /** Class of T as attribute to allow JSON to Class object mapping **/
+    private Class<T> clazz;
+
+    /** Field is used to write id. If null no id handling **/
+    private @Nullable Field field;
+
+    /** Attribute that is used as id field for the database object **/
+    private @Nullable String esIdAddAtributteName;
+
+    /** Interface to be used for write operations. Rule for write: T extends S and  **/
+    private Class<? extends DataObject> writeInterfaceClazz; // == "S"
+
+    /**
+     * Elasticsearch database read and write for specific class, defined by opendaylight yang-tools.
+     *
+     * @param db Database access client
+     * @param dataTypeName typename in database schema
+     * @param clazz class of type to be handled
+     * @throws ClassNotFoundException
+     */
+    public <X extends T, @NonNull B extends Builder<X>> EsDataObjectReaderWriter2(DatabaseClient db, Entity dataTypeName, @Nonnull Class<T> clazz, @Nullable  Class<B> builderClazz) throws ClassNotFoundException {
+        this(db, dataTypeName.getName(), clazz, builderClazz);
+    }
+    public <X extends T, @NonNull B extends Builder<X>> EsDataObjectReaderWriter2(DatabaseClient db, Entity dataTypeName, @Nonnull Class<T> clazz) throws ClassNotFoundException {
+        this(db, dataTypeName.getName(), clazz, null);
+    }
+    public <X extends T, @NonNull  B extends Builder<X>> EsDataObjectReaderWriter2(DatabaseClient db, String dataTypeName, @Nonnull Class<T> clazz, @Nullable Class<B>  builderClazz) throws ClassNotFoundException {
+        LOG.info("Create {} for datatype {} class {}", this.getClass().getName(), dataTypeName, clazz.getName());
+
+        this.esIdAddAtributteName = null;
+        this.field = null;
+        this.writeInterfaceClazz = clazz;
+        this.db = db;
+        this.dataTypeName = dataTypeName;
+        this.yangtoolsMapper = new YangToolsMapper2<>(clazz, builderClazz);
+        this.clazz = clazz;
+    }
+
+    /**
+     * Simlar to {@link #setEsIdAttributeName()}, but adapts the parameter to yangtools attribute naming schema
+     * @param esIdAttributeName is converted to UnderscoreCamelCase
+     * @return this for further operations.
+     */
+    public EsDataObjectReaderWriter2<T> setEsIdAttributeNameCamelized(String esIdAttributeName) {
+        return setEsIdAttributeName(YangToolsMapper.toCamelCaseAttributeName(esIdAttributeName));
+    }
+
+    /**
+     * Attribute name of class that is containing the object id
+     * @param esIdAttributeName of the implementation class for the yangtools interface.
+     *        Expected attribute name format is CamelCase with leading underline. @
+     * @return this for further operations.
+     * @throws SecurityException if no access or IllegalArgumentException if wrong type or no attribute with this name.
+     */
+    public EsDataObjectReaderWriter2<T> setEsIdAttributeName(String esIdAttributeName) {
+        LOG.debug("Set attribute '{}'", esIdAttributeName);
+        this.esIdAddAtributteName = null; // Reset status
+        this.field = null;
+
+        Field attributeField;
+        try {
+            Builder<T> builder = yangtoolsMapper.getBuilder(clazz);
+            if (builder == null) {
+                String msg = "No builder for " + clazz;
+                LOG.debug(msg);
+                throw new IllegalArgumentException(msg);
+            } else {
+                T object = builder.build();
+                attributeField = object.getClass().getDeclaredField(esIdAttributeName);
+                if (attributeField.getType().equals(String.class)) {
+                    attributeField.setAccessible(true);
+                    this.esIdAddAtributteName = esIdAttributeName; // Set new status if everything OK
+                    this.field = attributeField;
+                } else {
+                    String msg = "Wrong field type " + attributeField.getType().getName() + " of " + esIdAttributeName;
+                    LOG.debug(msg);
+                    throw new IllegalArgumentException(msg);
+                }
+            }
+        } catch (NoSuchFieldException e) {
+            // Convert to run-time exception
+            String msg = "NoSuchFieldException for '" + esIdAttributeName + "' in class " + clazz.getName();
+            LOG.debug(msg);
+            throw new IllegalArgumentException(msg);
+        } catch (SecurityException e) {
+            LOG.debug("Access problem "+esIdAttributeName,e);
+            throw e;
+        }
+        return this;
+    }
+
+    /**
+     * Specify subclass of T for write operations.
+     * @param writeInterfaceClazz
+     */
+    public EsDataObjectReaderWriter2<T> setWriteInterface( @Nonnull Class<? extends DataObject> writeInterfaceClazz ) {
+        LOG.debug("Set write interface to {}", writeInterfaceClazz);
+        if (writeInterfaceClazz == null) {
+            throw new IllegalArgumentException("Null not allowed here.");
+        }
+
+        this.writeInterfaceClazz = writeInterfaceClazz;
+        return this;
+    }
+
+    public interface IdGetter<S extends DataObject> {
+        String getId(S object);
+    }
+
+    public <S extends DataObject> void write(List<S> objectList, IdGetter<S> idGetter) {
+        for (S object : objectList) {
+            write(object, idGetter.getId(object));
+        }
+    }
+
+    /**
+     * Write child object to database with specific id
+     * @param object
+     * @param @Nullable esId use the id or if null generate unique id
+     * @return String with id or null
+     */
+    public @Nullable <S extends DataObject> String write(S object, @Nullable String esId) {
+        if (writeInterfaceClazz.isInstance(object)) {
+            try {
+                String json = yangtoolsMapper.writeValueAsString(object);
+                return db.doWriteRaw(dataTypeName, esId, json);
+            } catch (JsonProcessingException e) {
+                LOG.error("Write problem: ", e);
+            }
+        } else {
+            LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+                    writeInterfaceClazz.getName());
+        }
+        return null;
+    }
+    /**
+     * Update partial child object to database with match/term query
+     * @param object
+     * @param esId
+     * @return String with esId or null
+     */
+    public @Nullable <S extends DataObject> String update(S object, QueryBuilder query) {
+        if (writeInterfaceClazz.isInstance(object)) {
+            try {
+                String json = yangtoolsMapper.writeValueAsString(object);
+                return db.doUpdate(this.dataTypeName,json,query);
+            } catch (JsonProcessingException e) {
+                LOG.error("Update problem: ", e);
+            }
+        } else {
+            LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+                    writeInterfaceClazz.getName());
+        }
+        return null;
+    }
+    /**
+     * Write/ update partial child object to database with specific id Write if not
+     * exists, else update
+     * @param object
+     * @param esId
+     * @return String with esId or null
+     */
+    public @Nullable <S extends DataObject> String update(S object, String esId) {
+        return this.updateOrCreate(object, esId,null);
+    }
+    /**
+     * See {@link doUpdateOrCreate(String dataTypeName, String esId, String json, List<String> doNotUpdateField) }
+     */
+    public @Nullable <S extends DataObject> String updateOrCreate(S object, String esId,List<String> onlyForInsert) {
+        if (writeInterfaceClazz.isInstance(object)) {
+            try {
+                String json = yangtoolsMapper.writeValueAsString(object);
+                return db.doUpdateOrCreate(dataTypeName, esId, json,onlyForInsert);
+            } catch (JsonProcessingException e) {
+                LOG.error("Update problem: ", e);
+            }
+        } else {
+            LOG.error("Type {} does not provide interface {}", object!=null?object.getClass().getName():"null",
+                    writeInterfaceClazz.getName());
+        }
+        return null;
+    }
+
+    /**
+     * Read object from database, by using the id field
+     * @param object
+     * @return
+     */
+    public @Nullable T read(String esId) {
+        @Nullable
+        T res = null;
+        if (esId != null) {
+            String json = db.doReadJsonData(dataTypeName, esId);
+            if (json != null) {
+                try {
+                    res = yangtoolsMapper.readValue(json.getBytes(), clazz);
+                } catch (IOException e) {
+                    LOG.error("Problem: ", e);
+                }
+            } else {
+                LOG.debug("Can not read from DB id {} type {}", esId, dataTypeName);
+            }
+        }
+        return res;
+    }
+
+    /**
+     * Remove object
+     * @param esId to identify the object.
+     * @return success
+     */
+    public boolean remove(String esId) {
+        return db.doRemove(this.dataTypeName, esId);
+    }
+
+    public int remove(QueryBuilder query) {
+        return this.db.doRemove(this.dataTypeName, query);
+    }
+    /**
+     * Get all elements of related type
+     * @return all Elements
+     */
+    public SearchResult<T> doReadAll() {
+        return doReadAll(null);
+    }
+    public SearchResult<T> doReadAll(QueryBuilder query) {
+        return this.doReadAll(query,false);
+    }
+    /**
+     * Read all existing objects of a type
+     * @param query for the elements
+     * @return the list of all objects
+     */
+
+    public SearchResult<T> doReadAll(QueryBuilder query, boolean ignoreException) {
+
+        SearchResult<T> res = new SearchResult<>();
+        int idx = 0;                //Idx for getAll
+        int iterateLength = 100;    //Step width for iterate
+
+        SearchResult<SearchHit> result;
+        List<SearchHit> hits;
+        do {
+            if(query!=null) {
+                LOG.debug("read data in {} with query {}",dataTypeName,query.toJSON());
+                result=db.doReadByQueryJsonData( dataTypeName, query,ignoreException);
+            }
+            else {
+                result = db.doReadAllJsonData(dataTypeName,ignoreException);
+            }
+            hits=result.getHits();
+            LOG.debug("Read: {} elements: {}  Failures: {}",dataTypeName,hits.size(), yangtoolsMapper.getMappingFailures());
+
+            T object;
+            idx += result.getHits().size();
+            for (SearchHit hit : hits) {
+                object = getT(hit.getSourceAsString());
+                LOG.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n Failures: {}", hit.getId(),
+                        hit.getSourceAsString(), object, yangtoolsMapper.getMappingFailures());
+                if (object != null) {
+                    setEsId(object, hit.getId());
+                    res.add(object);
+                } else {
+                    LOG.warn("Mapp result null Object: {}\n Source: '{}'\n : '", hit.getId(), hit.getSourceAsString());
+                }
+            }
+
+        } while (hits.size() == iterateLength); // Do it until end indicated, because less hits than iterateLength
+                                                // allows.
+        res.setTotal(result.getTotal());
+        return res;
+    }
+
+    /* ---------------------------------------------
+     * Private functions
+     */
+
+    private void setEsId(T object, String esId) {
+        if (field != null) {
+            try {
+                field.set(object, esId);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                LOG.debug("Field set problem.", e);            }
+        }
+    }
+
+    private @Nullable T getT(String jsonString) {
+        try {
+            return yangtoolsMapper.readValue( jsonString, clazz );
+        } catch (IOException e) {
+            LOG.info("Mapping problem", e);
+            return null;
+        }
+    }
+
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/config/EsConfig.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/config/EsConfig.java
new file mode 100644
index 000000000..c828f3302
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/database/config/EsConfig.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.database.config;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo.Protocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EsConfig implements Configuration {
+
+	private static final Logger LOG = LoggerFactory.getLogger(EsConfig.class);
+
+	public static final String SECTION_MARKER_ES = "es";
+
+	private static final String PROPERTY_KEY_DBHOSTS = "esHosts";
+	private static final String PROPERTY_KEY_ARCHIVE_LIMIT = "esArchiveLifetimeSeconds";
+	private static final String PROPERTY_KEY_CLUSTER = "esCluster";
+	private static final String PROPERTY_KEY_ARCHIVE_INTERVAL = "esArchiveCheckIntervalSeconds";
+	private static final String PROPERTY_KEY_NODE = "esNode";
+
+	private static String defaultHostinfo = printHosts(new HostInfo[] { new HostInfo("sdnrdb", 9200, Protocol.HTTP) });
+	private static final String DEFAULT_VALUE_CLUSTER = "";
+	/** check db data in this interval [in seconds] 0 deactivated */
+	private static final String DEFAULT_ARCHIVE_INTERVAL_SEC = "0";
+	/** keep data for this time [in seconds] 30 days */
+	private static final String DEFAULT_ARCHIVE_LIMIT_SEC = String.valueOf(60L * 60L * 24L * 30L);
+	private static final String DEFAULT_KEY_NODE = "elasticsearchnode";
+
+	private final ConfigurationFileRepresentation configuration;
+
+	public EsConfig(ConfigurationFileRepresentation configuration) {
+
+		this.configuration = configuration;
+		this.configuration.addSection(SECTION_MARKER_ES);
+		defaults();
+	}
+
+	/*
+	 * Setter
+	 */
+
+	public void setNode(String nodeName) {
+		configuration.setProperty(SECTION_MARKER_ES, PROPERTY_KEY_NODE, nodeName);
+	}
+
+	/*
+	 * Getter
+	 */
+
+	public String getNode() {
+		return configuration.getProperty(SECTION_MARKER_ES, PROPERTY_KEY_NODE);
+	}
+
+	public HostInfo[] getHosts() {
+		String dbHosts = configuration.getProperty(SECTION_MARKER_ES, PROPERTY_KEY_DBHOSTS);
+		return parseHosts(dbHosts);
+	}
+	public void setHosts(HostInfo[] hosts) {
+		this.configuration.setProperty(SECTION_MARKER_ES, PROPERTY_KEY_DBHOSTS, printHosts(hosts));
+	}
+	public String getCluster() {
+		return configuration.getProperty(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_INTERVAL);
+	}
+
+	public void setCluster(String cluster) {
+		configuration.setProperty(SECTION_MARKER_ES, PROPERTY_KEY_CLUSTER, cluster);
+	}
+
+	public long getArchiveCheckIntervalSeconds() {
+		return configuration.getPropertyLong(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_INTERVAL).orElse(0L);
+	}
+
+	public void setArchiveCheckIntervalSeconds(long seconds) {
+		configuration.setProperty(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_INTERVAL, seconds);
+	}
+
+	public long getArchiveLifetimeSeconds() {
+		return configuration.getPropertyLong(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_LIMIT).orElse(0L);
+	}
+
+	public void setArchiveLimit(long seconds) {
+		configuration.setProperty(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_LIMIT, seconds);
+	}
+
+	@Override
+	public String getSectionName() {
+		return SECTION_MARKER_ES;
+	}
+
+	@Override
+	public void defaults() {
+		// Add default if not available
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_ES, PROPERTY_KEY_DBHOSTS, defaultHostinfo);
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_LIMIT,
+				DEFAULT_ARCHIVE_LIMIT_SEC);
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_ES, PROPERTY_KEY_CLUSTER, DEFAULT_VALUE_CLUSTER);
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_ES, PROPERTY_KEY_ARCHIVE_INTERVAL,
+				DEFAULT_ARCHIVE_INTERVAL_SEC);
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_ES, PROPERTY_KEY_NODE, DEFAULT_KEY_NODE);
+	}
+
+	/** @TODO Shift to own class **/
+	private static String printHosts(HostInfo[] h) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < h.length; i++) {
+			sb.append(h[i].toUrl());
+			if (i != h.length - 1) {
+				sb.append(",");
+			}
+		}
+		return sb.toString();
+	}
+
+	/** @TODO Shift to own class **/
+	private static HostInfo[] parseHosts(String string) {
+		List<HostInfo> infos = new ArrayList<HostInfo>();
+		String[] list = string.split(",");
+		if (list.length > 0) {
+			for (String item : list) {
+				try {
+					URL url = new URL(item);
+					infos.add(new HostInfo(url.getHost(), url.getPort(), Protocol.getValueOf(url.getProtocol())));
+				} catch (MalformedURLException e) {
+					LOG.warn("problem parsing url {} : {}", item, e.getMessage());
+				}
+			}
+		}
+		HostInfo[] a = new HostInfo[infos.size()];
+		return infos.toArray(a);
+	}
+
+	@Override
+	public String toString() {
+		return "EsConfig [getNode()=" + getNode() + ", getHosts()=" + Arrays.toString(getHosts()) + ", getCluster()="
+				+ getCluster() + ", getArchiveCheckIntervalSeconds()=" + getArchiveCheckIntervalSeconds()
+				+ ", getArchiveLifetimeSeconds()=" + getArchiveLifetimeSeconds() + ", getSectionName()="
+				+ getSectionName() + "]";
+	}
+
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner.java
new file mode 100644
index 000000000..1ac19ff34
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.yangtools;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class YangToolsCloner {
+
+	private static YangToolsMapper yangtoolsMapper = new YangToolsMapper();
+	private static final Logger LOG = LoggerFactory.getLogger(YangToolsCloner.class);
+	public static final int ACCESSOR_FIELD = 0;
+	public static final int ACCESSOR_METHOD = 1;
+
+
+	private final int accessor;
+
+	private YangToolsCloner(int ac) {
+		this.accessor = ac;
+	}
+	public static YangToolsCloner instance() {
+		return instance(ACCESSOR_METHOD);
+	}
+	public static YangToolsCloner instance(int ac) {
+		return new YangToolsCloner(ac);
+	}
+	/**
+	 *
+     * @param source source object
+	 * @param clazz Class of return object
+	 * @return list of cloned object
+	 * @return
+	 */
+	public <S extends DataObject, T extends DataObject> List<T> cloneList(List<S> source, Class<T> clazz) {
+		return cloneList(source, clazz, null);
+	}
+
+	/**
+	 *
+	 * @param source source object
+	 * @param clazz Class of return object
+	 * @attrList filter for attribute Names to clone
+	 * @return list of cloned object
+	 */
+	public <S extends DataObject, T extends DataObject> List<T> cloneList(List<S> source, Class<T> clazz,
+			@Nullable List<String> attrList) {
+		if (source == null) {
+			return null;
+		}
+		List<T> list = new ArrayList<T>();
+		for (S s : source) {
+			list.add(clone(s, clazz, attrList));
+		}
+		return list;
+	}
+
+	/**
+	 *
+	 * @param source source object
+	 * @param clazz Class of return object
+	 * @return cloned object
+	 */
+	public <S , T extends DataObject> T clone(S source, Class<T> clazz) {
+		return clone(source, clazz, null);
+	}
+	/**
+	 *
+	 * @param source source object
+	 * @param clazz Class of return object
+	 * @attrList if empty copy all else list of attribute Names to clone
+	 * @return cloned object
+	 */
+	public <S, T extends DataObject> T clone(S source, Class<T> clazz,
+			@Nullable List<String> attrList) {
+		if (source == null) {
+			return (T)null;
+		}
+		Field[] attributeFields;
+		Field sourceField;
+		Method m;
+		Builder<T> builder = yangtoolsMapper.getBuilder(clazz);
+		T object = builder.build();
+		attributeFields = object.getClass().getDeclaredFields();
+		for (Field attributeField : attributeFields) {
+			// check if attr is in inclusion list
+			if (attrList != null && !attrList.contains(attributeField.getName())) {
+				continue;
+			}
+			// ignore QNAME
+			if (attributeField.getName().equals("QNAME")) {
+				continue;
+			}
+
+			attributeField.setAccessible(true);
+			try {
+				if(accessor==ACCESSOR_FIELD) {
+					sourceField = source.getClass().getDeclaredField(attributeField.getName());
+					sourceField.setAccessible(true);
+					if (attributeField.getType().equals(String.class) && !sourceField.getType().equals(String.class)) {
+						attributeField.set(object, String.valueOf(sourceField.get(source)));
+					} else {
+						attributeField.set(object, sourceField.get(source));
+					}
+				}
+				else if(accessor==ACCESSOR_METHOD) {
+					String getter = getter(attributeField.getName());
+					System.out.println("getter="+getter);
+					m = source.getClass().getDeclaredMethod(getter);
+					m.setAccessible(true);
+					if (attributeField.getType().equals(String.class) && !m.getReturnType().equals(String.class)) {
+						attributeField.set(object, String.valueOf(m.invoke(source)));
+					} else {
+						attributeField.set(object, m.invoke(source));
+					}
+				}
+
+			} catch (NoSuchMethodException | NoSuchFieldException e) {
+				// Convert to run-time exception
+				String msg = "no such field " + attributeField.getName() + " in class " + source.getClass().getName();
+				LOG.debug(msg);
+				// throw new IllegalArgumentException(msg);
+			} catch (IllegalAccessException|SecurityException e) {
+				LOG.debug("Access problem " + attributeField.getName(), e);
+			} catch (IllegalArgumentException e) {
+				LOG.debug("argument problem " + attributeField.getName(), e);
+			} catch (InvocationTargetException e) {
+				LOG.debug("invocation problem " + attributeField.getName(), e);
+			}
+		}
+
+		return object;
+	}
+
+	private static String getter(String name) {
+		return String.format("%s%s%s","get",name.substring(1, 2).toUpperCase(),name.substring(2));
+	}
+	public <S extends DataObject, T extends DataObject,B extends Builder<T>> B cloneToBuilder(S source, B builder){
+		return cloneToBuilder(source, builder,null);
+	}
+	public <S extends DataObject, T extends DataObject,B extends Builder<T>> B  cloneToBuilder(S source, B builder,
+			@Nullable List<String> attrList) {
+		Field[] attributeFields;
+		Field sourceField;
+		Method m;
+		attributeFields = builder.getClass().getDeclaredFields();
+		for (Field attributeField : attributeFields) {
+			// check if attr is in inclusion list
+			if (attrList != null && !attrList.contains(attributeField.getName())) {
+				continue;
+			}
+			// ignore QNAME
+			if (attributeField.getName().equals("QNAME")) {
+				continue;
+			}
+
+			attributeField.setAccessible(true);
+			try {
+				if(accessor==ACCESSOR_FIELD) {
+					sourceField = source.getClass().getDeclaredField(attributeField.getName());
+					sourceField.setAccessible(true);
+					if (attributeField.getType().equals(String.class) && !sourceField.getType().equals(String.class)) {
+						attributeField.set(builder, String.valueOf(sourceField.get(source)));
+					} else {
+						attributeField.set(builder, sourceField.get(source));
+					}
+				}
+				else if(accessor==ACCESSOR_METHOD) {
+					m = source.getClass().getDeclaredMethod(getter(attributeField.getName()));
+					m.setAccessible(true);
+					if (attributeField.getType().equals(String.class) && !m.getReturnType().equals(String.class)) {
+						attributeField.set(builder, String.valueOf(m.invoke(source)));
+					} else {
+						attributeField.set(builder, m.invoke(source));
+					}
+				}
+
+			} catch (NoSuchMethodException | NoSuchFieldException e) {
+				// Convert to run-time exception
+				String msg = "no such field " + attributeField.getName() + " in class " + source.getClass().getName();
+				LOG.debug(msg);
+				// throw new IllegalArgumentException(msg);
+			} catch (IllegalAccessException|SecurityException e) {
+				LOG.debug("Access problem " + attributeField.getName(), e);
+			} catch (IllegalArgumentException e) {
+				LOG.debug("argument problem " + attributeField.getName(), e);
+			} catch (InvocationTargetException e) {
+				LOG.debug("invocation problem " + attributeField.getName(), e);
+			}
+		}
+		return builder;
+	}
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner2.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner2.java
new file mode 100644
index 000000000..37d7aa4ad
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsCloner2.java
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.yangtools;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class YangToolsCloner2 {
+
+	private static final Logger LOG = LoggerFactory.getLogger(YangToolsCloner2.class);
+
+    public enum Accessor {
+    	ACCESSOR_FIELD,
+    	ACCESSOR_METHOD;
+    }
+
+	private Accessor accessor;
+
+	public YangToolsCloner2() {
+		LOG.info("Provide new {}",this.getClass().getName());
+		this.accessor = Accessor.ACCESSOR_METHOD;
+	}
+
+	YangToolsCloner2 setAcessor(Accessor accessor) {
+		this.accessor = accessor;
+		return this;
+	}
+
+	Accessor getAccessor() {
+		return accessor;
+	}
+
+	public interface Builder<T> {
+		T build();
+	}
+
+	/**
+	 *
+	 * @param source source object
+	 * @param clazz Class of return object
+	 * @attrList filter for attribute Names to clone
+	 * @return list of cloned object
+	 * @throws Exception
+	 */
+	public <S, T> List<T> cloneList(List<S> source, Builder<T> builder, String ... attrList) throws Exception {
+		if (source == null) {
+			return null;
+		}
+		List<T> list = new ArrayList<T>();
+		for (S s : source) {
+			list.add(copyAttributes(s, builder.build(), attrList));
+		}
+		return list;
+	}
+
+	/**
+	 * Copy attributes from source to destination object.
+	 * Copy the references.
+	 * @param source source object
+	 * @param clazz Class of return object
+	 * @attrList attribute Names NOT to clone.
+	 * @return cloned object
+	 * @throws Exception
+	 */
+	@SuppressWarnings("null")
+	public @Nullable <S, T> T copyAttributes(S source, T destination, String ... attributeArray) throws Exception {
+
+		LOG.debug("copyAttributes source.class {} destination.class {} attributes {}", source, destination, attributeArray.length);
+
+		if (destination == null || source == null)
+			return null;
+
+		List<String> attributeList = Arrays.asList(attributeArray);
+		LOG.debug("copyAttributes 2 attributes {}", attributeList);
+
+		Field[] destinationAttributeFields = source.getClass().getDeclaredFields();
+		String destinationName;
+		Class<?> destinationType;
+		for (Field destinationAttributeField : destinationAttributeFields) {
+			destinationName = destinationAttributeField.getName();
+			destinationType = destinationAttributeField.getType();
+			LOG.debug("Field: {}", destinationName);
+			// check if attr is in exclusion list
+			if (attributeList.contains(destinationName)) {
+				continue;
+			}
+			// ignore QNAME
+			if (destinationName.equals("QNAME")) {
+				continue;
+			}
+
+			destinationAttributeField.setAccessible(true);
+			Object sourceData = null;
+			Class<?> sourceType = null;
+			Class<?> sourceListType = null;
+			try {
+				if (accessor == Accessor.ACCESSOR_FIELD) {
+					Field sourceField;
+					sourceField = source.getClass().getDeclaredField(destinationName);
+					sourceField.setAccessible(true);
+					sourceType = sourceField.getType();
+					sourceData = sourceField.get(source);
+					sourceListType = getListClass(sourceType, sourceData);
+
+				} else if (accessor == Accessor.ACCESSOR_METHOD) {
+					Method sourceMethod;
+					sourceMethod = source.getClass().getDeclaredMethod(getter(destinationName));
+					sourceMethod.setAccessible(true);
+					sourceType = sourceMethod.getReturnType();
+					sourceData = sourceMethod.invoke(source);
+					sourceListType = getListClass(sourceType, sourceData);
+				}
+				LOG.info("Handle {} {} {}", destinationName, destinationType, sourceType);
+				if (destinationType == sourceType) {
+					destinationAttributeField.set(destination, sourceData);
+				} else {
+					throw new Exception(
+							"Problem to copy attribute " + destinationName
+							+" Sourceclass:" +sourceType
+							+" Destinationclass:" + destinationType
+							+" Method:"+accessor.name());
+				}
+			} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException
+					| NoSuchMethodException | InvocationTargetException e) {
+				throw e;
+			}
+		}
+		return destination;
+
+	}
+
+	private static String getter(String name) {
+		if (name == null || name.length() == 0) {
+			return null;
+		} else if (name.length() == 1) {
+			return String.format("%s%s", "get", name.substring(1, 2).toUpperCase());
+		} else { // >= 2
+			return String.format("%s%s%s", "get", name.substring(1, 2).toUpperCase(), name.substring(2));
+		}
+	}
+
+	private static Class<?> getListClass(Class<?> sourceType, Object sourceData) {
+		if (sourceData != null && sourceType.equals(List.class)) {
+			List<Object> sourceDataList = (List<Object>)sourceData;
+			if (sourceDataList.size() > 0) {
+				LOG.info("Is list with type"+sourceDataList.get(0).getClass().getName());
+			} else {
+				LOG.info("Is empty list");
+			}
+		}
+	    return(sourceType);
+	}
+
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper.java
new file mode 100644
index 000000000..8306cb7d4
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper.java
@@ -0,0 +1,226 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.yangtools;
+
+import java.io.IOException;
+import javax.annotation.Nullable;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder.Value;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+/**
+ * YangToolsMapper is a specific Jackson mapper configuration for opendaylight yangtools serialization or deserialization of DataObject to/from JSON
+ * TODO ChoiceIn and Credentials deserialization only for LoginPasswordBuilder
+ */
+public class YangToolsMapper extends ObjectMapper {
+
+ 	private final Logger LOG = LoggerFactory.getLogger(YangToolsMapper.class);
+	private static final long serialVersionUID = 1L;
+	private static BundleContext context;
+
+	public YangToolsMapper() {
+		super();
+		configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+		setSerializationInclusion(Include.NON_NULL);
+		setAnnotationIntrospector(new YangToolsBuilderAnnotationIntrospector());
+		SimpleModule dateAndTimeSerializerModule = new SimpleModule();
+		dateAndTimeSerializerModule.addSerializer(DateAndTime.class,new CustomDateAndTimeSerializer());
+		registerModule(dateAndTimeSerializerModule );
+		Bundle bundle = FrameworkUtil.getBundle(YangToolsMapper.class);
+		context = bundle != null ? bundle.getBundleContext() : null;
+	}
+
+	@Override
+	public String writeValueAsString(Object value) throws JsonProcessingException {
+		// TODO Auto-generated method stub
+		return super.writeValueAsString(value);
+	}
+	/**
+	 * Get Builder object for yang tools interface.
+	 * @param <T> yang-tools base datatype
+	 * @param clazz class with interface.
+	 * @return builder for interface or null if not existing
+	 */
+	@SuppressWarnings("unchecked")
+	public @Nullable <T extends DataObject> Builder<T> getBuilder(Class<T> clazz) {
+		String builder = clazz.getName() + "Builder";
+		try {
+			Class<?> clazzBuilder = findClass(builder);
+			return (Builder<T>) clazzBuilder.newInstance();
+		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+			LOG.debug("Problem ", e);
+			return null;
+		}
+	}
+
+	/**
+	 * Callback for handling mapping failures.
+	 * @return
+	 */
+	public int getMappingFailures() {
+		return 0;
+	}
+
+	/**
+	 * Provide mapping of string to attribute names, generated by yang-tools.
+	 * "netconf-id" converted to "_netconfId"
+	 * @param name with attribute name, not null or empty
+	 * @return converted string or null if name was empty or null
+	 */
+	public @Nullable static String toCamelCaseAttributeName(final String name) {
+		if (name == null || name.isEmpty())
+			return null;
+
+		final StringBuilder ret = new StringBuilder(name.length());
+		if (!name.startsWith("_"))
+			ret.append('_');
+		int start = 0;
+		for (final String word : name.split("-")) {
+			if (!word.isEmpty()) {
+				if (start++ == 0) {
+					ret.append(Character.toLowerCase(word.charAt(0)));
+				} else {
+					ret.append(Character.toUpperCase(word.charAt(0)));
+				}
+				ret.append(word.substring(1));
+			}
+		}
+		return ret.toString();
+	}
+
+	/**
+	 * Adapted Builder callbacks
+	 */
+	private static class YangToolsBuilderAnnotationIntrospector extends JacksonAnnotationIntrospector {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+        public Class<?> findPOJOBuilder(AnnotatedClass ac) {
+        		try {
+            		String builder = null;
+            		if (ac.getRawType().equals(Credentials.class)) {
+            			builder = "org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder";
+            			//System.out.println(DataContainer.class.isAssignableFrom(ac.getRawType()));
+            			//System.out.println(ChoiceIn.class.isAssignableFrom(ac.getRawType()));
+
+            		} 
+            		else if(ac.getRawType().equals(DateAndTime.class)) {
+            			builder = DateAndTimeBuilder.class.getName();
+            		}
+                	
+            		else {
+        	        	if (ac.getRawType().isInterface()) 	{
+        	        		builder = ac.getName()+"Builder";
+        	        	}
+            		}
+            		if (builder != null) {
+		            	//System.out.println("XX1: "+ac.getRawType());
+		            	//System.out.println("XX2: "+builder);
+            			//Class<?> innerBuilder = Class.forName(builder);
+            			Class<?> innerBuilder = findClass(builder);
+	            	    //System.out.println("Builder found: "+ innerBuilder);
+	            	    return innerBuilder;
+            		}
+            	} catch( ClassNotFoundException e ) {
+    	            // No problem .. try next
+            	}
+           return super.findPOJOBuilder(ac);
+        }
+
+		@Override
+		public Value findPOJOBuilderConfig(AnnotatedClass ac) {
+			if (ac.hasAnnotation(JsonPOJOBuilder.class)) {
+				return super.findPOJOBuilderConfig(ac);
+			}
+			return new JsonPOJOBuilder.Value("build", "set");
+		}
+	}
+
+	private static Class<?> findClass(String name) throws ClassNotFoundException {
+		// Try to find in other bundles
+		if (context != null) {
+			//OSGi environment
+			for (Bundle b : context.getBundles()) {
+				try {
+					return b.loadClass(name);
+				} catch (ClassNotFoundException e) {
+					// No problem, this bundle doesn't have the class
+				}
+			}
+			throw new ClassNotFoundException("Can not find Class in OSGi context.");
+		} else {
+			return Class.forName(name);
+		}
+	    // not found in any bundle
+	}
+	public static class DateAndTimeBuilder{
+		
+		private final String _value;
+	
+		public DateAndTimeBuilder(String v) {
+			this._value= v;
+		}
+		
+		public DateAndTime build() {
+			return new DateAndTime(_value);
+		}
+		
+	}
+	public static class CustomDateAndTimeSerializer extends StdSerializer<DateAndTime>{
+
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+
+		public CustomDateAndTimeSerializer() {
+			this(null);
+		}
+		protected CustomDateAndTimeSerializer(Class<DateAndTime> t) {
+			super(t);
+		}
+
+		@Override
+		public void serialize(DateAndTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+			gen.writeString(value.getValue());
+		}
+		
+	}
+}
diff --git a/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper2.java b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper2.java
new file mode 100644
index 000000000..0ee76b074
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/main/java/org/onap/ccsdk/features/sdnr/wt/yangtools/YangToolsMapper2.java
@@ -0,0 +1,263 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.yangtools;
+
+import java.io.IOException;
+import javax.annotation.Nullable;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder.Value;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+/**
+ * YangToolsMapper is a specific Jackson mapper configuration for opendaylight yangtools serialization or deserialization of DataObject to/from JSON
+ * TODO ChoiceIn and Credentials deserialization only for LoginPasswordBuilder
+ */
+public class YangToolsMapper2<T extends DataObject> extends ObjectMapper {
+
+ 	private final Logger LOG = LoggerFactory.getLogger(YangToolsMapper2.class);
+	private static final long serialVersionUID = 1L;
+	private static String ENTITY = "Entity";
+	private static String BUILDER = "Builder";
+
+	private @Nullable Class<T> clazz;
+	private @Nullable Class<? extends Builder<? extends T>> builderClazz;
+
+	private BundleContext context;
+
+	public <X extends T, B extends Builder<X>> YangToolsMapper2(Class<T> clazz, Class<B> builderClazz) throws ClassNotFoundException {
+		super();
+		configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+		setSerializationInclusion(Include.NON_NULL);
+		setAnnotationIntrospector(new YangToolsBuilderAnnotationIntrospector());
+		SimpleModule dateAndTimeSerializerModule = new SimpleModule();
+		dateAndTimeSerializerModule.addSerializer(DateAndTime.class, new CustomDateAndTimeSerializer());
+		registerModule(dateAndTimeSerializerModule );
+		Bundle bundle = FrameworkUtil.getBundle(YangToolsMapper2.class);
+
+		this.clazz = clazz;
+		this.builderClazz = builderClazz != null ? builderClazz : getBuilderClass(getBuilderClassName(clazz)) ;
+		context = bundle != null ? bundle.getBundleContext() : null;
+	}
+
+	public YangToolsMapper2() throws ClassNotFoundException {
+		this(null, null);
+	}
+
+
+	@Override
+	public String writeValueAsString(Object value) throws JsonProcessingException {
+		return super.writeValueAsString(value);
+	}
+	/**
+	 * Get Builder object for yang tools interface.
+	 * @param <T> yang-tools base datatype
+	 * @param clazz class with interface.
+	 * @return builder for interface or null if not existing
+	 */
+	@SuppressWarnings("unchecked")
+	public @Nullable <T extends DataObject> Builder<T> getBuilder(Class<T> clazz) {
+		try {
+			//Class<?> clazzBuilder = getBuilderClass(getBuilderClassName(clazz));
+			return (Builder<T>) builderClazz.newInstance();
+		} catch (InstantiationException | IllegalAccessException e) {
+			LOG.debug("Problem ", e);
+			return null;
+		}
+	}
+
+	/**
+	 * Callback for handling mapping failures.
+	 * @return
+	 */
+	public int getMappingFailures() {
+		return 0;
+	}
+
+	/**
+	 * Provide mapping of string to attribute names, generated by yang-tools.
+	 * "netconf-id" converted to "_netconfId"
+	 * @param name with attribute name, not null or empty
+	 * @return converted string or null if name was empty or null
+	 */
+	public @Nullable static String toCamelCaseAttributeName(final String name) {
+		if (name == null || name.isEmpty())
+			return null;
+
+		final StringBuilder ret = new StringBuilder(name.length());
+		if (!name.startsWith("_"))
+			ret.append('_');
+		int start = 0;
+		for (final String word : name.split("-")) {
+			if (!word.isEmpty()) {
+				if (start++ == 0) {
+					ret.append(Character.toLowerCase(word.charAt(0)));
+				} else {
+					ret.append(Character.toUpperCase(word.charAt(0)));
+				}
+				ret.append(word.substring(1));
+			}
+		}
+		return ret.toString();
+	}
+
+	/** Verify if builder is available
+	 * @throws ClassNotFoundException **/
+	public Class<?> assertBuilderClass(Class<?> clazz) throws ClassNotFoundException {
+		return getBuilderClass(getBuilderClassName(clazz));
+	}
+
+	// --- Private functions
+
+	/**
+	 * Create name of builder class
+	 * @param <T>
+	 * @param clazz
+	 * @return builders class name
+	 * @throws ClassNotFoundException
+	 */
+	private static String getBuilderClassName(Class<?> clazz) {
+		return clazz.getName() + BUILDER;
+//		String clazzName = clazz.getName();
+//		if (clazzName.endsWith(ENTITY)) {
+//			return clazzName.replace(ENTITY, BUILDER);
+//		} else {
+//			return clazzName + BUILDER;
+//		}
+	}
+
+	/**
+	 * Search builder in context
+	 * @param name
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	@SuppressWarnings("unchecked")
+	private <X extends T, B extends Builder<X>> Class<B> getBuilderClass(String name) throws ClassNotFoundException {
+		// Try to find in other bundles
+		if (context != null) {
+			//OSGi environment
+			for (Bundle b : context.getBundles()) {
+				try {
+					return (Class<B>) b.loadClass(name);
+				} catch (ClassNotFoundException e) {
+					// No problem, this bundle doesn't have the class
+				}
+			}
+			throw new ClassNotFoundException("Can not find Class in OSGi context.");
+		} else {
+			return (Class<B>) Class.forName(name);
+		}
+	    // not found in any bundle
+	}
+
+	// --- Classes
+
+	/**
+	 * Adapted Builder callbacks
+	 */
+	private class YangToolsBuilderAnnotationIntrospector extends JacksonAnnotationIntrospector {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public Class<?> findPOJOBuilder(AnnotatedClass ac) {
+
+			if (ac.getRawType().equals(Credentials.class)) {
+				return org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder.class;
+
+			} else if (ac.getRawType().equals(DateAndTime.class)) {
+				return DateAndTimeBuilder.class;
+
+			} else if (ac.getRawType().equals(clazz)) {
+				return builderClazz;
+			}
+
+			if (ac.getRawType().isInterface()) {
+				String builder = getBuilderClassName(ac.getRawType());
+				try {
+					Class<?> innerBuilder = getBuilderClass(builder);
+					return innerBuilder;
+				} catch (ClassNotFoundException e) {
+					// No problem .. try next
+				}
+			}
+			return super.findPOJOBuilder(ac);
+		}
+
+		@Override
+		public Value findPOJOBuilderConfig(AnnotatedClass ac) {
+			if (ac.hasAnnotation(JsonPOJOBuilder.class)) {
+				return super.findPOJOBuilderConfig(ac);
+			}
+			return new JsonPOJOBuilder.Value("build", "set");
+		}
+	}
+
+	public static class DateAndTimeBuilder{
+
+		private final String _value;
+
+		public DateAndTimeBuilder(String v) {
+			this._value= v;
+		}
+
+		public DateAndTime build() {
+			return new DateAndTime(_value);
+		}
+
+	}
+	public static class CustomDateAndTimeSerializer extends StdSerializer<@NonNull DateAndTime>{
+
+		private static final long serialVersionUID = 1L;
+
+		public CustomDateAndTimeSerializer() {
+			this(null);
+		}
+		protected CustomDateAndTimeSerializer(Class<DateAndTime> t) {
+			super(t);
+		}
+
+		@Override
+		public void serialize(DateAndTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+			gen.writeString(value.getValue());
+		}
+
+	}
+}
diff --git a/sdnr/wt/data-provider/database/src/main/resources/es-init.sh b/sdnr/wt/data-provider/database/src/main/resources/es-init.sh
index be7d487f7..68e6e8488 100755
--- a/sdnr/wt/data-provider/database/src/main/resources/es-init.sh
+++ b/sdnr/wt/data-provider/database/src/main/resources/es-init.sh
@@ -37,7 +37,7 @@ INITFILENAME="Init.script"
 set_definition() {
   def "connectionlog" '{"node-id": {"type": "keyword"},"timestamp": {"type": "date"},"status": {"type": "keyword"}}'
   def "maintenancemode" '{"node-id": {"type": "keyword"},"active": {"type": "boolean"}},"date_detection":false}}'
-  def "faultlog" '{"node-id": {"type": "keyword"},"severity": {"type": "keyword"},"timestamp": {"type": "date"},"problem": {"type": "keyword"},"counter": {"type": "keyword"},"object-id":{"type": "keyword"}}'
+  def "faultlog" '{"node-id": {"type": "keyword"},"severity": {"type": "keyword"},"timestamp": {"type": "date"},"problem": {"type": "keyword"},"counter": {"type": "keyword"},"object-id":{"type": "keyword"},"source-type":{"type": "keyword"}}'
   def "faultcurrent" '{"node-id": {"type": "keyword"},"severity": {"type": "keyword"},"timestamp": {"type": "date"},"problem": {"type": "keyword"},"counter": {"type": "keyword"},"object-id":{"type": "keyword"}}'
   def "eventlog" '{"node-id": {"type": "keyword"},"timestamp": {"type": "date"},"new-value": {"type": "keyword"},"attribute-name": {"type": "keyword"},"counter": {"type": "keyword"},"object-id": {"type": "keyword"}}'
   def "inventoryequipment" '{"date": {"type": "keyword"},"model-identifier": {"type": "keyword"},"manufacturer-identifier": {"type": "keyword"},"type-name": {"type": "keyword"},"description": {"type": "keyword"},"uuid": {"type": "keyword"},"version": {"type": "keyword"},"parent-uuid": {"type": "keyword"},"contained-holder": {"type": "keyword"},"node-id": {"type": "keyword"},"tree-level": {"type": "long"},"part-type-id": {"type": "keyword"},"serial": {"type": "keyword"}}'
@@ -88,11 +88,10 @@ print_response() {
     body=$(echo $response | sed -E 's/HTTPSTATUS\:[0-9]{3}$//')
     code=$(echo $response | tr -d '\n' | sed -E 's/.*HTTPSTATUS:([0-9]{3})$/\1/')
     if [ "$VERBOSE" = "0" -a "$code" -ne "200" ] ; then
- 	   echo "Error response $code $body"
- 	   exit 2
+        echo "Error response $code $body"
     fi
     if [ "$VERBOSE" -ge 1 ] ; then
- 	   echo "response $code"
+        echo "response $code"
     fi
     if [ "$VERBOSE" -ge 2 ] ; then
        echo "content: $body"
@@ -160,6 +159,11 @@ delete_index_alias() {
     echo "deleting index $index"
     url="$index"
     http_delete_request "$url"
+
+     # Delete alias that was falsely autocreated as index
+    echo "deleting index $index"
+    url="$alias"
+    http_delete_request "$url"
 }
 
 # Write mappings
@@ -181,9 +185,9 @@ create_index_alias() {
     fi
 
     url=$index
-	echo "creating index $index"
-	if [ -z "$3" ] ; then
-	    http_put_request "$url" "$data"
+    echo "creating index $index"
+    if [ -z "$3" ] ; then
+        http_put_request "$url" "$data"
     else
         file_append "$url" "$data"
     fi
@@ -192,7 +196,7 @@ create_index_alias() {
     url="$index/_alias/$alias"
     echo "creating alias $alias for $index"
     if [ -z "$3" ] ; then
-    	http_put_request "$url"
+        http_put_request "$url"
     else
         file_append "$url" "{}"
     fi
@@ -210,7 +214,7 @@ es_wait_yellow() {
       echo "Error: Max attempts reached."
       exit 3
     fi
-	attempt_counter=$(($attempt_counter+1))
+    attempt_counter=$(($attempt_counter+1))
     printf '.'
     sleep 5
   done
@@ -222,7 +226,7 @@ es_wait_yellow() {
       echo "Status $ESSTATUS reached: $RES"
     else
       echo "Error: DB Reachable, but status $ESSTATUS not reached"
-	  exit 2
+      exit 2
     fi
   else
     echo "Error: $DBURL not reachable"
@@ -234,20 +238,23 @@ es_wait_yellow() {
 
 cmd_create() {
     if [ -n "$WAITYELLOW" ] ; then
-    	es_wait_yellow "$WAITYELLOW"
+        es_wait_yellow "$WAITYELLOW"
     fi
-	for i in "${!ALIAS[@]}"; do
-  		create_index_alias "${ALIAS[$i]}" "${MAPPING[$i]}"
-	done
+    for i in "${!ALIAS[@]}"; do
+          create_index_alias "${ALIAS[$i]}" "${MAPPING[$i]}"
+    done
 }
 
 cmd_delete() {
     if [ -n "$WAITYELLOW" ] ; then
-    	es_wait_yellow "$WAITYELLOW"
+        es_wait_yellow "$WAITYELLOW"
     fi
-	for i in "${!ALIAS[@]}"; do
-  		delete_index_alias "${ALIAS[$i]}"
-	done
+    for i in "${!ALIAS[@]}"; do
+          delete_index_alias "${ALIAS[$i]}"
+    done
+    for i in "${!ALIAS[@]}"; do
+        delete_index_alias "${ALIAS[$i]}"
+    done
 }
 cmd_purge() {
 #    http_get_request '_cat/aliases'
@@ -262,11 +269,13 @@ cmd_purge() {
 cmd_initfile() {
     echo "Create script initfile: $INITFILENAME"
     if [ -f "$INITFILENAME" ] ; then
-    	rm $INITFILENAME
+        rm $INITFILENAME
+    else
+      mkdir -p $( dirname $INITFILENAME )
     fi
-	for i in "${!ALIAS[@]}"; do
-  		create_index_alias "${ALIAS[$i]}" "${MAPPING[$i]}" file
-	done
+    for i in "${!ALIAS[@]}"; do
+          create_index_alias "${ALIAS[$i]}" "${MAPPING[$i]}" file
+    done
 }
 
 # Prepare database startup
@@ -325,22 +334,22 @@ parse_args() {
         -f|--file)
           INITFILENAME="$value"
           shift
-		  ;;
-		-x|--verbose)
-		  VERBOSE="${value:-0}"
-		  shift
-		  ;;
-		-v|--version)
-		  VERSION="${value:--v1}"
-		  shift
-		  ;;
-		-vx|--versionx)
-		  VERSION=""
-		  ;;
-		-w|--wait)
+          ;;
+        -x|--verbose)
+          VERBOSE="${value:-0}"
+          shift
+          ;;
+        -v|--version)
+          VERSION="${value:--v1}"
+          shift
+          ;;
+        -vx|--versionx)
+          VERSION=""
+          ;;
+        -w|--wait)
           WAITYELLOW="${value:-30s}"
-		  shift
-		  ;;
+          shift
+          ;;
         --cmd)
           STARTUP_CMD="$value"
           shift
@@ -349,10 +358,10 @@ parse_args() {
           CLUSTER_ENABLED="$value"
           shift
           ;;
- 	    --index)
- 	      NODE_INDEX="$value"
- 	      shift
- 	      ;;
+         --index)
+           NODE_INDEX="$value"
+           shift
+           ;;
         *)
           ;;
       esac;
@@ -379,32 +388,32 @@ echo "  shards=$SHARDS replicas=$REPLICAS prefix=$PREFIX verbose=$VERBOSE versio
 
 case "$TASK" in
     "create")
-		getsdnrurl
-		if [ -z "$DBURL" ] ; then
-		  echo "Error: unable to detect database url."
-		  exit 1
-		fi
+        getsdnrurl
+        if [ -z "$DBURL" ] ; then
+          echo "Error: unable to detect database url."
+          exit 1
+        fi
         cmd_create
         ;;
     "delete")
-		getsdnrurl
-		if [ -z "$DBURL" ] ; then
-		  echo "Error: unable to detect database url."
-		  exit 1
-		fi
+        getsdnrurl
+        if [ -z "$DBURL" ] ; then
+          echo "Error: unable to detect database url."
+          exit 1
+        fi
         cmd_delete
         ;;
     "purge")
-		getsdnrurl
-		if [ -z "$DBURL" ] ; then
-		  echo "Error: unable to detect database url."
-		  exit 1
-		fi
+        getsdnrurl
+        if [ -z "$DBURL" ] ; then
+          echo "Error: unable to detect database url."
+          exit 1
+        fi
         cmd_purge
         ;;
     "initfile")
         cmd_initfile
-    	;;
+        ;;
     "startup")
         cmd_startup
         ;;
diff --git a/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestConfig.java b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestConfig.java
new file mode 100644
index 000000000..ecc7edf6a
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestConfig.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.database.test;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestConfig {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestConfig.class);
+
+    private static final String TESTFILENAME = "testconfig.properties";
+
+    @After
+    @Before
+    public void afterAndBefore() {
+        File f=new File(TESTFILENAME);
+        if(f.exists()) {
+            LOG.info("Remove {}", f.getAbsolutePath());
+            f.delete();
+        }
+    }
+    @Test
+    public void test() {
+        ConfigurationFileRepresentation configuration=new ConfigurationFileRepresentation(TESTFILENAME);
+
+        EsConfig esConfig = new EsConfig(configuration);
+        LOG.info("Defaultconfiguration: {}", esConfig.toString());
+        assertEquals("http", esConfig.getHosts()[0].protocol.getValue());
+        assertEquals(9200, esConfig.getHosts()[0].port);
+        assertEquals("sdnrdb", esConfig.getHosts()[0].hostname);
+
+    }
+
+}
diff --git a/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestDataMappings.java b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestDataMappings.java
new file mode 100644
index 000000000..1dc02b92f
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestDataMappings.java
@@ -0,0 +1,209 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.database.test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.DatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.SearchResponse;
+import org.onap.ccsdk.features.sdnr.wt.database.EsDataObjectReaderWriter;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public class TestDataMappings {
+
+	private static final HostInfo[] HOSTINFOS = new HostInfo[] {HostInfo.getDefault()};
+	//public static final String ESDATATYPENAME = "faultcurrent";
+
+	private static class HtDatabaseClientHelper extends HtDatabaseClient {
+
+		private final String json;
+
+		public HtDatabaseClientHelper(String jsonResponse, HostInfo[] hosts) {
+			super(hosts);
+			this.json = jsonResponse;
+
+		}
+
+		@Override
+		public SearchResult<SearchHit> doReadByQueryJsonData(String dataTypeName, QueryBuilder qb) {
+			return new SearchResult<SearchHit>(new SearchResponse(this.json).getHits());
+		}
+	}
+
+	private static class MapResult<T extends DataObject> {
+		public final List<T> mappedData;
+		public MapResult(String dataType, Class<T> cls, String dbJson) throws ClassNotFoundException {
+			System.out.println(dbJson);
+			DatabaseClient db = new HtDatabaseClientHelper(dbJson,HOSTINFOS);
+			EsDataObjectReaderWriter<T> dbrw=new EsDataObjectReaderWriter<T>(db,dataType,cls);
+			this.mappedData=dbrw.doReadAll().getHits();
+		}
+	}
+
+	private static final String SEARCHJSON_FORMAT = "{\n" +
+			"\"took\": 0,\n" +
+			"\"timed_out\": false,\n" +
+			"\"_shards\": {\n" +
+			"\"total\": 5,\n" +
+			"\"successful\": 5,\n" +
+			"\"skipped\": 0,\n" +
+			"\"failed\": 0\n" +
+			"},\n" +
+			"\"hits\": {\n" +
+			"\"total\": 1,\n" +
+			"\"max_score\": 1,\n" +
+			"\"hits\": [\n" +
+			"{\n" +
+			"\"_index\": \"%s\",\n" +
+			"\"_type\": \"%s\",\n" +
+			"\"_id\": \"%s\",\n" +
+			"\"_score\": 1,\n" +
+			"\"_source\": %s}\n" +
+			"]\n" +
+			"}\n" +
+			"}";
+
+	private static final String MEDIATORSERVER_DB_ID="LumwSG0BFvcE3yf8MBM5";
+	private static final String MEDIATOR_SERVERDB_JSON = "{\"url\":\"https://10.45.44.223:7590\",\"name\":\"test mediator server\"}";
+
+	private static final String FAULTCURRENT_DB_ID="LumwSG0BFvcE3yf8MBM5";
+	private static final String FAULTCURRENT_DB_NODEID = "sim1";
+	private static final int FAULTCURRENT_DB_COUNTER = 3;
+	private static final String FAULTCURRENT_DB_OBJECTID = "LPS-MWT-01";
+	private static final String FAULTCURRENT_DB_PROBLEM = "rlsExceeded";
+	private static final String FAULTCURRENT_DB_SEVERITY = "critical";
+	private static final DateAndTime FAULTCURRENT_DB_TIMESTAMP = DateAndTime.getDefaultInstance("2019-09-18T13:07:05.8Z");
+
+	private static final String FAULTCURRENT_SERVERDB_JSON = "{\"node-id\":\""+FAULTCURRENT_DB_NODEID+"\","+
+			"\"counter\":"+FAULTCURRENT_DB_COUNTER+","+
+			"\"object-id\":\""+FAULTCURRENT_DB_OBJECTID+"\","+
+			"\"problem\":\""+FAULTCURRENT_DB_PROBLEM+"\","+
+			"\"timestamp\":\""+FAULTCURRENT_DB_TIMESTAMP.getValue()+"\","+
+			"\"severity\":\""+FAULTCURRENT_DB_SEVERITY+"\""+
+	"}";
+
+
+	private static final String PMDATA15M_SERVERDB_JSON="{\n" +
+			"\"node-name\": \"sim2\",\n" +
+			"\"uuid-interface\": \"LP-MWPS-TTP-01\",\n" +
+			"\"layer-protocol-name\": \"MWPS\",\n" +
+			"\"radio-signal-id\": \"Test11\",\n" +
+			"\"time-stamp\": \"2017-07-04T14:00:00.0Z\",\n" +
+			"\"granularity-period\": \"PERIOD_15MIN\",\n" +
+			"\"scanner-id\": \"PM_RADIO_15M_9\",\n" +
+			"\"performance-data\": {\n" +
+			"\"es\": 0,\n" +
+			"\"rx-level-avg\": -41,\n" +
+			"\"time2-states\": -1,\n" +
+			"\"time4-states-s\": 0,\n" +
+			"\"time4-states\": 0,\n" +
+			"\"time8-states\": 0,\n" +
+			"\"time16-states-s\": -1,\n" +
+			"\"time16-states\": 0,\n" +
+			"\"time32-states\": 0,\n" +
+			"\"time64-states\": 0,\n" +
+			"\"time128-states\": 0,\n" +
+			"\"time256-states\": 900,\n" +
+			"\"time512-states\": -1,\n" +
+			"\"time512-states-l\": -1,\n" +
+			"\"time1024-states\": -1,\n" +
+			"\"time1024-states-l\": -1,\n" +
+			"\"time2048-states\": -1,\n" +
+			"\"time2048-states-l\": -1,\n" +
+			"\"time4096-states\": -1,\n" +
+			"\"time4096-states-l\": -1,\n" +
+			"\"time8192-states\": -1,\n" +
+			"\"time8192-states-l\": -1,\n" +
+			"\"snir-min\": -99,\n" +
+			"\"snir-max\": -99,\n" +
+			"\"snir-avg\": -99,\n" +
+			"\"xpd-min\": -99,\n" +
+			"\"xpd-max\": -99,\n" +
+			"\"xpd-avg\": -99,\n" +
+			"\"rf-temp-min\": -99,\n" +
+			"\"rf-temp-max\": -99,\n" +
+			"\"rf-temp-avg\": -99,\n" +
+			"\"defect-blocks-sum\": -1,\n" +
+			"\"time-period\": 900,\n" +
+			"\"tx-level-min\": 25,\n" +
+			"\"tx-level-max\": 25,\n" +
+			"\"tx-level-avg\": 25,\n" +
+			"\"rx-level-min\": -41,\n" +
+			"\"rx-level-max\": -41,\n" +
+			"\"unavailability\": 0,\n" +
+			"\"ses\": 0,\n" +
+			"\"cses\": 0\n" +
+			"},\n" +
+			"\"suspect-interval-flag\": false\n" +
+			"}";
+
+	//@Test
+//	public void testMediatorServer() throws ClassNotFoundException {
+//
+//		MapResult<EsMediatorServer> result = new MapResult<EsMediatorServer>(EsMediatorServer.ESDATATYPENAME,
+//				EsMediatorServer.class,
+//				getSearchJson(EsMediatorServer.ESDATATYPENAME,MEDIATORSERVER_DB_ID,MEDIATOR_SERVERDB_JSON));
+//		assertEquals("test mediator server", result.mappedData.get(0).getName());
+//		assertEquals("https://10.45.44.223:7590", result.mappedData.get(0).getUrl());
+//		assertEquals(MEDIATORSERVER_DB_ID, result.mappedData.get(0).getId());
+//
+//	}
+	//@Test
+//	public void testFaultCurrent() {
+//
+//		MapResult<FaultcurrentEntity> result = new MapResult<FaultcurrentEntity>(ESDATATYPENAME, EsFaultCurrent.class,
+//				getSearchJson(ESDATATYPENAME, FAULTCURRENT_DB_ID, FAULTCURRENT_SERVERDB_JSON));
+//		assertEquals(FAULTCURRENT_DB_ID, result.mappedData.get(0).getId());
+//		assertEquals(FAULTCURRENT_DB_NODEID, result.mappedData.get(0).getNodeId());
+//		assertEquals(FAULTCURRENT_DB_COUNTER, result.mappedData.get(0).getCounter().intValue());
+//		assertEquals(FAULTCURRENT_DB_OBJECTID, result.mappedData.get(0).getObjectId());
+//		assertEquals(FAULTCURRENT_DB_PROBLEM, result.mappedData.get(0).getProblem());
+//		assertEquals(FAULTCURRENT_DB_SEVERITY, result.mappedData.get(0).getSeverity());
+//		assertEquals(FAULTCURRENT_DB_TIMESTAMP, result.mappedData.get(0).getTimestamp());
+//	}
+//
+	@Test
+	public void testPmData15m() {
+
+		YangToolsMapper mapper = new YangToolsMapper();
+		try {
+			Data data =mapper.readValue(PMDATA15M_SERVERDB_JSON.getBytes(), Data.class);
+			System.out.println(data);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+
+	}
+	private String getSearchJson(String dataType,String dbId, String source) {
+		return String.format(SEARCHJSON_FORMAT,dataType,dataType, dbId,source);
+	}
+
+}
diff --git a/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNetconfNodeBuilder.java b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNetconfNodeBuilder.java
new file mode 100644
index 000000000..9237aaf1f
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNetconfNodeBuilder.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.database.test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPassword;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+
+public class TestNetconfNodeBuilder {
+
+	@SuppressWarnings("deprecation")
+	//@Test
+	public void test() {
+
+		NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
+
+		LoginPasswordBuilder loginPasswordBuilder = new LoginPasswordBuilder();
+		loginPasswordBuilder.setUsername("myTestUsername");
+		loginPasswordBuilder.setPassword("myTestPassword");
+		netconfNodeBuilder.setCredentials(loginPasswordBuilder.build());
+
+		NetconfNode netconfNode = netconfNodeBuilder.build();
+		System.out.println(netconfNode);
+
+		Credentials credentials = netconfNode.getCredentials();
+		System.out.println("Class: "+credentials.getClass()+"\nContent: "+credentials);
+
+        if (credentials instanceof LoginPassword) {
+        	LoginPassword loginPassword = (LoginPassword)credentials;
+        	System.out.println("User: "+loginPassword.getUsername()+" Password"+loginPassword.getPassword());
+        } else {
+        	System.out.println("Not expected class");
+        }
+	}
+
+}
diff --git a/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNuMappings.java b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNuMappings.java
new file mode 100644
index 000000000..b7d0620ca
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestNuMappings.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.database.test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import java.io.IOException;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Faultcurrent;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
+
+public class TestNuMappings {
+
+    @Test
+    public void test33() {
+        Faultcurrent c = new FaultcurrentBuilder().setSeverity(SeverityType.Critical).build();
+        YangToolsMapper mapper = new YangToolsMapper();
+        try {
+            System.out.println(mapper.writeValueAsString(c)+"<=>"+SeverityType.Critical.getName());
+        } catch (JsonProcessingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        try {
+            Faultcurrent f=mapper.readValue( "{\"severity\":\"Critical\"}", Faultcurrent.class);
+            System.out.println(f);
+            System.out.println(mapper.writeValueAsString(f));
+        } catch (JsonParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (JsonMappingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestYangGenSalMapping.java b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestYangGenSalMapping.java
new file mode 100644
index 000000000..666061425
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/test/TestYangGenSalMapping.java
@@ -0,0 +1,408 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.database.test;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.DatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.InvalidProtocolException;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo.Protocol;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.BoolQueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.database.EsDataObjectReaderWriter;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.OdlHelloMessageCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EntityInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SortOrder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Filter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.PaginationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Sortorder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.pmdata15m.entity.PerformanceDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.DataBuilder;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public class TestYangGenSalMapping {
+
+	// Create mapper for serialization and deserialization
+	YangToolsMapper mapper = new YangToolsMapper();
+
+	@Test
+	public void test1() throws IOException {
+
+		// Create test object
+		NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
+		netconfNodeBuilder.setConnectedMessage("ConnMessage");
+
+		LoginPasswordBuilder loginPasswordBuilder = new LoginPasswordBuilder();
+		loginPasswordBuilder.setUsername("myTestUsername");
+		loginPasswordBuilder.setPassword("myTestPassword");
+		netconfNodeBuilder.setCredentials(loginPasswordBuilder.build());
+
+		OdlHelloMessageCapabilitiesBuilder odlHelloMessageCapabilitiesBuilder = new OdlHelloMessageCapabilitiesBuilder();
+		List<Uri> uriList = new ArrayList<>();
+		uriList.add( new Uri("test.uri") );
+		odlHelloMessageCapabilitiesBuilder.setCapability(uriList);
+		netconfNodeBuilder.setOdlHelloMessageCapabilities(odlHelloMessageCapabilitiesBuilder.build());
+
+		NetconfNode netconfNode = netconfNodeBuilder.build();
+		out(netconfNode.toString());
+
+		// Map Object to JSON String
+	    String res = mapper.writeValueAsString(netconfNode);
+	    JSONObject json = new JSONObject(res); // Convert text to object
+		out(json.toString(4)); // Print it with specified indentation
+
+		// Map to JSON String to Object
+		NetconfNode generatedNode = mapper.readValue(res.getBytes(), NetconfNode.class);
+		out(generatedNode.toString()); // Print it with specified indentation
+		// Compare result
+		out("Equal?  "+(netconfNode.equals(generatedNode)));
+	}
+
+	static class TestDataObjectBuilder implements Builder<TestDataObject> {
+		@Override
+		public @NonNull TestDataObject build() throws IllegalArgumentException {
+			return new TestDataObject();
+		}
+	}
+
+	static class TestDataObject implements DataObject {
+		String test;
+
+		@Override
+		public Class<? extends DataContainer> getImplementedInterface() {
+			return null;
+		}
+	}
+
+	@Test
+	public void test2() throws InvalidProtocolException, ClassNotFoundException	{
+
+
+		int databasePort = Integer.valueOf(System.getProperty("databaseport"));
+		System.out.println("DB Port: "+databasePort);
+
+		HostInfo[] HOSTINFOS = new HostInfo[] { new HostInfo("localhost", databasePort )};
+		DatabaseClient db = new HtDatabaseClient(HOSTINFOS);
+
+		EsDataObjectReaderWriter<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data> dataRW =
+  		  new EsDataObjectReaderWriter<>(db, "inventorytest", org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data.class);
+
+		org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data d1;
+		d1 = getInventoryDataBuilder("MyDescription", 23L).build();
+		String id = dataRW.write(d1,null);
+
+		org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data d2;
+		d2 = dataRW.read(id);
+
+		out(d2.toString());
+
+	}
+
+	@Test
+	public void test3() throws IOException	{
+
+		PerformanceDataBuilder performanceBuilder = new PerformanceDataBuilder();
+		performanceBuilder.setEs(99);
+		DataBuilder pmData15MinutesBuilder = new DataBuilder();
+		pmData15MinutesBuilder.setLayerProtocolName("fdsaf");
+		pmData15MinutesBuilder.setTimeStamp(new DateAndTime("2017-03-01T09:15:00.0Z"));
+		pmData15MinutesBuilder.setPerformanceData(performanceBuilder.build());
+
+		// Map Object to JSON String
+	    String res = mapper.writeValueAsString(pmData15MinutesBuilder.build());
+	    JSONObject json = new JSONObject(res); // Convert text to object
+		out(json.toString(4)); // Print it with specified indentation
+
+		// Map to JSON String to Object
+		Data generatedNode = mapper.readValue(res.getBytes(), Data.class);
+		out(generatedNode.toString()); // Print it with specified indentation
+	}
+
+	@Test
+	public void test4() throws IOException {
+
+		String jsonString = "{\n" + "\"node-name\": \"Sim2230\",\n" + "\"uuid-interface\": \"LP-MWPS-TTP-RADIO\",\n"
+				+ "\"layer-protocol-name\": \"MWPS\",\n" + "\"radio-signal-id\": \"Test8\",\n"
+				+ "\"time-stamp\": \"2017-03-01T09:15:00.0Z\",\n" + "\"granularity-period\": \"PERIOD_15MIN\",\n"
+				+ "\"scanner-id\": \"PM_RADIO_15M_4\",\n" + "\"performance-data\": {\n" + "\"unavailability\": 0,\n"
+				+ "\"tx-level-max\": 3,\n" + "\"tx-level-avg\": 3,\n" + "\"rx-level-min\": -44,\n"
+				+ "\"rx-level-max\": -45,\n" + "\"rx-level-avg\": -44,\n" + "\"time2-states\": 0,\n"
+				+ "\"time4-states-s\": 0,\n" + "\"time4-states\": 0,\n" + "\"time8-states\": -1,\n"
+				+ "\"time16-states-s\": -1,\n" + "\"time16-states\": 0,\n" + "\"time32-states\": -1,\n"
+				+ "\"time64-states\": 900,\n" + "\"time128-states\": -1,\n" + "\"time256-states\": -1,\n"
+				+ "\"time512-states\": -1,\n" + "\"time512-states-l\": -1,\n" + "\"time1024-states\": -1,\n"
+				+ "\"time1024-states-l\": -1,\n" + "\"time8192-states-l\": -1,\n" + "\"time8192-states\": -1,\n"
+				+ "\"time2048-states\": -1,\n" + "\"snir-min\": -99,\n" + "\"snir-max\": -99,\n"
+				+ "\"snir-avg\": -99,\n" + "\"xpd-min\": -99,\n" + "\"xpd-max\": -99,\n" + "\"xpd-avg\": -99,\n"
+				+ "\"rf-temp-min\": -99,\n" + "\"rf-temp-max\": -99,\n" + "\"rf-temp-avg\": -99,\n"
+				+ "\"defect-blocks-sum\": -1,\n" + "\"time-period\": 900,\n" + "\"cses\": 0,\n"
+				+ "\"time4096-states-l\": -1,\n" + "\"tx-level-min\": 3,\n" + "\"es\": 0,\n"
+				+ "\"time2048-states-l\": -1,\n" + "\"time4096-states\": -1,\n" + "\"ses\": 0\n" + "},\n"
+				+ "\"suspect-interval-flag\": false\n" + "}\n" + "}";
+		// Map to JSON String to Object
+		Data generatedNode = mapper.readValue(jsonString.getBytes(), Data.class);
+		out(generatedNode.toString()); // Print it with specified indentation
+
+	}
+
+
+	@Test
+	public void test5() throws IOException {
+		String jsonString = "{\n" +
+				"    \"time-stamp\": \"2017-03-01T06:45:00.0Z\",\n" +
+				"    \"node-name\": \"Sim2230\",\n" +
+				"    \"uuid-interface\": \"LP-MWPS-TTP-RADIO\",\n" +
+				"    \"scanner-id\": \"PM_RADIO_15M_14\",\n" +
+				"    \"layer-protocol-name\": \"MWPS\",\n" +
+				"    \"granularity-period\": \"PERIOD_15MIN\",\n" +
+				"    \"radio-signal-id\": \"Test8\",\n" +
+				"    \"suspect-interval-flag\": false,\n" +
+				"    \"performance-data\": {\n" +
+				"        \"time4096-states-l\": -1,\n" +
+				"        \"time16-states-s\": -1,\n" +
+				"        \"tx-level-max\": 3,\n" +
+				"        \"snir-max\": -99,\n" +
+				"        \"time16-states\": 0,\n" +
+				"        \"time64-states\": 900,\n" +
+				"        \"unavailability\": 0,\n" +
+				"        \"time8192-states-l\": -1,\n" +
+				"        \"time512-states\": -1,\n" +
+				"        \"xpd-min\": -99,\n" +
+				"        \"xpd-avg\": -99,\n" +
+				"        \"tx-level-avg\": 3,\n" +
+				"        \"tx-level-min\": 3,\n" +
+				"        \"rf-temp-min\": -99,\n" +
+				"        \"rf-temp-avg\": -99,\n" +
+				"        \"snir-avg\": -99,\n" +
+				"        \"snir-min\": -99,\n" +
+				"        \"time-period\": 900,\n" +
+				"        \"time2-states\": 0,\n" +
+				"        \"time4-states\": 0,\n" +
+				"        \"time8-states\": -1,\n" +
+				"        \"ses\": 0,\n" +
+				"        \"time2048-states-l\": -1,\n" +
+				"        \"time2048-states\": -1,\n" +
+				"        \"xpd-max\": -99,\n" +
+				"        \"rf-temp-max\": -99,\n" +
+				"        \"time8192-states\": -1,\n" +
+				"        \"time128-states\": -1,\n" +
+				"        \"time256-states\": -1,\n" +
+				"        \"rx-level-min\": -44,\n" +
+				"        \"rx-level-avg\": -44,\n" +
+				"        \"time1024-states-l\": -1,\n" +
+				"        \"es\": 0,\n" +
+				"        \"cses\": 0,\n" +
+				"        \"time4-states-s\": 0,\n" +
+				"        \"time1024-states\": -1,\n" +
+				"        \"time512-states-l\": -1,\n" +
+				"        \"time4096-states\": -1,\n" +
+				"        \"rx-level-max\": -45,\n" +
+				"        \"defect-blocks-sum\": -1,\n" +
+				"        \"time32-states\": -1\n" +
+				"    }\n" +
+				"}";
+
+		// Map to JSON String to Object
+		Data generatedNode = mapper.readValue(jsonString.getBytes(), Data.class);
+		out(generatedNode.toString()); // Print it with specified indentation
+
+	}
+
+
+	@Test
+	public void test6() throws IOException, ClassNotFoundException {
+        out(method());
+		HtDatabaseClient dbClient = new HtDatabaseClient(new HostInfo[] { new HostInfo("sdnrdb", 9200, Protocol.HTTP) });
+        String PMDATA15M_TYPE = "historicalperformance15min";
+
+		EsDataObjectReaderWriter<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> pm15mRW =
+				new EsDataObjectReaderWriter<>(dbClient, PMDATA15M_TYPE, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data.class);
+		pm15mRW.setEsIdAttributeName("_nodeName");
+
+		ReadPmdata15mListInputBuilder inputBuilder = new ReadPmdata15mListInputBuilder();
+		PaginationBuilder paginationBuilder = new PaginationBuilder();
+		paginationBuilder.setPage(new BigInteger("1"));
+		paginationBuilder.setSize(20L);
+		inputBuilder.setPagination(paginationBuilder.build());
+
+		ReadPmdata15mListInput input = inputBuilder.build();
+
+
+		ReadPmdata15mListOutputBuilder outputBuilder = new ReadPmdata15mListOutputBuilder();
+		long page = getPage(input);
+		long pageSize = getPageSize(input);
+
+		QueryBuilder query = fromFilter(input.getFilter()).from((page - 1) * pageSize).size(pageSize);
+		setSortOrder(query, input.getSortorder());
+
+		SearchResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> result=pm15mRW.doReadAll(query);
+
+		out("Found: "+result.getHits().size());
+		int t=0;
+		for (Data hit : result.getHits()) {
+			out("Hit "+(t++)+":"+hit);
+		}
+		setPagination(outputBuilder, page, pageSize, result.getTotal());
+		outputBuilder.setData(result.getHits());
+	}
+
+	@Test
+	public void test7() throws IOException, ClassNotFoundException {
+        out(method());
+		String ESDATATYPE_MEDIATORSERVER = Entity.MediatorServer.getName();
+		HtDatabaseClient dbClient = new HtDatabaseClient(new HostInfo[] { new HostInfo("sdnrdb", 9200, Protocol.HTTP) });
+		EsDataObjectReaderWriter<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data> mediatorserverRW;
+
+		mediatorserverRW = new EsDataObjectReaderWriter<>(dbClient, ESDATATYPE_MEDIATORSERVER,
+				org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data.class)
+				.setWriteInterface(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MediatorServerEntity.class)
+				.setEsIdAttributeName("_id");
+
+		CreateMediatorServerInputBuilder inputBuilder = new CreateMediatorServerInputBuilder();
+		inputBuilder.setName("Hans");
+		inputBuilder.setUrl("MyGreatUrl");
+
+		String id = mediatorserverRW.write(inputBuilder.build(),"testid");
+		System.out.println(id);
+
+	}
+
+	@Test
+	public void test8() throws IOException {
+        out(method());
+        String input;
+        input = "id-dd-dd";
+        System.out.println("Map " + input + " to "+YangToolsMapper.toCamelCaseAttributeName(input));
+        input = "idDdGg";
+        System.out.println("Map " + input + " to "+YangToolsMapper.toCamelCaseAttributeName(input));
+        input = "_idDdGg";
+        System.out.println("Map " + input + " to "+YangToolsMapper.toCamelCaseAttributeName(input));
+        input = "--ff--gfg";
+        System.out.println("Map " + input + " to "+YangToolsMapper.toCamelCaseAttributeName(input));
+        input = "";
+        System.out.println("Map " + input + " to "+YangToolsMapper.toCamelCaseAttributeName(input));
+	}
+
+	/* ---------------------------------
+	 * Private
+	 */
+	private static String method() {
+		String nameofCurrMethod = new Throwable().getStackTrace()[1].getMethodName();
+		return nameofCurrMethod;
+	}
+
+    private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.DataBuilder getInventoryDataBuilder(String description, long treeLevel) {
+		org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.DataBuilder dataBuilder =
+				new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.DataBuilder();
+		dataBuilder.setDescription(description);
+		dataBuilder.setTreeLevel(treeLevel);
+		return dataBuilder;
+    }
+
+
+	private static void out(String text) {
+		System.out.println("----------------------");
+		System.out.println(text);
+	}
+
+	private static long getPage(EntityInput input) {
+		return getPage(input, 1);
+	}
+
+	private static long getPage(EntityInput input, long defaultValue) {
+		return input.getPagination() != null ? input.getPagination().getPage().longValue() : defaultValue;
+	}
+
+	private static long getPageSize(EntityInput input) {
+		return getPageSize(input, 1);
+	}
+
+	private static long getPageSize(EntityInput input, long defaultValue) {
+		return input.getPagination() != null ? input.getPagination().getSize().longValue() : defaultValue;
+	}
+
+	private static QueryBuilder fromFilter(@Nullable List<Filter> filters) {
+		return fromFilter(filters, "");
+	}
+
+	private static QueryBuilder fromFilter(@Nullable List<Filter> filters, String prefix) {
+		if (filters == null || filters.size() == 0) {
+			return QueryBuilders.matchAllQuery();
+
+		} else if(filters.size()==1){
+			return QueryBuilders.matchQuery(filters.get(0).getProperty(), filters.get(0).getFiltervalue());
+		}
+		else {
+			BoolQueryBuilder query = new BoolQueryBuilder();
+			for (Filter fi : filters) {
+				query.must(QueryBuilders.matchQuery((prefix != null ? prefix : "") + fi.getProperty(),
+						fi.getFiltervalue()));
+			}
+			return query;
+		}
+
+	}
+	private static QueryBuilder setSortOrder(QueryBuilder query, @Nullable List<Sortorder> sortorder) {
+		return setSortOrder(query, sortorder, "");
+	}
+
+	private static QueryBuilder setSortOrder(QueryBuilder query, @Nullable List<Sortorder> sortorder, String prefix) {
+		if (sortorder != null && sortorder.size() > 0) {
+			for (Sortorder so : sortorder) {
+				query.sort((prefix != null ? prefix : "") + so.getProperty(),
+						so.getSortorder() == SortOrder.Ascending
+								? org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.ASCENDING
+								: org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.DESCENDING);
+			}
+		}
+		return query;
+
+	}
+
+	private static void setPagination(ReadPmdata15mListOutputBuilder outputBuilder, long page, long pageSize, long totalSize) {
+		org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Pagination value = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.PaginationBuilder()
+				.setPage(BigInteger.valueOf(page)).setSize(pageSize).setTotal(BigInteger.valueOf(totalSize)).build();
+		outputBuilder.setPagination(value);
+	}
+
+}
diff --git a/sdnr/wt/data-provider/database/src/test/resources/log4j2.xml b/sdnr/wt/data-provider/database/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..164e93f54
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/resources/log4j2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration package="log4j.test" 
+               status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="log4j.test.Log4jTest" level="debug">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Root level="trace">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/sdnr/wt/data-provider/database/src/test/resources/simplelogger.properties b/sdnr/wt/data-provider/database/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..a2f1e7e76
--- /dev/null
+++ b/sdnr/wt/data-provider/database/src/test/resources/simplelogger.properties
@@ -0,0 +1,6 @@
+org.slf4j.simpleLogger.defaultLogLevel=debug
+org.slf4j.simpleLogger.showDateTime=true
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+#org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=false
\ No newline at end of file
diff --git a/sdnr/wt/devicemodel/feature/pom.xml b/sdnr/wt/data-provider/feature/pom.xml
index bd40e69be..39bf1f8c7 100644
--- a/sdnr/wt/devicemodel/feature/pom.xml
+++ b/sdnr/wt/data-provider/feature/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
  * ============LICENSE_START=======================================================
- * ONAP : CCSDK.sdnr.wt.devicemodel.feature
+ * ONAP : CCSDK.sdnr.wt.dataprovider.feature
  * ================================================================================
  * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
  * All rights reserved.
@@ -18,41 +19,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemodel-feature</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencyManagement>
     <dependencies>
-      
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-data-provider-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemodel-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/sdnr/wt/data-provider/installer/pom.xml b/sdnr/wt/data-provider/installer/pom.xml
new file mode 100755
index 000000000..e9a4860ff
--- /dev/null
+++ b/sdnr/wt/data-provider/installer/pom.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.dataprovider.installer
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-data-provider</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-schemas</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly/cache/schema</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/../provider/src/main/resources/preload.cache.schema</directory>
+                                    <includes>
+                                        <include>*.yang</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemodel/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/data-provider/installer/src/assembly/assemble_mvnrepo_zip.xml
index c4eb9aa25..c4eb9aa25 100644
--- a/sdnr/wt/devicemodel/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/sdnr/wt/data-provider/installer/src/assembly/assemble_mvnrepo_zip.xml
diff --git a/sdnr/wt/data-provider/model/pom.xml b/sdnr/wt/data-provider/model/pom.xml
new file mode 100644
index 000000000..8ac1ef01d
--- /dev/null
+++ b/sdnr/wt/data-provider/model/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.data-provider.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanProvider.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/ArchiveCleanProvider.java
index 44fae6d61..00ec2e60e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanProvider.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/ArchiveCleanProvider.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice;
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.model;
 
 import java.util.Date;
 
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java
new file mode 100644
index 000000000..fbfd18a2f
--- /dev/null
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java
@@ -0,0 +1,95 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.model;
+
+import java.util.Date;
+import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+
+public interface DataProvider extends ArchiveCleanProvider {
+
+    // -- Connection log
+    void writeConnectionLog(ConnectionlogEntity event);
+
+    // -- Event log
+    void writeEventLog(EventlogEntity event);
+
+    void writeFaultLog(FaultlogEntity fault);
+
+    void updateFaultCurrent(FaultcurrentEntity fault);
+
+    /**
+     * Remove all entries for one node
+     *
+     * @param nodeName contains the mountpointname
+     * @return number of deleted entries
+     */
+    int clearFaultsCurrentOfNode(String nodeName);
+
+    /**
+     * Remove all entries for one node
+     *
+     * @param nodeName contains the mountpointname
+     * @param objectId of element to be deleted
+     * @return number of deleted entries
+     */
+    int clearFaultsCurrentOfNodeWithObjectId(String nodeName, String objectId);
+
+    /**
+     * Deliver list with all mountpoint/node-names in the database.
+     *
+     * @return List of all mountpoint/node-names the had active alarms.
+     */
+    List<String> getAllNodesWithCurrentAlarms();
+
+    /**
+     * write internal equipment to database
+     * @param internalEquipment with mandatory fields.
+     */
+    void writeInventory(Inventory internalEquipment);
+
+    /**
+     *
+     * @param networkElementConnectionEntitiy to wirte to DB
+     * @param nodeId Id for this DB element
+     */
+    void updateNetworkConnectionDeviceType(NetworkElementConnectionEntity networkElementConnectionEntitiy,
+            String nodeId);
+
+    /**
+     * Update after new mountpoint registration
+     * @param networkElementConnectionEntitiy data
+     * @param nodeId of device (mountpoint name)
+     */
+    void updateNetworkConnection22(NetworkElementConnectionEntity networkElementConnectionEntitiy, String nodeId);
+
+    void removeNetworkConnection(String nodeId);
+
+    @Override
+	int doIndexClean(Date olderAreOutdated);
+
+    @Override
+	int getNumberOfOldObjects(Date olderAreOutdated);
+
+    List<NetworkElementConnectionEntity> getNetworkElementConnections();
+}
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/IEntityDataProvider.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/IEntityDataProvider.java
new file mode 100644
index 000000000..c8c940433
--- /dev/null
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/IEntityDataProvider.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.model;
+
+public interface IEntityDataProvider {
+
+    /** Get provider for database read/write operations **/
+    public DataProvider getDataProvider();
+
+    public void setReadyStatus(boolean status);
+}
diff --git a/sdnr/wt/data-provider/model/src/main/yang/dataprovider.yang b/sdnr/wt/data-provider/model/src/main/yang/dataprovider.yang
new file mode 100644
index 000000000..8fa19a990
--- /dev/null
+++ b/sdnr/wt/data-provider/model/src/main/yang/dataprovider.yang
@@ -0,0 +1,1207 @@
+module data-provider {
+
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:data-provider";
+    prefix "odluxprovider";
+
+    import ietf-yang-types { prefix "yang"; revision-date 2013-07-15; }
+    import netconf-node-topology { prefix "nettop"; revision-date 2015-01-14; }
+    description
+        "data-provider api module";
+
+    revision "2019-08-01" {
+        description
+                "Initial revision";
+    }
+    // --- typedef
+    typedef Entity {
+        description "Data type and alias for elasticsearch or table name for SQL database.";
+        type enumeration {
+            enum connectionlog {
+                description "logs mountpoint connection state changes";
+            }
+            enum faultcurrent {
+                description "current faults";
+            }
+            enum eventlog {
+                description "logs for all notifications e.g. netconf, ves and internal events";
+            }
+            enum faultlog {
+                description "faultlog information";
+            }
+            enum historicalperformance15min {
+                description "performance data";
+            }
+            enum historicalperformance24h {
+                description "performance data";
+            }
+            enum mediator-server {
+                description "list of mediator servers";
+            }
+            enum networkelement-connection {
+                description "list of mountpoints for netconf devices (joint required-network-element+mdsal
+                                state";
+            }
+            enum inventoryequipment {
+                description "list of equipment inventory";
+            }
+            enum maintenancemode {
+                description "list of maintenance setting";
+            }
+        }
+    }
+    typedef SortOrder {
+        type enumeration {
+            enum ascending {
+            }
+            enum descending {
+            }
+        }
+        description "Entities for odlux clients";
+    }
+    typedef FilterProperty {
+        type string;
+    }
+
+    typedef NotificationType {
+        type enumeration {
+            enum ProblemNotificationXml {
+                description "";
+            }
+            enum AttributeValueChangedNotificationXml {
+                description "";
+            }
+        }
+    }
+
+    typedef ConnectionLogStatus {
+        type enumeration {
+            enum Mounted {
+                description "Mountpoint created";
+            }
+            enum Unmounted {
+                description "Mountpoint removed";
+            }
+            enum Connecting {
+                description "Mountpoint establishing connection";
+            }
+            enum Connected {
+                description "Mountpoint connection established";
+            }
+            enum UnableToConnect {
+                description "Mountpoint connection not possible";
+            }
+            enum Disconnected {
+                description "Required and mountpoint removed";
+            }
+            enum Undefined {
+                description "Status not available";
+            }
+        }
+    }
+    typedef NetworkElementDeviceType {
+        type enumeration {
+            enum Wireless {
+                description "implements microwave-model.yang or air-interface.yang";
+            }
+            enum RAN {
+                description "implements sth. like o-ran*.yang";
+            }
+            enum ORAN {
+                description "implements RAN according to o-ran*.yang";
+            }
+            enum RAN3GPP {
+                description "implements RAN according to _3gpp-ran*.yang";
+            }
+            enum Optical {
+                description "implements tapi-*.yang or org-openroadm*.yang";
+            }
+            enum Router {
+                description "implements vlan-interface.yang";
+            }
+            enum NtsManager {
+
+                description "Simulation of device";
+            }
+            enum Nonsupported {
+                description "Device type known, but not support";
+            }
+            enum Unknown {
+                description "Device type at this point of time unknown";
+            }
+        }
+    }
+    typedef severity-type {
+        type enumeration {
+            enum NonAlarmed {
+                description "problem cleared indication";
+            }
+            enum Warning {
+                description "problem level";
+            }
+            enum Minor {
+                description "problem level";
+            }
+            enum Major {
+                description "problem level";
+            }
+            enum Critical {
+                description "problem level";
+            }
+        }
+        description "According to ITU-T M.3160";
+    }
+    typedef source-type {
+        type enumeration {
+            enum ves {
+                description "VES Interface";
+            }
+            enum netconf {
+                description "NETCONF Interface";
+            }
+            enum controller {
+                description "SDN Controller";
+            }
+            enum unknown {
+                description "Unknown source";
+            }
+        }
+    }
+    // --- grouping and builder-container
+    grouping connectionlog-entity {
+        leaf id {
+            type string;
+            description "database id";
+        }
+        leaf node-id {
+            type string;
+            description "the node/mountpoint which connection state has changed";
+        }
+        leaf timestamp {
+            type yang:date-and-time;
+            description "timestamp when event happened";
+        }
+        leaf status {
+            type ConnectionLogStatus;
+            description "new state of the connection of the device";
+        }
+    }
+    container connectionlog {
+        description "builder";
+        uses connectionlog-entity;
+    }
+    grouping object-change-reference {
+        description "Reference of of object (e.g. Interface pack) owned by a node";
+        leaf node-id {
+            type string;
+        }
+        leaf counter {
+            type int32;
+        }
+        leaf timestamp {
+            type yang:date-and-time;
+        }
+        leaf object-id {
+            type string;
+        }
+    }
+    grouping source-reference {
+        description "Identify a source";
+        leaf source-type {
+            type source-type;
+        }
+    }
+    grouping fault {
+        description "Fault event of an object";
+        leaf problem {
+            type string;
+        }
+        leaf severity {
+            type severity-type;
+        }
+    }
+    grouping attribute-change {
+        description "update change of an attribute";
+        leaf attribute-name {
+            type string;
+        }
+        leaf new-value {
+            type string;
+        }
+    }
+    grouping entity-id {
+        description "Unique database id of entity";
+        leaf id {
+            type string;
+        }
+    }
+    grouping faultcurrent-entity {
+        description "Current fault status";
+        uses object-change-reference;
+        uses fault;
+        uses entity-id;
+    }
+    container faultcurrent {
+        description "builder";
+        uses faultcurrent-entity;
+    }
+    grouping faultlog-entity {
+        description "Changed fault indication";
+        uses source-reference;
+        uses object-change-reference;
+
+        uses fault;
+        uses entity-id;
+    }
+    container faultlog {
+        description "builder";
+        uses faultlog-entity;
+    }
+    grouping eventlog-entity {
+        description "One change event of devices";
+        uses source-reference;
+        uses object-change-reference;
+        uses attribute-change;
+        uses entity-id;
+    }
+    container eventlog {
+        description "builder";
+        uses eventlog-entity;
+    }
+    grouping filter {
+        leaf description {
+            type string;
+            description "Filter specific description";
+        }
+        leaf start {
+            type yang:date-and-time;
+            description "begin of maintenance-mode";
+        }
+        leaf end {
+            type yang:date-and-time;
+            description "end of maintenance-mode";
+        }
+        leaf object-id-ref {
+            type string;
+            description "object id to filter on, or empty for all";
+        }
+        leaf problem {
+            type string;
+            description "name of the problem to filter or empty for all";
+        }
+    }
+    grouping maintenance-entity {
+        description "Maintenance mode for a device. ";
+        leaf id {
+            mandatory true;
+            type string;
+            description "Key to get/set configuration entry in database. Normally Mountpoint-name
+                        is used as key id of node.";
+        }
+        leaf node-id {
+            mandatory true;
+            type string;
+            description "";
+        }
+        leaf active {
+            type boolean;
+            description "Configuration to activate or deactivate this entry";
+        }
+        uses filter;
+    }
+    container maintenance {
+        description "builder";
+        uses maintenance-entity;
+    }
+    grouping mediator-server-entity {
+        leaf id {
+            mandatory true;
+            type string;
+        }
+        leaf url {
+            type string;
+        }
+        leaf name {
+            type string;
+        }
+    }
+    grouping pmdata-base {
+        leaf node-name {
+            type string;
+        }
+        leaf uuid-interface {
+            type string;
+        }
+        leaf layer-protocol-name {
+            type string;
+        }
+        leaf radio-signal-id {
+            type string;
+        }
+        leaf time-stamp {
+            type yang:date-and-time;
+        }
+        leaf suspect-interval-flag {
+            type boolean;
+        }
+        leaf granularity-period {
+            type string;
+        }
+        leaf scanner-id {
+            type string;
+        }
+    }
+    grouping pmdata-microwave {
+        description "Consolidated performance information of all microwave model interface pacs";
+        leaf es {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Number of errored seconds.";
+        }
+        leaf ses {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Number of severely errored seconds.";
+        }
+        leaf cses {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Number of consecutive severely errored seconds.";
+        }
+        leaf unavailability {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Total time of unavailability in seconds.";
+        }
+        leaf tx-level-min {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Minimum transmit power. Signed integers are required.";
+        }
+        leaf tx-level-max {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Maximum transmit power. Signed integers are required.";
+        }
+        leaf tx-level-avg {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Averaged transmit power. Signed integers are required.";
+        }
+        leaf rx-level-min {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Minimum receive level. Signed integers are required.";
+        }
+        leaf rx-level-max {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Maximum receive level. Signed integers are required.";
+        }
+        leaf rx-level-avg {
+            type int8;
+            units "dBm";
+            default 99;
+            config false;
+            description "Averaged receive level. Signed integers are required.";
+        }
+        leaf time2-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Sum of all seconds the transmitter operated in e.g. BPSK.";
+        }
+        leaf time4-states-s {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time4-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time8-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time16-states-s {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time16-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time32-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time64-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time128-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time256-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time512-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time512-states-l {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time1024-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time1024-states-l {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time2048-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time2048-states-l {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time4096-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time4096-states-l {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time8192-states {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf time8192-states-l {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "none";
+        }
+        leaf snir-min {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Minimum signal to (noise+interference) ratio.";
+        }
+        leaf snir-max {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Maximum signal to (noise+interference) ratio.";
+        }
+        leaf snir-avg {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Averaged signal to (noise+interference) ratio.";
+        }
+        leaf xpd-min {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Minimum cross polarization discrimination.";
+        }
+        leaf xpd-max {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Maximum cross polarization discrimination.";
+        }
+        leaf xpd-avg {
+            type int8;
+            units "dB";
+            default -99;
+            config false;
+            description "Averaged cross polarization discrimination.";
+        }
+        leaf rf-temp-min {
+            type int8;
+            units "C";
+            default -99;
+            config false;
+            description "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+        }
+        leaf rf-temp-max {
+            type int8;
+            units "C";
+            default -99;
+            config false;
+            description "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+        }
+        leaf rf-temp-avg {
+            type int8;
+            units "C";
+            default -99;
+            config false;
+            description "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+        }
+        leaf defect-blocks-sum {
+            type int16;
+            units "blocks";
+            default -1;
+            config false;
+            description "Total number of blocks that were defect after receiving and could not be corrected by the FEC.";
+        }
+        leaf time-period {
+            type int32;
+            units "s";
+            default -1;
+            config false;
+            description "Total length of the measurement period.";
+        }
+    }
+    grouping pmdata-ethernet {
+        description "Consolidated performance information for ethernet.";
+        leaf tx-ethernet-bytes-max-s {
+            type int32;
+            units "Bytes/s";
+            default -1;
+            config false;
+            description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers.";
+        }
+        leaf tx-ethernet-bytes-max-m {
+            type int64;
+            units "Bytes/min";
+            default -1;
+            config false;
+            description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers.";
+        }
+        leaf tx-ethernet-bytes-sum {
+            type int64;
+            units "Bytes";
+            default -1;
+            config false;
+            description "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers.";
+        }
+
+    }
+    grouping pmdata15m-entity {
+        uses pmdata-base;
+        container performance-data {
+            uses pmdata-microwave;
+            uses pmdata-ethernet;
+        }
+
+    }
+    grouping pmdata24h-entity {
+        uses pmdata-base;
+        container performance-data {
+            uses pmdata-microwave;
+            uses pmdata-ethernet;
+        }
+    }
+    grouping inventory-entity {
+        description "One equipment entity in a list of a network element that could be rack, card, backplane, module";
+
+        leaf id {
+            description "Unique database id, node-id/uuid";
+            mandatory true;
+            type string;
+        }
+        leaf tree-level {
+            description "Containment level, starting with 0..";
+            type uint32;
+        }
+        leaf parent-uuid {
+            description "Unique inventory id of holder";
+            type string;
+        }
+        leaf node-id {
+            description "Unique node id of network element";
+            type string;
+        }
+        leaf uuid {
+            description "Unique inventory id of this node for this equipement, provided by network element";
+            type string;
+        }
+        leaf-list contained-holder {
+            description "List of uuid of contained equipment";
+            type string;
+        }
+        leaf manufacturer-name {
+            description "manufactured-thing/manufacturer-properties/manufacturer-name";
+            type string;
+        }
+        leaf manufacturer-identifier {
+            description "manufactured-thing/manufacturer-properties/manufacturer-identifier";
+            type string;
+        }
+        leaf serial {
+            description "manufactured-thing/equipment-instance/serial";
+            type string;
+        }
+        leaf date {
+            description "manufactured-thing/equipment-instance/manufacture-date: Date information provided by manufacturer. No specific format. ()";
+            type string;
+        }
+        leaf version {
+            description "manufactured-thing/equipment-type/version";
+            type string;
+        }
+        leaf description {
+            description "manufactured-thing/equipment-type/description";
+            type string;
+        }
+        leaf part-type-id {
+            description "manufactured-thing/equipment-type/part-type-identifier";
+            type string;
+        }
+        leaf model-identifier {
+            description "manufactured-thing/equipment-type/model-identifier";
+            type string;
+        }
+        leaf type-name {
+            description "manufactured-thing/equipment-type/type-name";
+            type string;
+        }
+    }
+    container inventory {
+        description "builder";
+        uses inventory-entity;
+    }
+    grouping node-details-g {
+        leaf-list available-capabilities {
+            type string;
+        }
+        leaf-list unavailable-capabilities {
+            type string;
+        }
+    }
+    grouping network-element-connection-entity {
+
+        leaf id {
+            type string;
+            description "database id/key. here is equal to node-id";
+        }
+        leaf node-id {
+            type string;
+            description "mountpoint name of device in controller";
+        }
+        leaf host {
+            type string;
+            description "netconf hostname or ip address of device";
+        }
+        leaf port {
+            type uint32;
+            description "netconf port of device";
+        }
+        leaf username {
+            type string;
+            description "netconf username";
+        }
+        leaf password {
+            type string;
+            description "netconf password. should be removed asap";
+        }
+        leaf core-model-capability {
+            type string;
+            description "revision of core-model capability";
+        }
+        leaf device-type {
+            type NetworkElementDeviceType;
+            description "categoried type of ne based on implemented yang specs";
+        }
+        leaf is-required {
+            type boolean;
+            description "entry exists in db index required-networkelement";
+        }
+        container node-details {
+            uses node-details-g;
+            description "holder of available and unavailable capabilities";
+        }
+        leaf status {
+            type ConnectionLogStatus;
+            description "current connection status. default Disconnected";
+        }
+    }
+    container network-element-connection {
+        description "builder";
+        uses network-element-connection-entity;
+    }
+    grouping status-entity {
+        container faults {
+            leaf criticals {
+                type uint32;
+            }
+            leaf majors {
+                type uint32;
+            }
+            leaf minors {
+                type uint32;
+            }
+            leaf warnings {
+                type uint32;
+            }
+        }
+    }
+    container status {
+        description "builder";
+         uses status-entity;
+    }
+    grouping entity-input {
+        list filter {
+            key property;
+            leaf property {
+                type string;
+            }
+            leaf filtervalue {
+                type string;
+            }
+            description "List with filter criteria. Not listed means all.";
+        }
+        list sortorder {
+            key property;
+            leaf property {
+                type string;
+            }
+            leaf sortorder {
+                type SortOrder;
+            }
+            description "List with sort order. Not listed means default";
+        }
+        container pagination {
+            leaf size {
+                type uint32 {
+                    range "1..max";
+                }
+                default 20;
+                description "Number of entries to be delivered";
+            }
+            leaf page {
+                type uint64 {
+                    range "1..max";
+                }
+                default 1;
+                description "Number to be used to calculate starting entry to deliver";
+            }
+        }
+    }
+    grouping pagination-output-g {
+        leaf size {
+            type uint32 {
+                range "1..max";
+            }
+            default 20;
+            description "Number of entries to be delivered";
+        }
+        leaf page {
+            type uint64 {
+                range "1..max";
+            }
+            default 1;
+            description "Number to be used to calculate starting entry to deliver";
+        }
+        leaf total {
+            type uint64 {
+                range "0..max";
+            }
+            default 0;
+            description "Number to be used to calculate starting entry to deliver";
+        }
+    }
+    container pagination-output {
+        description "builder";
+        uses pagination-output-g;
+    }
+    // --- rpc
+    rpc read-faultcurrent-list {
+        description
+                "Get list of faultcurrent entries according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses faultcurrent-entity;
+            }
+        }
+    }
+    rpc read-faultlog-list {
+        description
+                "Get list of faultlog entries according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses faultlog-entity;
+            }
+        }
+    }
+
+    rpc read-eventlog-list {
+        description
+                "Get list of eventlog entities according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses eventlog-entity;
+            }
+        }
+    }
+    rpc read-connectionlog-list {
+        description
+                "Get list of eventlog entities according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses connectionlog-entity;
+            }
+        }
+    }
+    rpc read-maintenance-list {
+        description
+                "Get list of maintenance entries according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses maintenance-entity;
+            }
+        }
+    }
+    rpc create-maintenance {
+        description
+                "insert new entry of maintenance";
+        input {
+            uses maintenance-entity;
+        }
+        output {
+            uses maintenance-entity;
+        }
+    }
+    rpc update-maintenance {
+        description
+                "update existing entity of maintenance";
+        input {
+            uses maintenance-entity;
+        }
+        output {
+            uses maintenance-entity;
+        }
+    }
+    rpc delete-maintenance {
+        description
+                "delete entity of maintenance";
+        input {
+            uses maintenance-entity;
+        }
+        output {
+        }
+    }
+
+    rpc read-mediator-server-list {
+        description
+                "Get list of mediator-servers according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses mediator-server-entity;
+            }
+        }
+    }
+    rpc create-mediator-server {
+        description
+                "create new entry of entity mediator-server";
+        input {
+            uses mediator-server-entity;
+        }
+        output {
+            uses mediator-server-entity;
+        }
+    }
+    rpc update-mediator-server {
+        description
+                "update entry of entity mediator-server";
+        input {
+            uses mediator-server-entity;
+        }
+        output {
+            uses mediator-server-entity;
+        }
+    }
+    rpc delete-mediator-server {
+        description
+                "delete entry of entity mediator-server";
+        input {
+            uses mediator-server-entity;
+        }
+        output {
+        }
+    }
+    rpc read-network-element-connection-list {
+        description
+                "Get list of networkelement-connections according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses network-element-connection-entity;
+            }
+        }
+    }
+    rpc create-network-element-connection {
+        description "create entry in networkelement-connection";
+        input {
+            uses network-element-connection-entity;
+        }
+        output {
+            uses network-element-connection-entity;
+        }
+    }
+    rpc update-network-element-connection {
+        description "Put an element to ne-entity";
+        input {
+            uses network-element-connection-entity;
+        }
+        output {
+            uses network-element-connection-entity;
+        }
+    }
+    rpc delete-network-element-connection {
+        description "!ONLY FOR TESTING! Put an element to ne-entity";
+        input {
+            uses network-element-connection-entity;
+        }
+        output {
+        }
+    }
+
+    rpc read-pmdata-15m-ltp-list {
+        description
+                "Get list of ltps for one mountpoint with historical pmdata";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            leaf-list data {
+                type string;
+            }
+        }
+    }
+    rpc read-pmdata-24h-ltp-list {
+        description
+                "Get list of ltps for one mountpoint with historical pmdata";
+        input {
+            uses entity-input;
+        }
+
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            leaf-list data {
+                type string;
+            }
+        }
+    }
+    rpc read-pmdata-15m-device-list {
+        description
+                "Get list of mountpoints with historical pmdata";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            leaf-list data {
+                type string;
+            }
+        }
+    }
+    rpc read-pmdata-24h-device-list {
+        description
+                "Get list of mountpoints with historical pmdata";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            leaf-list data {
+                type string;
+            }
+        }
+    }
+
+    rpc read-pmdata-15m-list {
+        description
+                "Get list of entities according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses pmdata15m-entity;
+            }
+        }
+    }
+    rpc read-pmdata-24h-list {
+        description
+                "Get list of historical pmdata according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses pmdata24h-entity;
+            }
+        }
+    }
+    rpc read-inventory-list {
+        description
+                "Get list of inventory according to filter";
+        input {
+            uses entity-input;
+        }
+        output {
+            container pagination {
+                uses pagination-output-g;
+            }
+            list data {
+                uses inventory-entity;
+            }
+        }
+    }
+    rpc read-status {
+        description
+                "Read status information of controller";
+        output {
+            list data {
+                uses status-entity;
+            }
+        }
+    }
+}
+
diff --git a/sdnr/wt/data-provider/pom.xml b/sdnr/wt/data-provider/pom.xml
new file mode 100755
index 000000000..ad621ea4a
--- /dev/null
+++ b/sdnr/wt/data-provider/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.data-provider
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <modules>
+        <module>model</module>
+        <module>database</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>sdnr-wt-data-provider</feature-name>
+    </properties>
+</project>
diff --git a/sdnr/wt/data-provider/provider/copyright b/sdnr/wt/data-provider/provider/copyright
new file mode 100644
index 000000000..754b6218f
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/copyright
@@ -0,0 +1,17 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml
new file mode 100644
index 000000000..557c82f23
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/pom.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    ONAP : CCSDK / SDNR / WT / data-provider
+    ================================================================================
+    Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-data-provider-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp}</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <elasticsearch.lucene.version>7.4.0</elasticsearch.lucene.version>
+        <databaseport>49402</databaseport>
+        <onap.distname>Frankfurt</onap.distname>
+        <odl.distname>Neon-SR1</odl.distname>
+        <odlux.buildno>29.7af5ca8(19/11/19)</odlux.buildno>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-data-provider-database</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessor.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessor.java
new file mode 100644
index 000000000..dc90ee9fa
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessor.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.database.EsDataObjectReaderWriter;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataProviderServiceImpl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EntityInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListOutputBuilder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DataObjectAcessor<T extends DataObject> extends EsDataObjectReaderWriter<T> {
+
+	private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessor.class);
+
+	public DataObjectAcessor(HtDatabaseClient dbClient, Entity entity, Class<T> clazz) throws ClassNotFoundException {
+		this(dbClient, entity, clazz, true);
+		LOG.info("Create {}", this.getClass().getName());
+	}
+
+	public DataObjectAcessor(HtDatabaseClient dbClient, Entity entity, Class<T> clazz, boolean idSupported) throws ClassNotFoundException {
+		super(dbClient, entity, clazz);
+		if (idSupported)
+			setEsIdAttributeName("_id");
+	}
+
+	QueryResult<T> getData(EntityInput input) {
+		long page = QueryByFilter.getPage(input);
+		long pageSize = QueryByFilter.getPageSize(input);
+        LOG.info("Request: {}", this.getDataTypeName());
+		QueryBuilder query = QueryByFilter.fromFilter(input.getFilter()).from((page - 1) * pageSize).size(pageSize);
+		QueryByFilter.setSortOrder(query, input.getSortorder());
+		SearchResult<T> result = doReadAll(query,query.contains("range"));
+		return new QueryResult<T>(page, pageSize, result);
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorPm.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorPm.java
new file mode 100644
index 000000000..a145a9f1b
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorPm.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.io.IOException;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.ExtRestClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.SearchRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.AggregationEntries;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.SearchResponse;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EntityInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SortOrder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Filter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Sortorder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DataObjectAcessorPm<T extends DataObject> extends DataObjectAcessor<T> {
+
+ 	private final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorPm.class);
+
+	private static final String UUID_KEY = "uuid-interface";
+	private static final String NODE_KEY = "node-name";
+	private static final String KEY = "node-name";
+
+
+	enum Intervall {
+		PMDATA15M("historicalperformance15min", "historicalperformance15min"),
+		PMDATA24H("historicalperformance24h", "historicalperformance24h");
+
+		String index;
+		String type;
+
+		Intervall(String index, String type) {
+		    this.index = index;
+		    this.type = type;
+		}
+
+		public String getIndex() {
+			return index;
+		}
+
+		public String getType() {
+			return type;
+		}
+	}
+
+	private ExtRestClient dbClient;
+	private Intervall mode;
+
+	public DataObjectAcessorPm(HtDatabaseClient dbClient, Intervall mode, Entity entity, Class<T> clazz) throws ClassNotFoundException {
+		super(dbClient, entity, clazz, false);
+		this.dbClient = dbClient;
+		this.mode = mode;
+	}
+
+	/**
+	 * get aggregated list of ltps for filter NODE_KEY
+	 * @param input
+	 * @return
+	 * @throws IOException
+	 */
+	QueryResult<String> getDataLtpList(EntityInput input) throws IOException {
+		long page = QueryByFilter.getPage(input);
+		long pageSize = QueryByFilter.getPageSize(input);
+		Filter nodeFilter = QueryByFilter.getFilter(input.getFilter(), NODE_KEY);
+		if (nodeFilter != null) {
+			SearchRequest request = new SearchRequest(mode.getIndex(), mode.getType());
+			request.setQuery(QueryBuilders.matchQuery(NODE_KEY, nodeFilter.getFiltervalue()).aggregations(UUID_KEY).size(0));
+			try {
+				SearchResponse response = this.dbClient.search(request);
+				AggregationEntries aggs = response.getAggregations(UUID_KEY);
+				String[] uuids = aggs.getKeysAsPagedStringList(pageSize, pageSize * (page - 1));
+				long totalSize = aggs.size();
+				return new QueryResult<String>(page, pageSize, new SearchResult<String>(uuids, totalSize));
+			} catch (IOException e) {
+				throw new IOException("problem reading ltps for req="+request, e);
+			}
+		} else {
+			String msg = "no nodename in filter found ";
+			LOG.debug(msg);
+			throw new IllegalArgumentException(msg);
+		}
+	}
+	
+//	QueryResult<String> getDataDeviceList(EntityInput input) throws IOException {
+//
+//		long page = QueryByFilter.getPage(input);
+//		long pageSize = QueryByFilter.getPageSize(input);
+//
+//		SearchRequest request = new SearchRequest(mode.getIndex(), mode.getType());
+//		request.setQuery(QueryBuilders.matchAllQuery().aggregations(KEY).size(0));
+////		try {
+//			SearchResponse response = this.dbClient.search(request);
+//			AggregationEntries aggs = response.getAggregations(KEY);
+//			String[] uuids = aggs.getKeysAsPagedStringList(pageSize, pageSize * (page - 1));
+//			long totalSize = aggs.size();
+//			return new QueryResult<String>(page, pageSize, new SearchResult<String>(uuids, totalSize));
+////		} catch (IOException e) {
+////			throw new IOException("problem reading nodes for req="+request, e);
+////		}
+//	}
+	/**
+	 * get aggregated devices list
+	 * @param input filter should be empty/no filter handled, only sortorder for KEY ('node-name')
+	 * @return
+	 * @throws IOException
+	 */
+	QueryResult<String> getDataDeviceList(EntityInput input) throws IOException {
+
+		long page = QueryByFilter.getPage(input);
+		long pageSize = QueryByFilter.getPageSize(input);
+
+		Sortorder soNode = QueryByFilter.getSortOrder(input.getSortorder(), KEY);
+		SearchRequest request = new SearchRequest(mode.getIndex(), mode.getType());
+		QueryBuilder query = null;
+		if (soNode != null) {
+			query = QueryBuilders.matchAllQuery()
+					.aggregations(KEY,
+							soNode.getSortorder() == SortOrder.Ascending
+									? org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.ASCENDING
+									: org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.DESCENDING)
+					.size(0);
+		} else {
+			query = QueryBuilders.matchAllQuery().aggregations(KEY).size(0);
+		}
+		request.setQuery(query);
+		try {
+			SearchResponse response = this.dbClient.search(request);
+			AggregationEntries aggs = response.getAggregations(KEY);
+			String[] uuids = aggs.getKeysAsPagedStringList(pageSize, pageSize * (page - 1));
+			long totalSize = aggs.size();
+			return new QueryResult<String>(page, pageSize, new SearchResult<String>(uuids, totalSize));
+		} catch (IOException e) {
+			throw new IOException("problem reading nodes for req=" + request, e);
+		}
+
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorStatus.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorStatus.java
new file mode 100644
index 000000000..5970d5416
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/DataObjectAcessorStatus.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.io.IOException;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.ExtRestClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.SearchRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.AggregationEntries;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.SearchResponse;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.status.output.Data;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.status.output.DataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.status.entity.FaultsBuilder;
+
+public class DataObjectAcessorStatus extends DataObjectAcessor<Data> {
+
+	final String ESDATATYPE_FAULTCURRENT_SEVERITY_KEY = "severity";
+
+	private final ExtRestClient dbClient;
+	private final Entity entity;
+
+	public DataObjectAcessorStatus(HtDatabaseClient dbClient, Entity entity)
+			throws ClassNotFoundException {
+		super(dbClient, entity, Data.class, false);
+		this.dbClient = dbClient;
+		this.entity = entity;
+	}
+
+	QueryResult<Data> getDataStatus() throws IOException {
+	SearchRequest request = getNewInstanceOfSearchRequest(entity);
+	request.setQuery(
+			QueryBuilders.matchAllQuery().aggregations(ESDATATYPE_FAULTCURRENT_SEVERITY_KEY).size(0));
+		SearchResponse response = this.dbClient.search(request);
+		AggregationEntries aggs = response.getAggregations(ESDATATYPE_FAULTCURRENT_SEVERITY_KEY);
+
+		Data[] data = { new DataBuilder().setFaults(new FaultsBuilder().
+						setCriticals(aggs.getOrDefault("Critical",0L)).
+						setMajors(aggs.getOrDefault("Major", 0L)).
+						setMinors(aggs.getOrDefault("Minor", 0L)).
+						setWarnings(aggs.getOrDefault("Warning", 0L)).
+						build()).build() };
+		long toalsize = data.length;
+		return new QueryResult<Data>(1L, 1L, new SearchResult<Data>(data, toalsize));
+
+	}
+
+
+    private static SearchRequest getNewInstanceOfSearchRequest(Entity entity) {
+    	return new SearchRequest(entity.getName(), entity.getName());
+    }
+
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java
new file mode 100644
index 000000000..306fe95f4
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java
@@ -0,0 +1,439 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.DataObjectAcessorPm.Intervall;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EntityInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MediatorServerEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadStatusOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionOutputBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ElasticSearchDataProvider implements IEntityDataProvider {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchDataProvider.class);
+
+    private final HtDatabaseClient dbClient;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.Data> eventRWFaultCurrent;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.Data> eventRWFaultLog;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data> mediatorserverRW;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.Data> maintenanceRW;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data> equipmentRW;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.Data> connnectionlogRW;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.Data> eventlogRW;
+    private final DataObjectAcessor<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.Data> networkelementConnectionRW;
+    private final DataObjectAcessorPm<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> pm15mRW;
+    private final DataObjectAcessorPm<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Data> pm24hRW;
+
+    private final DataObjectAcessorStatus readStatus;
+    private final HtDatabaseEventsService databaseService;
+
+    public ElasticSearchDataProvider(HostInfo[] hosts) throws Exception {
+        LOG.info("Start {}", this.getClass().getName());
+
+        this.dbClient = new HtDatabaseClient(hosts);
+        this.mediatorserverRW = new DataObjectAcessor<>(dbClient, Entity.MediatorServer,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data.class);
+        this.mediatorserverRW.setWriteInterface(MediatorServerEntity.class);
+
+        this.maintenanceRW = new DataObjectAcessor<>(dbClient, Entity.Maintenancemode,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.Data.class);
+        this.maintenanceRW.setWriteInterface(MaintenanceEntity.class);
+
+        this.equipmentRW = new DataObjectAcessor<>(dbClient, Entity.Inventoryequipment,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data.class);
+
+        this.eventRWFaultCurrent = new DataObjectAcessor<>(dbClient, Entity.Faultcurrent,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.Data.class);
+
+        this.eventRWFaultLog = new DataObjectAcessor<>(dbClient, Entity.Faultlog,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.Data.class);
+
+        this.connnectionlogRW = new DataObjectAcessor<>(dbClient, Entity.Connectionlog,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.Data.class);
+
+        this.eventlogRW = new DataObjectAcessor<>(dbClient, Entity.Eventlog,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.Data.class);
+
+        this.networkelementConnectionRW = new DataObjectAcessor<>(dbClient, Entity.NetworkelementConnection,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.Data.class);
+        this.networkelementConnectionRW.setWriteInterface(NetworkElementConnectionEntity.class);
+
+        this.pm15mRW = new DataObjectAcessorPm<>(dbClient, Intervall.PMDATA15M, Entity.Historicalperformance15min,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data.class);
+
+        this.pm24hRW = new DataObjectAcessorPm<>(dbClient, Intervall.PMDATA24H, Entity.Historicalperformance24h,
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Data.class);
+
+        this.readStatus = new DataObjectAcessorStatus(dbClient, Entity.Faultcurrent );
+
+        this.databaseService = new HtDatabaseEventsService(dbClient);
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.PaginationBuilder
+    //eventRWFaultCurrent
+    public ReadFaultcurrentListOutputBuilder readFaultCurrentList(EntityInput input) {
+
+        ReadFaultcurrentListOutputBuilder outputBuilder = new ReadFaultcurrentListOutputBuilder();
+
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.Data> result = this.eventRWFaultCurrent
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.PaginationBuilder
+    //eventRWFaultLog
+    public ReadFaultlogListOutputBuilder readFaultLogList(EntityInput input) {
+        ReadFaultlogListOutputBuilder outputBuilder = new ReadFaultlogListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.Data> result = this.eventRWFaultLog
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.PaginationBuilder
+    //maintenanceRW
+    public ReadMaintenanceListOutputBuilder readMaintenanceList(EntityInput input) {
+        ReadMaintenanceListOutputBuilder outputBuilder = new ReadMaintenanceListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.Data> result = this.maintenanceRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Pagination
+    //mediatorserverRW
+    public ReadMediatorServerListOutputBuilder readMediatorServerList(EntityInput input) {
+
+        ReadMediatorServerListOutputBuilder outputBuilder = new ReadMediatorServerListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data> result = this.mediatorserverRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.PaginationBuilder
+    //networkelementConnectionRW
+    public ReadNetworkElementConnectionListOutputBuilder readNetworkElementConnectionList(
+            EntityInput input) {
+        ReadNetworkElementConnectionListOutputBuilder outputBuilder = new ReadNetworkElementConnectionListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.Data> result = this.networkelementConnectionRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.PaginationBuilder
+    //equipmentRW
+    public ReadInventoryListOutputBuilder readInventoryList(EntityInput input) {
+        ReadInventoryListOutputBuilder outputBuilder = new ReadInventoryListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data> result = this.equipmentRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.PaginationBuilder
+    //connnectionlogRW
+    public ReadConnectionlogListOutputBuilder readConnectionlogList(EntityInput input) {
+        ReadConnectionlogListOutputBuilder outputBuilder = new ReadConnectionlogListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.Data> result = this.connnectionlogRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.PaginationBuilder
+    //eventlogRW
+    public ReadEventlogListOutputBuilder readEventlogList(ReadEventlogListInput input) throws IOException {
+        ReadEventlogListOutputBuilder outputBuilder = new ReadEventlogListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.Data> result = this.eventlogRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.PaginationBuilder
+    public ReadPmdata15mListOutputBuilder readPmdata15mList(EntityInput input) {
+        ReadPmdata15mListOutputBuilder outputBuilder = new ReadPmdata15mListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> result = this.pm15mRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Pagination
+    public ReadPmdata24hListOutputBuilder readPmdata24hList(EntityInput input) {
+        ReadPmdata24hListOutputBuilder outputBuilder = new ReadPmdata24hListOutputBuilder();
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Data> result = this.pm24hRW
+                .getData(input);
+        outputBuilder.setData(result.getResult().getHits());
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        return outputBuilder;
+    }
+
+    public ReadPmdata15mLtpListOutputBuilder readPmdata15mLtpList(EntityInput input) throws IOException {
+        ReadPmdata15mLtpListOutputBuilder outputBuilder = new ReadPmdata15mLtpListOutputBuilder();
+        QueryResult<String> result = pm15mRW.getDataLtpList(input);
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.ltp.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        outputBuilder.setData(result.getResult().getHits());
+        return outputBuilder;
+    }
+
+    public ReadPmdata15mDeviceListOutputBuilder readPmdata15mDeviceList(EntityInput input) throws IOException {
+        ReadPmdata15mDeviceListOutputBuilder outputBuilder = new ReadPmdata15mDeviceListOutputBuilder();
+        QueryResult<String> result = pm15mRW.getDataDeviceList(input);
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.device.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        outputBuilder.setData(result.getResult().getHits());
+        return outputBuilder;
+    }
+
+    public ReadPmdata24hLtpListOutputBuilder readPmdata24hLtpList(EntityInput input) throws IOException {
+
+        QueryResult<String> result = pm24hRW.getDataLtpList(input);
+
+        ReadPmdata24hLtpListOutputBuilder outputBuilder = new ReadPmdata24hLtpListOutputBuilder();
+        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.ltp.list.output.PaginationBuilder();
+        outputBuilder.setPagination(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.ltp.list.output.PaginationBuilder(
+                result.getPagination()).build());
+        outputBuilder.setData(result.getResult().getHits());
+        return outputBuilder;
+    }
+
+    public ReadPmdata24hDeviceListOutputBuilder readPmdata24hDeviceList(EntityInput input)
+            throws IOException {
+
+        QueryResult<String> result = pm24hRW.getDataDeviceList(input);
+
+        ReadPmdata24hDeviceListOutputBuilder outputBuilder = new ReadPmdata24hDeviceListOutputBuilder();
+        outputBuilder.setPagination(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.device.list.output.PaginationBuilder(
+                        result.getPagination()).build());
+        outputBuilder.setData(result.getResult().getHits());
+        return outputBuilder;
+    }
+
+    public ReadStatusOutputBuilder readStatus() throws IOException {
+        QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.status.output.Data> result = readStatus.getDataStatus();
+
+        ReadStatusOutputBuilder outputBuilder = new ReadStatusOutputBuilder();
+        outputBuilder.setData(result.getResult().getHits());
+        return outputBuilder;
+    }
+
+    public boolean waitForYellowDatabaseStatus(long timeout, TimeUnit unit) {
+        return this.dbClient.waitForYellowStatus(unit.toMillis(timeout));
+    }
+
+     public CreateNetworkElementConnectionOutputBuilder createNetworkElementConnection(
+            NetworkElementConnectionEntity input) throws IOException {
+        String id = this.networkelementConnectionRW.update(input, input.getNodeId());
+        if (id == null) {
+            throw new IOException("unable to write data to database");
+        }
+        CreateNetworkElementConnectionOutputBuilder builder = new CreateNetworkElementConnectionOutputBuilder();
+        builder.setId(id).setNodeId(input.getNodeId()).setHost(input.getHost()).setPort(input.getPort())
+                .setUsername(input.getUsername()).setPassword(input.getPassword()).setIsRequired(input.isIsRequired())
+                .setCoreModelCapability(input.getCoreModelCapability()).setDeviceType(input.getDeviceType());
+        return builder;
+    }
+
+    public UpdateNetworkElementConnectionOutputBuilder updateNetworkElementConnection(
+            UpdateNetworkElementConnectionInput input) throws IOException {
+        String id = this.networkelementConnectionRW.update(input, input.getId());
+        if (id == null) {
+            throw new IOException("unable to update data in database");
+        }
+        UpdateNetworkElementConnectionOutputBuilder builder = new UpdateNetworkElementConnectionOutputBuilder();
+        builder.setId(id).setNodeId(input.getNodeId()).setHost(input.getHost()).setPort(input.getPort())
+                .setUsername(input.getUsername()).setPassword(input.getPassword())
+                .setCoreModelCapability(input.getCoreModelCapability()).setDeviceType(input.getDeviceType());
+        return builder;
+    }
+
+    public DeleteNetworkElementConnectionOutputBuilder deleteNetworkElementConnection(DeleteNetworkElementConnectionInput input) throws IOException {
+        boolean removed = this.networkelementConnectionRW.remove(input.getId());
+        if (!removed) {
+            throw new IOException("unable to remove data from database");
+        }
+        return new DeleteNetworkElementConnectionOutputBuilder();
+    }
+
+    public DeleteMediatorServerOutputBuilder deleteMediatorServer(DeleteMediatorServerInput input) throws IOException {
+        boolean removed = this.mediatorserverRW.remove(input.getId());
+        if (!removed) {
+            throw new IOException("unable to remove data from database");
+        }
+        return new DeleteMediatorServerOutputBuilder();
+    }
+
+    public DeleteMaintenanceOutputBuilder deleteMaintenance(DeleteMaintenanceInput input) throws IOException {
+        boolean removed = this.maintenanceRW.remove(input.getId());
+        if (!removed) {
+            throw new IOException("unable to remove data from database");
+        }
+        return new DeleteMaintenanceOutputBuilder();
+    }
+
+    public UpdateMaintenanceOutputBuilder updateMaintenance(UpdateMaintenanceInput input) throws IOException {
+        if (input.getId() == null) {
+            throw new IOException("please give the id for updating entry");
+        }
+        String id = this.maintenanceRW.update(input, input.getId());
+        if (id == null) {
+            throw new IOException("unable to update data in database");
+        }
+        UpdateMaintenanceOutputBuilder builder = new UpdateMaintenanceOutputBuilder(input).setId(id);
+        return builder;
+    }
+
+    public UpdateMediatorServerOutputBuilder updateMediatorServer(UpdateMediatorServerInput input) throws IOException {
+        if (input.getId() == null) {
+            throw new IOException("please give the id for updating entry");
+        }
+        String id = this.mediatorserverRW.update(input, input.getId());
+        if (id == null) {
+            throw new IOException("unable to update data in database");
+        }
+        UpdateMediatorServerOutputBuilder builder = new UpdateMediatorServerOutputBuilder();
+        builder.setId(id).setName(input.getName()).setUrl(input.getUrl());
+        return builder;
+    }
+
+    public CreateMaintenanceOutputBuilder createMaintenance(CreateMaintenanceInput input) throws IOException {
+        String id = this.maintenanceRW.write(input, input.getNodeId());
+        if (id == null) {
+            throw new IOException("unable to write data to database");
+        }
+        CreateMaintenanceOutputBuilder builder = new CreateMaintenanceOutputBuilder(input).setId(id);
+        return builder;
+    }
+
+     public CreateMediatorServerOutputBuilder createMediatorServer(CreateMediatorServerInput input) throws IOException {
+        String id = this.mediatorserverRW.write(input, null);
+
+        if (id == null) {
+            throw new IOException("unable to write data to database");
+        }
+        CreateMediatorServerOutputBuilder builder = new CreateMediatorServerOutputBuilder();
+        builder.setId(id).setName(input.getName()).setUrl(input.getUrl());
+        return builder;
+    }
+
+    @Override
+    public DataProvider getDataProvider() {
+        return this.databaseService;
+    }
+
+    /**
+     * no need for implementation
+     */
+	@Override
+	public void setReadyStatus(boolean status) {
+		
+	}
+
+
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/FaultEntityManager.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/FaultEntityManager.java
new file mode 100644
index 000000000..f26a30de8
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/FaultEntityManager.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Fault;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
+
+public class FaultEntityManager {
+
+    private static final Pattern pattern = Pattern.compile(".*\\[layerProtocol=(.*)\\]");
+
+    /**
+     * The leading indication for notification or events that are not in the
+     * currentProblem data of the ONF Coremodel
+     */
+    private static final String NOCURRENTPROBLEMINDICATION = "#";
+
+    /**
+     * Specific problems are not moving into current problem list
+     * @param problemName to be verified
+     * @return true if problem is current
+     */
+    public static boolean isManagedAsCurrentProblem(String problemName) {
+        return ! problemName.startsWith(NOCURRENTPROBLEMINDICATION);
+    }
+
+    public static boolean isManagedAsCurrentProblem(Fault problem) {
+        return isManagedAsCurrentProblem(problem.getProblem());
+    }
+
+    /**
+     * Specific problems are not moving into current problem list
+     * @param fault to be verified
+     * @return true if cleared indication
+     */
+    public static boolean isNoAlarmIndication(@Nonnull Fault fault) {
+        return SeverityType.NonAlarmed.equals(fault.getSeverity());
+    }
+
+    /**
+     * Create a specific ES id for the current log.
+     * @return a string with the generated ES Id
+     */
+     public static String genSpecificEsId(String nodeName, String objectId, String problemName) {
+
+        String uuId;
+
+        Matcher matcher = pattern.matcher(objectId);
+        if (matcher.matches() && matcher.groupCount() == 1) {
+            uuId = matcher.group(1);
+        } else {
+            uuId = objectId;
+        }
+
+        StringBuffer strBuf = new StringBuffer();
+        strBuf.append(nodeName);
+        strBuf.append("/");
+        strBuf.append(uuId);
+        strBuf.append("/");
+        strBuf.append(problemName);
+        return strBuf.toString();
+    }
+
+    /**
+     * Create Es id
+     * @param fault used to create uuid for faultcurrent
+     * @return String with Id
+     */
+    public static String genSpecificEsId(FaultcurrentEntity fault) {
+        return genSpecificEsId(fault.getNodeId(), fault.getObjectId(), fault.getProblem());
+    }
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java
new file mode 100644
index 000000000..b08466c8b
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/HtDatabaseEventsService.java
@@ -0,0 +1,388 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.BoolQueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.RangeQueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.database.EsDataObjectReaderWriter2;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.ArchiveCleanProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionInputBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Event service, writing all events into the database into the appropriate
+ * index.
+ *
+ * @author herbert
+ */
+public class HtDatabaseEventsService implements ArchiveCleanProvider, DataProvider {
+    private static final Logger LOG = LoggerFactory.getLogger(HtDatabaseEventsService.class);
+
+    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
+
+    private HtDatabaseClient client;
+    private EsDataObjectReaderWriter2<EventlogEntity> eventRWEventLogDevicemanager;
+    private EsDataObjectReaderWriter2<InventoryEntity> eventRWEquipment;
+    private EsDataObjectReaderWriter2<FaultcurrentEntity> eventRWFaultCurrentDB;
+    private EsDataObjectReaderWriter2<FaultlogEntity> eventRWFaultLogDB;
+    private EsDataObjectReaderWriter2<ConnectionlogEntity> eventRWConnectionLogDB;
+    private EsDataObjectReaderWriter2<NetworkElementConnectionEntity> networkelementConnectionDB;
+    // --- Construct and initialize
+
+    public HtDatabaseEventsService(HtDatabaseClient client) throws Exception {
+
+        LOG.info("Create {} start", HtDatabaseEventsService.class);
+
+        try {
+            // Create control structure
+            this.client = client;
+
+            eventRWEventLogDevicemanager = new EsDataObjectReaderWriter2<>(client, Entity.Eventlog,
+                    EventlogEntity.class, EventlogBuilder.class);
+
+            eventRWEquipment = new EsDataObjectReaderWriter2<>(client, Entity.Inventoryequipment,
+                    InventoryEntity.class, InventoryBuilder.class);
+
+            eventRWFaultCurrentDB = new EsDataObjectReaderWriter2<>(client, Entity.Faultcurrent,
+                    FaultcurrentEntity.class, FaultcurrentBuilder.class);
+
+            eventRWFaultLogDB = new EsDataObjectReaderWriter2<>(client, Entity.Faultlog,
+                    FaultlogEntity.class, FaultlogBuilder.class);
+
+            eventRWConnectionLogDB = new EsDataObjectReaderWriter2<>(client, Entity.Connectionlog,
+                    ConnectionlogEntity.class, ConnectionlogBuilder.class);
+
+            networkelementConnectionDB = new EsDataObjectReaderWriter2<>(client, Entity.NetworkelementConnection,
+                    NetworkElementConnectionEntity.class, NetworkElementConnectionBuilder.class)
+                    .setEsIdAttributeName("_id");
+
+        } catch (Exception e) {
+            LOG.error("Can not start database client. Exception: {}", e);
+            throw new Exception("Can not start database client. Exception: {}", e);
+        }
+        LOG.info("Create {} finished. DB Service {} started.", HtDatabaseEventsService.class,
+                client != null ? "sucessfully" : "not");
+    }
+
+    // --- Function
+
+    // -- Connection log
+    @Override
+    public void writeConnectionLog(ConnectionlogEntity event) {
+        if (assertIfClientNull(event)) {
+            return;
+        }
+        LOG.debug("Write event: {}", event);
+        eventRWConnectionLogDB.write(event, null);
+
+    }
+    // -- Event log
+    @Override
+    public void writeEventLog(EventlogEntity event) {
+        if (assertIfClientNull("No client to write {}", event)) {
+            return;
+        }
+
+        LOG.debug("Write event: {}", event.toString());
+        eventRWEventLogDevicemanager.write(event, null);
+    }
+
+
+    // -- Fault log
+
+    @Override
+    public void writeFaultLog(FaultlogEntity fault) {
+        if (assertIfClientNull(fault)) {
+            return;
+        }
+
+        LOG.debug("Write fault to faultlog: {}", fault.toString());
+        eventRWFaultLogDB.write(fault,null);
+    }
+
+    // -- Fault current
+
+    @Override
+    public void updateFaultCurrent(FaultcurrentEntity fault) {
+        if (assertIfClientNull(fault)) {
+            return;
+        }
+
+        if (FaultEntityManager.isManagedAsCurrentProblem(fault)) {
+            if (FaultEntityManager.isNoAlarmIndication(fault)) {
+                LOG.debug("Remove from currentFaults: {}", fault.toString());
+                eventRWFaultCurrentDB.remove(FaultEntityManager.genSpecificEsId(fault));
+            } else {
+                LOG.debug("Write to currentFaults: {}", fault.toString());
+                eventRWFaultCurrentDB.write(fault, FaultEntityManager.genSpecificEsId(fault));
+            }
+        } else {
+            LOG.debug("Ingnore for currentFaults: {}", fault.toString());
+        }
+    }
+
+    /**
+     * Remove all entries for one node
+     *
+     * @param nodeName contains the mountpointname
+     * @return number of deleted entries
+     */
+    @Override
+    public int clearFaultsCurrentOfNode(String nodeName) {
+        if (assertIfClientNullForNodeName(nodeName)) {
+            return -1;
+        }
+
+        LOG.debug("Remove from currentFaults all faults for node: {}", nodeName);
+        return eventRWFaultCurrentDB.remove(EsFaultCurrent.getQueryForOneNode(nodeName));
+    }
+
+    /**
+     * Remove all entries for one node
+     *
+     * @param nodeName contains the mountpointname
+     * @param objectId of element to be deleted
+     * @return number of deleted entries
+     */
+    @Override
+    public int clearFaultsCurrentOfNodeWithObjectId(String nodeName, String objectId) {
+        if (assertIfClientNullForNodeName(nodeName)) {
+            return -1;
+        }
+
+        LOG.debug("Remove from currentFaults all faults for node/objectId: {}/{}", nodeName, objectId);
+        return eventRWFaultCurrentDB.remove(EsFaultCurrent.getQueryForOneNodeAndObjectId(nodeName, objectId));
+    }
+
+    /**
+     * Deliver list with all mountpoint/node-names in the database.
+     *
+     * @return List of all mountpoint/node-names the had active alarms.
+     */
+    @Override
+    public @Nonnull List<String> getAllNodesWithCurrentAlarms() {
+        if (assertIfClientNull("No DB, can not delete for all nodes", null)) {
+            return new ArrayList<>();
+        }
+
+        LOG.debug("Remove from currentFaults faults for all node");
+        List<String> nodeNames = new ArrayList<>();
+
+        for (FaultcurrentEntity fault : eventRWFaultCurrentDB.doReadAll().getHits()) {
+            String nodeName = fault.getNodeId();
+            if (!nodeNames.contains(nodeName)) {
+                // this.clearFaultsCurrentOfNode(nodeName); -> Function shifted
+                nodeNames.add(nodeName);
+            }
+        }
+        return nodeNames;
+    }
+
+    // -- Inventory and equipment current
+
+    /**
+     * write internal equipment to database
+     * @param internalEquipment with mandatory fields.
+     */
+    @Override
+    public void writeInventory(Inventory internalEquipment) {
+
+        if (assertIfClientNullForNodeName(internalEquipment.getNodeId())) {
+            return;
+        }
+        eventRWEquipment.write(internalEquipment, internalEquipment.getNodeId()+"/"+internalEquipment.getUuid());
+    }
+
+
+    // -- Networkelement
+
+    /**
+     *
+     * @param networkElementConnectionEntitiy to wirte to DB
+     * @param nodeId Id for this DB element
+     */
+    @Override
+    public void updateNetworkConnectionDeviceType(NetworkElementConnectionEntity networkElementConnectionEntitiy, String nodeId) {
+        this.networkelementConnectionDB.update(networkElementConnectionEntitiy, nodeId);
+    }
+
+    /**
+     * Update after new mountpoint registration
+     * @param networkElementConnectionEntitiy data
+     * @param nodeId of device (mountpoint name)
+     */
+    @Override
+    public void updateNetworkConnection22(NetworkElementConnectionEntity networkElementConnectionEntitiy, String nodeId) {
+        this.networkelementConnectionDB.updateOrCreate(networkElementConnectionEntitiy, nodeId, Arrays.asList("is-required", "username", "password"));
+    }
+
+    /* please do not remove */
+    //    public void cleanNetworkElementConnections() {
+    //        this.networkelementConnectionDB.remove(QueryBuilders.matchQuery("is-required", false));
+    //        CreateNetworkElementConnectionInput x = new CreateNetworkElementConnectionInputBuilder().setStatus(ConnectionLogStatus.Disconnected).build();
+    //        this.networkelementConnectionDB.update(x,QueryBuilders.matchAllQuery());
+    //    }
+
+    @Override
+    public void removeNetworkConnection(String nodeId) {
+        Boolean isRequired;
+        NetworkElementConnectionEntity e = this.networkelementConnectionDB.read(nodeId);
+        if (e != null && (isRequired = e.isIsRequired()) != null) {
+            if (isRequired) {
+                LOG.debug("updating connection status for {} of required ne to disconnected",nodeId);
+                this.networkelementConnectionDB.update(new UpdateNetworkElementConnectionInputBuilder().setStatus(ConnectionLogStatus.Disconnected).build(), nodeId);
+            } else {
+                LOG.debug("remove networkelement-connection for {} entry because of non-required",nodeId);
+                this.networkelementConnectionDB.remove(nodeId);
+            }
+        }
+        else {
+            LOG.warn("Unable to update connection-status. dbentry for {} not found in networkelement-connection",nodeId);
+        }
+    }
+
+    // -- Multiple areas
+
+    @Override
+    public int doIndexClean(Date olderAreOutdated) {
+
+        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
+        int removed = 0;
+
+        QueryBuilder queryEventBase = EsEventBase.getQueryForTimeStamp(netconfTimeStamp);
+        removed += eventRWEventLogDevicemanager.remove(queryEventBase);
+
+        QueryBuilder queryFaultLog = EsFaultLogDevicemanager.getQueryForTimeStamp(netconfTimeStamp);
+        removed += eventRWFaultLogDB.remove(queryFaultLog);
+        return removed;
+    }
+
+    @Override
+    public int getNumberOfOldObjects(Date olderAreOutdated) {
+
+        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
+        int numberOfElements = 0;
+
+        QueryBuilder queryEventBase = EsEventBase.getQueryForTimeStamp(netconfTimeStamp);
+        numberOfElements += eventRWEventLogDevicemanager.doReadAll(queryEventBase).getTotal();
+
+        QueryBuilder queryFaultLog = EsFaultLogDevicemanager.getQueryForTimeStamp(netconfTimeStamp);
+        numberOfElements += eventRWFaultLogDB.doReadAll(queryFaultLog).getTotal();
+
+        return numberOfElements;
+    }
+
+    // -- Helper
+
+    /**
+     * Verify status of client
+     * @param event that is printed with message
+     * @return true if client is null
+     */
+    private boolean assertIfClientNull(Object event) {
+        return assertIfClientNull("No DB, can not write: {}", event);
+    }
+
+    private boolean assertIfClientNullForNodeName(Object object) {
+        return assertIfClientNull("No DB, can not handle node: {}", object);
+    }
+    /**
+     * Verify status of client
+     * @param message to print including {} for object printout.
+     * @return true if client is null
+     */
+    private boolean assertIfClientNull(String message, Object object) {
+        if (client == null) {
+            LOG.debug(message, object);
+            return true;
+        }
+        return false;
+    }
+
+    // ### sub classes
+
+
+    private static class EsEventBase {
+        /**
+         * Query to get older Elements
+         * @param netconfTimeStamp to identify older Elements
+         * @return QueryBuilder for older elements related to timestamp
+         */
+        private static QueryBuilder getQueryForTimeStamp(String netconfTimeStamp) {
+            return new RangeQueryBuilder("event.timeStamp").lte(netconfTimeStamp);
+        }
+    }
+    private static class EsFaultLogDevicemanager {
+        /**
+         * Get older Elements
+         * @param netconfTimeStamp to identify query elements older than this timestamp.
+         * @return QueryBuilder for related elements
+         */
+        public static QueryBuilder getQueryForTimeStamp(String netconfTimeStamp) {
+            return new RangeQueryBuilder("timestamp").lte(netconfTimeStamp);
+        }
+     }
+    public static class EsFaultCurrent  {
+        /**
+         * @param nodeName name of the node
+         * @return query builder
+         */
+        public static QueryBuilder getQueryForOneNode( String nodeName) {
+            return QueryBuilders.matchQuery("node-id", nodeName);
+        }
+
+        public static QueryBuilder getQueryForOneNodeAndObjectId( String nodeName, String objectId) {
+            BoolQueryBuilder bq = QueryBuilders.boolQuery();
+            bq.must(QueryBuilders.matchQuery("node-id", nodeName));
+            bq.must(QueryBuilders.matchQuery("object-id", objectId));
+            return bq;
+        }
+    }
+	@Override
+	public List<NetworkElementConnectionEntity> getNetworkElementConnections() {
+		return this.networkelementConnectionDB.doReadAll().getHits();
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/QueryByFilter.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/QueryByFilter.java
new file mode 100644
index 000000000..f00ffb546
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/QueryByFilter.java
@@ -0,0 +1,342 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.common.database.data.DbFilter;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.BoolQueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.RangeQueryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EntityInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SortOrder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Filter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Sortorder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QueryByFilter {
+
+ 	private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorPm.class);
+
+ 	private QueryByFilter() {
+ 		//Hide
+ 	}
+
+	static long getPage(EntityInput input) {
+		return getPage(input, 1);
+	}
+
+	@SuppressWarnings("null")
+	private static long getPage(EntityInput input, long defaultValue) {
+		return input.getPagination() != null ? input.getPagination().getPage().longValue() : defaultValue;
+	}
+
+	static long getPageSize(EntityInput input) {
+		return getPageSize(input, 1);
+	}
+
+	@SuppressWarnings("null")
+	private static long getPageSize(EntityInput input, long defaultValue) {
+		return input.getPagination() != null ? input.getPagination().getSize().longValue() : defaultValue;
+	}
+
+
+	public static QueryBuilder setSortOrder(QueryBuilder query, @Nullable List<Sortorder> sortorder) {
+		return setSortOrder(query, sortorder, "");
+	}
+
+	private static QueryBuilder setSortOrder(QueryBuilder query, @Nullable List<Sortorder> sortorder, String prefix) {
+		if (sortorder != null && sortorder.size() > 0) {
+			for (Sortorder so : sortorder) {
+				query.sort((prefix != null ? prefix : "") + so.getProperty(),
+						so.getSortorder() == SortOrder.Ascending
+								? org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.ASCENDING
+								: org.onap.ccsdk.features.sdnr.wt.common.database.queries.SortOrder.DESCENDING);
+			}
+		}
+		return query;
+
+	}
+
+
+	 public static Sortorder getSortOrder(@Nullable List<Sortorder> list, String prop) {
+		if (list == null) {
+			return null;
+		}
+		for (Sortorder o : list) {
+			if (prop.equals(o.getProperty())) {
+				return o;
+			}
+		}
+		return null;
+	}
+
+	 public static Filter getFilter(@Nullable List<Filter> list, String prop) {
+		if (list == null) {
+			return null;
+		}
+		for (Filter f : list) {
+			if (prop.equals(f.getProperty())) {
+				return f;
+			}
+		}
+		return null;
+	}
+
+	 public static QueryBuilder fromFilter(@Nullable List<Filter> filters) {
+		return fromFilter(filters, "");
+	}
+
+	 private static String fillTimeStamp(String value) {
+		int idx=value.lastIndexOf("*");
+		final String REPLACE="0000-00-00T00:00:00.0Z";
+		String s = value.substring(0,idx)+REPLACE.substring(idx);
+		if(Integer.parseInt(s.substring(5,7))==0) {
+			s=s.substring(0,5)+"01-"+s.substring(8);
+		}
+		if(Integer.parseInt(s.substring(8,10))==0) {
+			s=s.substring(0,8)+"01"+s.substring(10);
+		}
+		
+		return s;
+	 }
+	 /**
+	  * convert timestamp with ending placeholder in filter to elasticsearch filter
+	  * e.g. 2017* => gte: 2017-01-01T00:00:00Z, lt:2018-01-01T00:00:00Z
+	  * 
+	  * 201*   => 2010-01... 2020 ..
+	  * 2018-* => 2018-01... <=> 2019-01
+	  * 
+	  */
+	private static @Nullable QueryBuilder fromTimestampSearchFilter(String property,String value) {
+		if(!value.endsWith("*")) {
+			return null;
+		}
+		int idx=value.lastIndexOf("*");
+		String lowerEnd = fillTimeStamp(value);
+		String upperEnd =null;
+		NetconfTimeStamp converter = NetconfTimeStamp.getConverter();
+		Date dt = null;
+		try{
+			dt=converter.getDateFromNetconf(lowerEnd);
+		}
+		catch(Exception e) {
+			
+		}
+		if(dt==null) {
+			return null;
+		}
+//		property.substring(0,idx)+REPLACE.substring(idx+1);
+		Calendar c  = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+		c.setTime(dt);
+		int tmpvalue;
+		switch(idx) {
+		case 1:  // (2*)
+			c.set(Calendar.YEAR,c.get(Calendar.YEAR)+1000);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 2:  // (20*)
+			c.set(Calendar.YEAR,c.get(Calendar.YEAR)+100);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 3:  // (200*)
+			c.set(Calendar.YEAR,c.get(Calendar.YEAR)+10);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 4:  // (2000*)
+		case 5:  // (2000-*)
+			c.set(Calendar.YEAR,c.get(Calendar.YEAR)+1);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 6: //switch 10 months (2000-0* or 2000-1*)
+			tmpvalue = c.get(Calendar.MONTH);
+				if(tmpvalue<9) {
+					c.set(Calendar.MONTH,9);
+				}
+				else {
+					c.set(Calendar.YEAR,c.get(Calendar.YEAR)+1);
+					c.set(Calendar.MONTH,0);		
+				}
+				upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			
+			break;
+		case 7: //switch one month (2018-01* or 2018-01-*)
+		case 8:
+			c.add(Calendar.MONTH, 1);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 9: // (2018-01-0*)
+			tmpvalue = c.get(Calendar.DAY_OF_MONTH);
+			if(tmpvalue==1) {
+				c.set(Calendar.DAY_OF_MONTH, 10);
+			}else if(tmpvalue==10) {
+				c.set(Calendar.DAY_OF_MONTH, 20);
+			}else if(tmpvalue==20) {
+				if(c.getActualMaximum(Calendar.DAY_OF_MONTH)<30) {
+					c.set(Calendar.DAY_OF_MONTH,1);
+					c.add(Calendar.MONTH,1);
+				}
+				else {
+					c.set(Calendar.DAY_OF_MONTH,30);
+				}
+			}else if(tmpvalue==30) {
+				c.set(Calendar.DAY_OF_MONTH,1);
+				c.add(Calendar.MONTH,1);
+			}
+			else {
+				break;
+			}
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 10: // (2018-01-01*)
+		case 11: // (2018-01-01T*)
+			c.add(Calendar.DAY_OF_MONTH,1);
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 12: // (2018-01-01T1*)
+			tmpvalue = c.get(Calendar.HOUR_OF_DAY);
+			if(tmpvalue==20) {
+				c.set(Calendar.HOUR_OF_DAY,0);
+				c.add(Calendar.DAY_OF_MONTH,1);
+			}
+			else {
+				c.add(Calendar.HOUR_OF_DAY,10);
+			}
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 13: // (2018-01-01T11*)
+		case 14: // (2018-01-01T11-*)
+			c.add(Calendar.HOUR_OF_DAY,1);	
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 15: // (2018-01-01T11-3*)
+			c.add(Calendar.MINUTE,10);	
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 16: // (2018-01-01T11-32*)
+		case 17: // (2018-01-01T11-32-*)
+			c.add(Calendar.MINUTE,1);	
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 18: // (2018-01-01T11-32-1*)
+			c.add(Calendar.SECOND,10);	
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		case 19: // (2018-01-01T11-32-11*)
+		case 20: // (2018-01-01T11-32-11.*)
+			c.add(Calendar.SECOND,1);	
+			upperEnd = converter.getTimeStampAsNetconfString(c.getTime());
+			break;
+		
+			default:
+				break;
+		}
+		 
+		if(upperEnd==null) {
+			return null;
+		}
+		return QueryBuilders.rangeQuery(property).gte(lowerEnd).lt(upperEnd);
+		
+	}
+	private static QueryBuilder fromFilter(@Nullable List<Filter> filters, String prefix) {
+		if (filters == null || filters.size() == 0) {
+			return QueryBuilders.matchAllQuery();
+
+		} else if (filters.size() == 1) {
+			QueryBuilder query;
+			String p = filters.get(0).getProperty();
+			String v= filters.get(0).getFiltervalue();
+			if ("id".equals(p)) {
+				p = "_id";
+			}
+			else {
+			//	v=v.toLowerCase();
+			}
+			if (DbFilter.hasSearchParams(v)) {
+				if(p!=null && "timestamp".equals(p.toLowerCase())) {
+					query = fromTimestampSearchFilter(p,v);
+					if(query!=null) {
+						return query;
+					}
+				}
+				return QueryBuilders.regex(p, DbFilter.createDatabaseRegex(v));
+						
+				
+			} else if (DbFilter.isComparisonValid(v)) {
+				RangeQueryBuilder q = DbFilter.getRangeQuery((prefix != null ? prefix : "") + p, v);
+				if (q != null) {
+					return q;
+				}
+				else {
+					return QueryBuilders.matchQuery((prefix != null ? prefix : "") + p, v);
+				}
+			}
+			else {
+				return QueryBuilders.matchQuery((prefix != null ? prefix : "") + p, v);
+			}
+		}
+		else {
+			BoolQueryBuilder query = new BoolQueryBuilder();
+			QueryBuilder tmpQuery;
+			for (Filter fi : filters) {
+				String p = fi.getProperty();
+				String v=fi.getFiltervalue();
+				if ("id".equals(p)) {
+					p = "_id";
+				}
+				else {
+				//	v=v.toLowerCase();
+				}
+				if(DbFilter.hasSearchParams(v)) {
+					if(p!=null && "timestamp".equals(p.toLowerCase())) {
+						tmpQuery=fromTimestampSearchFilter(p,v);
+						if(tmpQuery!=null) {
+							query.must(tmpQuery);
+						}else {
+							query.must(QueryBuilders.regex((prefix != null ? prefix : "") + p,DbFilter.createDatabaseRegex(v)));
+						}
+					}else {
+						query.must(QueryBuilders.regex((prefix != null ? prefix : "") + p,DbFilter.createDatabaseRegex(v)));
+					}
+				}
+				else if (DbFilter.isComparisonValid(v)) {
+					RangeQueryBuilder q = DbFilter.getRangeQuery((prefix != null ? prefix : "") + p,v);
+					if(q!=null) {
+						query.must(q);
+					}
+					else {
+						query.must(QueryBuilders.matchQuery((prefix != null ? prefix : "") + p,v));
+					}
+				}
+				else {
+					query.must(QueryBuilders.matchQuery((prefix != null ? prefix : "") + p,v));
+				}
+			}
+			LOG.trace("Query result. {}", query.toJSON());
+			return query;
+		}
+	}
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/EsToplevelEquipment.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/QueryResult.java
index a2e7af787..9cbe9430c 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/EsToplevelEquipment.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/QueryResult.java
@@ -6,41 +6,47 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment;
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElement12Equipment;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
+import java.math.BigInteger;
 
-public class EsToplevelEquipment extends EsObject {
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.PaginationOutputG;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.PaginationBuilder;
 
-    public static final String ESDATATYPENAME = "inventorytoplevel";
+public class QueryResult<T> {
 
-    String mountpoint;
-	List<String> uuidList;
+	private SearchResult<T> result;
+	private PaginationOutputG pagination;
 
-	public EsToplevelEquipment set(ONFCoreNetworkElement12Equipment coreEquipment) {
+	public QueryResult(long page, long pageSize, SearchResult<T> result) {
+		this.result = result;
 
-		mountpoint = coreEquipment.getMountpoint();
-		this.setEsId(mountpoint);
+		PaginationBuilder x = new PaginationBuilder();
+		x.setPage(BigInteger.valueOf(page));
+		x.setSize(pageSize);
+		x.setTotal(BigInteger.valueOf(result.getTotal()));
+		pagination = x.build();
+	}
 
-		uuidList = new ArrayList<>();
-		for (UniversalId uuid : coreEquipment.getTopLevelEqUuidList()) {
-			uuidList.add(uuid.getValue());
-		}
+	public SearchResult<T> getResult() {
+		return result;
+	}
 
-		return(this);
+	PaginationOutputG getPagination() {
+		return pagination;
 	}
 
+
+
+
 }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFileProvider.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFileProvider.java
new file mode 100644
index 000000000..44240b07f
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFileProvider.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Path;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class YangFileProvider {
+
+	private static final Logger LOG = LoggerFactory.getLogger(YangFileProvider.class);
+
+	private static final FilenameFilter yangFilenameFilter = new FilenameFilter() {
+
+		@Override
+		public boolean accept(File dir, String name) {
+			return name.toLowerCase().endsWith(".yang");
+		}
+	};
+
+	private static final int BUFFER_SIZE = 1024;
+
+	private final Path mainSourcePath;
+	private final List<Path> additionalSources;
+
+	public YangFileProvider(String path) {
+		this.mainSourcePath = new File(path).toPath();
+		this.additionalSources = new ArrayList<>();
+	}
+
+	public boolean hasFileForModule(String module, String version) {
+		return this.mainSourcePath.resolve(YangFilename.createFilename(module, version)).toFile().exists();
+	}
+
+	public boolean hasFileForModule(String module) {
+		return this.findYangFiles(module).size() > 0;
+	}
+
+	private List<YangFilename> findYangFiles(String module) {
+		List<YangFilename> list = new ArrayList<>();
+		String[] files = this.mainSourcePath.toFile().list(yangFilenameFilter);
+		YangFilename yangfile;
+		for (String file : files) {
+			files = this.mainSourcePath.toFile().list(yangFilenameFilter);
+			for (String fn : files) {
+				try {
+					yangfile = new YangFilename(this.mainSourcePath.resolve(fn).toString());
+					if (yangfile.getModule().equals(module)) {
+						list.add(yangfile);
+					}
+				} catch (ParseException e) {
+					LOG.warn("unable to handle yangfile {}: {}", file, e);
+				}
+			}
+		}
+		for (Path addPath : this.additionalSources) {
+			files = addPath.toFile().list(yangFilenameFilter);
+			for (String file : files) {
+				try {
+					yangfile = new YangFilename(addPath.resolve(file).toString());
+					if (yangfile.getModule().equals(module)) {
+						list.add(yangfile);
+					}
+				} catch (ParseException e) {
+					LOG.warn("unable to handle yangfile {}: {}", file, e);
+				}
+			}
+		}
+		return list;
+	}
+
+	/**
+	 * get yang file from source with specified version or least newer one if
+	 * version is null then the latest one
+	 * 
+	 * @param module
+	 * @param version
+	 * @return
+	 * @throws ParseException
+	 */
+	private @Nullable YangFilename getYangFile(@Nonnull String module, @Nullable String version) throws ParseException {
+		YangFilename f = null;
+		List<YangFilename> list = this.findYangFiles(module);
+
+		list.sort(SortByDateAscComparator.getInstance());
+
+		// find specific version or nearest oldest
+		if (version != null) {
+			Date rev = YangFilename.parseRevision(version);
+			for (YangFilename item : list) {
+				if (rev.equals(item.getRevision())) {
+					f = item;
+					break;
+				}
+				if (item.getRevision().after(rev)) {
+					f = item;
+					break;
+				}
+			}
+		}
+		// get latest
+		else {
+			f = list.get(list.size() - 1);
+		}
+		return f;
+	}
+
+	/**
+	 * write filestream directly to output stream easier for http handling
+	 * 
+	 * @param module
+	 * @param version
+	 * @param outputStream
+	 * @return
+	 * @throws IOException
+	 * @throws ParseException
+	 */
+	public int writeOutput(@Nonnull String module, @Nullable String version, @Nonnull OutputStream outputStream)
+			throws IOException, ParseException {
+		YangFilename fn = this.getYangFile(module, version);
+		if(fn==null) {
+			return 0;
+		}
+		byte[] buffer = new byte[BUFFER_SIZE];
+		int bytesRead = -1;
+		int sumlen = 0;
+		InputStream inputStream = null ;
+		try {
+			inputStream= new FileInputStream(fn.getFilename());
+
+		while ((bytesRead = inputStream.read(buffer)) != -1) {
+			outputStream.write(buffer, 0, bytesRead);
+			sumlen += bytesRead;
+		}}
+		catch(IOException e) {
+			LOG.warn("problem sending {}: {}",fn.getFilename(),e);
+		}
+		finally {
+			if(inputStream!=null) {
+				inputStream.close();		
+			}
+		}
+		return sumlen;
+	}
+
+	private static class SortByDateAscComparator implements Comparator<YangFilename> {
+
+		private static SortByDateAscComparator instance;
+
+		@Override
+		public int compare(YangFilename o1, YangFilename o2) {
+			return o1.getRevision().compareTo(o2.getRevision());
+		}
+
+		public static Comparator<? super YangFilename> getInstance() {
+			if (instance == null) {
+				instance = new SortByDateAscComparator();
+			}
+			return instance;
+		}
+
+	}
+
+	public YangFilename getFileForModule(String module, String rev) throws ParseException {
+		return this.getYangFile(module, rev);
+	}
+
+	public YangFilename getFileForModule(String module) throws ParseException {
+		return this.getFileForModule(module, null);
+	}
+
+	public boolean hasFileOrNewerForModule(String module, String version) throws ParseException {
+		return this.getYangFile(module, version) != null;
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFilename.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFilename.java
new file mode 100644
index 000000000..b00eb203f
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/YangFilename.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class YangFilename {
+
+	private static final String regex = "([^\\/]*)@([0-9]{4}-[0-9]{2}-[0-9]{2}).yang";
+	private static final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
+	private final String filename;
+	private final Matcher matcher;
+	private Date revision;
+	private String module; 
+	public static Date parseRevision(String sRevision) throws ParseException {
+		final SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+		return fmt.parse(sRevision);
+	}
+	public YangFilename(String fn) throws ParseException {
+		this.filename = fn;
+		matcher = pattern.matcher(this.filename);
+		if(!matcher.find()) {
+			throw new ParseException("unknown filename format", 0);
+		}
+		this.module= matcher.group(1);
+		this.revision=parseRevision(matcher.group(2));
+		
+	}
+	public static String createFilename(String module, String rev) {
+		return String.format("%s@%s.yang", module,rev);
+	}
+	public YangFilename(String module, String rev) throws ParseException {
+		this(createFilename(module, rev));
+	}
+	public String getFilename() {
+		return this.filename;
+	}
+	public Date getRevision() {
+		return this.revision;
+	}
+	public String getModule() {
+		return this.module;
+	}
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/AboutHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/AboutHttpServlet.java
new file mode 100644
index 000000000..66d21041c
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/AboutHttpServlet.java
@@ -0,0 +1,224 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.http;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;	
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.onap.ccsdk.features.sdnr.wt.common.Resources;
+import org.onap.ccsdk.features.sdnr.wt.common.file.PomFile;
+import org.onap.ccsdk.features.sdnr.wt.common.file.PomPropertiesFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AboutHttpServlet extends HttpServlet {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private static final Logger LOG = LoggerFactory.getLogger(AboutHttpServlet.class);
+
+	private static final String URI_PRE = "/about";
+	private static final String RES_BASEPATH = "about/";
+
+	private static final String PLACEHOLDER_ONAP_RELEASENAME = "{release-name}";
+	private static final String PLACEHOLDER_ODL_RELEASENAME = "{odl-version}";
+	private static final String PLACEHOLDER_BUILD_TIMESTAMP = "{build-time}";
+	private static final String PLACEHOLDER_ODLUX_REVISION = "{odlux-revision}";
+	private static final String PLACEHOLDER_PACAKGE_VERSION = "{package-version}";
+	private static final String README_FILE = "README.md";
+
+	private final String groupId="org.onap.ccsdk.features.sdnr.wt";
+	private final String artifactId="sdnr-wt-data-provider-provider";
+	
+//	private final ConfigurationFileRepresentation configuration;
+	//private final ExtRestClient dbClient;
+	private final Map<String, String> data;
+	private final String readmeContent;
+	
+	
+
+	public AboutHttpServlet() {
+//		this.configuration = new ConfigurationFileRepresentation(DataProviderServiceImpl.CONFIGURATIONFILE);
+//		EsConfig esConfig = new EsConfig(configuration);
+		//this.dbClient = ExtRestClient.createInstance(esConfig.getHosts());
+		this.data = new HashMap<>();
+		this.collectStaticData();
+		this.readmeContent = this.render(this.getFileContent(README_FILE));
+	}
+
+	private void collectStaticData() {
+		PomPropertiesFile props = this.getPomProperties();
+		this.data.put(PLACEHOLDER_ONAP_RELEASENAME, this.getPomProperty("onap.distname"));
+		this.data.put(PLACEHOLDER_ODL_RELEASENAME,  this.getPomProperty("odl.distname") );
+		this.data.put(PLACEHOLDER_BUILD_TIMESTAMP, props!=null?props.getBuildDate().toString():"");
+		this.data.put(PLACEHOLDER_ODLUX_REVISION, this.getPomProperty("odlux.buildno"));
+		this.data.put(PLACEHOLDER_PACAKGE_VERSION, this.getManifestValue("Bundle-Version"));
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+		String uri = req.getRequestURI().substring(URI_PRE.length());
+		LOG.debug("request for {}",uri);
+		if (uri.length() <= 0 || uri.equals("/")) {
+			// collect data
+			this.collectData();
+			// render readme
+			String content = this.render();
+			byte[] output = content!=null?content.getBytes():new byte[0];
+			// output
+			resp.setStatus(HttpServletResponse.SC_OK);
+			resp.setContentLength(output.length);
+			resp.setContentType("text/plain");
+			resp.getOutputStream().write(output);
+
+		} else {
+			this.doGetFile(uri, resp);
+		}
+	}
+
+	private String getFileContent(String filename) {
+		LOG.debug("try ti get content of {}",filename);
+		return Resources.getFileContent(AboutHttpServlet.class,RES_BASEPATH + filename);
+	}
+
+	private void collectData() {
+		// TODO Auto-generated method stub
+
+	}
+
+	private String getManifestValue(String key) {
+		URL url = Resources.getUrlForRessource(AboutHttpServlet.class, "/META-INF/MANIFEST.MF");
+		if(url==null) {
+			return null;
+		}
+		Manifest manifest;
+		try {
+			manifest = new Manifest(url.openStream());
+			Attributes attr = manifest.getMainAttributes();
+			return attr.getValue(key);
+		} catch (IOException e) {
+			LOG.warn("problem reading manifest: {}",e);
+		}
+		return null;
+
+	}
+	private PomPropertiesFile getPomProperties() {
+		URL url = Resources.getUrlForRessource(AboutHttpServlet.class, "/META-INF/maven/"+groupId+"/"+artifactId+"/pom.properties");
+		PomPropertiesFile propfile;
+		if(url==null) {
+			return null;
+		}
+		try {
+			propfile = new PomPropertiesFile(url.openStream());
+			return propfile;
+		} catch (Exception e) {
+			LOG.warn("unable to read inner pom file: {}",e);
+		}
+		return null;
+	}
+	private String getPomProperty(String key) {
+		LOG.info("try to get pom property for {}",key);
+		URL url = Resources.getUrlForRessource(AboutHttpServlet.class,"/META-INF/maven/"+groupId+"/"+artifactId+"/pom.xml");
+		if(url==null) {
+			return null;
+		}
+		PomFile pomfile;
+		try {
+			pomfile = new PomFile(url.openStream());
+			return pomfile.getProperty(key);
+		} catch (Exception e) {
+			LOG.warn("unable to read inner pom file: {}",e);
+		}
+		return null;
+	}
+	private void doGetFile(String uri, HttpServletResponse resp) {
+		String content = this.getFileContent(uri);
+		if (content == null) {
+			try {
+				resp.sendError(HttpServletResponse.SC_NOT_FOUND);
+			} catch (IOException e) {
+				LOG.debug("unable to send error response : {}",e);
+			}
+		} else {
+			byte[] data = content.getBytes();
+			resp.setStatus(HttpServletResponse.SC_OK);
+			resp.setContentType(this.getContentType(uri));
+			try {
+				resp.getOutputStream().write(data);
+			} catch (IOException e) {
+				LOG.debug("unable to send data : {}",e);
+			}
+		}
+
+	}
+
+	private String getContentType(String filename) {
+		String ext = filename.substring(filename.lastIndexOf(".")+1).toLowerCase();
+		switch (ext) {
+		case "jpg":
+		case "jpeg":
+		case "svg":
+		case "png":
+		case "gif":
+		case "bmp":
+			return "image/" + ext;
+		case "json":
+			return "application/json";
+		case "html":
+		case "htm":
+			return "text/html";
+		case "txt":
+		case "md":
+		default:
+			return "text/plain";
+		}
+	}
+
+	private String render() {
+		return this.render(null);
+	}
+
+	private String render(String content) {
+		if (content == null) {
+			content = this.readmeContent;
+		}
+		if(content==null) {
+			return null;
+		}
+		for (Entry<String, String> entry : this.data.entrySet()) {
+			if (entry.getValue() != null && content.contains(entry.getKey())) {
+				content = content.replace(entry.getKey(), entry.getValue());
+			}
+		}
+
+		return content;
+	}
+}
\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/GetYangSchemaRequest.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/GetYangSchemaRequest.java
new file mode 100644
index 000000000..db4faedfc
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/GetYangSchemaRequest.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.http;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class GetYangSchemaRequest {
+
+	private static final String URI_PREFIX = "/yang-schema/";
+	private final String module;
+	private final String version;
+
+	public String getModule() {
+		return this.module;
+	}
+
+	public String getVersion() {
+		return this.version;
+	}
+
+	public boolean hasVersion() {
+		return this.version != null;
+	}
+
+	public GetYangSchemaRequest(HttpServletRequest req) throws Exception {
+		String uri = req.getRequestURI().substring(URI_PREFIX.length());
+
+		String[] hlp = uri.split("/");
+		if (hlp.length < 1) {
+			throw new Exception("no module request found");
+
+		} else if (hlp.length == 1) {
+			this.module = hlp[0];
+			this.version = null;
+		} else {
+			this.module = hlp[0];
+			this.version = hlp[1];
+		}
+
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/ReadyHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/ReadyHttpServlet.java
new file mode 100644
index 000000000..607f552f6
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/ReadyHttpServlet.java
@@ -0,0 +1,42 @@
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.http;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ReadyHttpServlet extends HttpServlet {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private static final Logger LOG = LoggerFactory.getLogger(ReadyHttpServlet.class);
+	private boolean status;
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	
+		if(this.isReady()) {
+			resp.setStatus(HttpServletResponse.SC_OK);
+		}
+		else {
+		
+			resp.sendError(HttpServletResponse.SC_NOT_FOUND);
+		}
+	}
+
+	private boolean isReady() {
+		return this.status;
+	}
+
+	public void setStatus(boolean status) {
+		this.status = status;
+		LOG.info("status is set to ready: {}",status);
+	}
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/YangSchemaHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/YangSchemaHttpServlet.java
new file mode 100644
index 000000000..94d2793ec
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/YangSchemaHttpServlet.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.http;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.YangFileProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class YangSchemaHttpServlet extends HttpServlet {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private static final Logger LOG = LoggerFactory.getLogger(YangSchemaHttpServlet.class);
+
+	private static final String schemaCachePath = "cache/schema/";
+
+	private final YangFileProvider fileProvider;
+
+	public YangSchemaHttpServlet() {
+		this.fileProvider = new YangFileProvider(schemaCachePath);
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+		GetYangSchemaRequest request = null;
+		try {
+			request = new GetYangSchemaRequest(req);
+		} catch (Exception e) {
+			LOG.warn("bad request for yang-schema: {}", e);
+		}
+		if (request != null) {
+			int len;
+			LOG.debug("request for yang-schema for module {} with version {}", request.getModule(),
+					request.getVersion());
+			if (request.hasVersion()) {
+				boolean has=false;
+				try {
+					has = this.fileProvider.hasFileOrNewerForModule(request.getModule(), request.getVersion());
+				} catch (ParseException e1) {
+					LOG.warn("unable to parse revision: {}" ,e1);
+				}
+				if(has) {
+
+					try {
+						resp.setStatus(HttpServletResponse.SC_OK);
+						resp.setContentType("text/plain");
+						len = this.fileProvider.writeOutput(request.getModule(), request.getVersion(),
+								resp.getOutputStream());
+						resp.setContentLength(len);
+						
+					} catch (ParseException e) {
+						LOG.warn("unable to parse revision: {}", e);
+					}
+				} else {
+					resp.sendError(HttpServletResponse.SC_NOT_FOUND);
+				}
+
+			} else if (this.fileProvider.hasFileForModule(request.getModule())) {
+
+				try {
+					resp.setStatus(HttpServletResponse.SC_OK);
+					resp.setContentType("text/plain");
+					len = this.fileProvider.writeOutput(request.getModule(), null, resp.getOutputStream());
+					resp.setContentLength(len);
+				} catch (ParseException e) {
+					LOG.warn(e.getMessage());
+				}
+
+			} else {
+				resp.sendError(HttpServletResponse.SC_NOT_FOUND);
+			}
+		} else {
+			resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
+		}
+
+	}
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java
new file mode 100644
index 000000000..ba6e99975
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.http.ReadyHttpServlet;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DataProviderImpl implements IEntityDataProvider, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DataProviderImpl.class);
+
+    private static final String APPLICATION_NAME = null;
+    private RpcProviderService rpcProviderService = null;
+    private DataProviderServiceImpl rpcApiService;
+	private ReadyHttpServlet readyServlet;
+    private HtDatabaseClient dbClient;
+
+
+    // Blueprint 1
+    public DataProviderImpl() {
+        LOG.info("Creating provider for {}", APPLICATION_NAME);
+    }
+
+    public void setRpcProviderService(RpcProviderService rpcProviderService) {
+        this.rpcProviderService = rpcProviderService;
+    }
+    public void setReadyServlet(ReadyHttpServlet readyServlet) {
+    	this.readyServlet = readyServlet;
+    }
+    public void init() throws Exception {
+
+        LOG.info("Session Initiated start {}", APPLICATION_NAME);
+
+        // Start RPC Service
+        this.rpcApiService = new DataProviderServiceImpl(rpcProviderService);
+        // Get configuration
+
+        LOG.info("Session Initiated end. Initialization done");
+    }
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("DeviceManagerImpl closing ...");
+
+        close(dbClient);
+        close(rpcApiService);
+        LOG.info("DeviceManagerImpl closing done");
+    }
+
+    /**
+     * Used to close all Services, that should support AutoCloseable Pattern
+     *
+     * @param toClose
+     * @throws Exception
+     */
+    private void close(AutoCloseable... toCloseList) throws Exception {
+        for (AutoCloseable element : toCloseList) {
+            if (element != null) {
+                element.close();
+            }
+        }
+    }
+
+    @Override
+    public DataProvider getDataProvider() {
+        return rpcApiService.getDataProvider();
+    }
+
+	@Override
+	public void setReadyStatus(boolean status) {
+		if(this.readyServlet!=null) {
+			this.readyServlet.setStatus(status);
+		}
+	}
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
new file mode 100644
index 000000000..70b735357
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
@@ -0,0 +1,335 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.impl;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.ElasticSearchDataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DataProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadStatusInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadStatusOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionOutput;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+public class DataProviderServiceImpl implements DataProviderService, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DataProviderServiceImpl.class);
+    public static final String CONFIGURATIONFILE = "etc/dataprovider.properties";
+    private static final long DATABASE_TIMEOUT_MS = 120*1000L;
+
+    private final ObjectRegistration<@NonNull DataProviderServiceImpl> rpcReg;
+    private final ElasticSearchDataProvider dataProvider;
+    private final ConfigurationFileRepresentation configuration;
+
+    DataProviderServiceImpl(final RpcProviderService rpcProviderService) throws Exception {
+        this.configuration = new ConfigurationFileRepresentation(CONFIGURATIONFILE);
+        EsConfig esConfig = new EsConfig(configuration);
+        this.dataProvider = new ElasticSearchDataProvider(esConfig.getHosts());
+        this.dataProvider.waitForYellowDatabaseStatus(DATABASE_TIMEOUT_MS,TimeUnit.MILLISECONDS);
+        // Register ourselves as the REST API RPC implementation
+        LOG.info("Register RPC Service " + DataProviderServiceImpl.class.getSimpleName());
+        this.rpcReg = rpcProviderService.registerRpcImplementation(DataProviderService.class, this);
+    }
+
+    /**
+     * @return the dataProvider
+     */
+    public DataProvider getDataProvider() {
+        return dataProvider.getDataProvider();
+    }
+
+
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("Close RPC Service");
+        if (rpcReg != null) {
+            rpcReg.close();
+        }
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadFaultcurrentListOutput>> readFaultcurrentList(ReadFaultcurrentListInput input) {
+        LOG.debug("RPC Request: getFaultCurrentEntityList with input {}", input);
+        RpcResultBuilder<ReadFaultcurrentListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readFaultCurrentList(input));
+        return result.buildFuture();
+    }
+    @Override
+    public ListenableFuture<RpcResult<ReadFaultlogListOutput>> readFaultlogList(ReadFaultlogListInput input) {
+        LOG.debug("RPC Request: getFaultCurrentEntityList with input {}", input);
+        RpcResultBuilder<ReadFaultlogListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readFaultLogList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadMaintenanceListOutput>> readMaintenanceList(ReadMaintenanceListInput input) {
+        LOG.debug("RPC Request: getMaintenanceEntityList with input {}", input);
+        RpcResultBuilder<ReadMaintenanceListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readMaintenanceList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadMediatorServerListOutput>> readMediatorServerList(
+            ReadMediatorServerListInput input) {
+        LOG.debug("RPC Request: getMediatorServerEntityList with input {}", input);
+        RpcResultBuilder<ReadMediatorServerListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readMediatorServerList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadNetworkElementConnectionListOutput>> readNetworkElementConnectionList(
+            ReadNetworkElementConnectionListInput input) {
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
+        RpcResultBuilder<ReadNetworkElementConnectionListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readNetworkElementConnectionList(input));
+        return result.buildFuture();
+
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata15mListOutput>> readPmdata15mList(ReadPmdata15mListInput input) {
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
+        RpcResultBuilder<ReadPmdata15mListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata15mList(input));
+        return result.buildFuture();
+
+    }
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata24hListOutput>> readPmdata24hList(ReadPmdata24hListInput input) {
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
+        RpcResultBuilder<ReadPmdata24hListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata24hList(input));
+        return result.buildFuture();
+
+    }
+    @Override
+    public ListenableFuture<RpcResult<ReadStatusOutput>> readStatus(ReadStatusInput input) {
+        LOG.debug("RPC Request: getStatusEntityList with input {}", input);
+        RpcResultBuilder<ReadStatusOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readStatus());
+        return result.buildFuture();
+
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadInventoryListOutput>> readInventoryList(ReadInventoryListInput input) {
+        LOG.debug("RPC Request: getInventoryEntityList with input {}", input);
+        RpcResultBuilder<ReadInventoryListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readInventoryList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata15mLtpListOutput>> readPmdata15mLtpList(ReadPmdata15mLtpListInput input) {
+        LOG.debug("RPC Request: readPmdataLtpList with input {}", input);
+        RpcResultBuilder<ReadPmdata15mLtpListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata15mLtpList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata15mDeviceListOutput>> readPmdata15mDeviceList(ReadPmdata15mDeviceListInput input) {
+            LOG.debug("RPC Request: readPmdataDeviceList with input {}", input);
+            RpcResultBuilder<ReadPmdata15mDeviceListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata15mDeviceList(input));
+            return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata24hLtpListOutput>> readPmdata24hLtpList(ReadPmdata24hLtpListInput input) {
+        LOG.debug("RPC Request: readPmdataLtpList with input {}", input);
+        RpcResultBuilder<ReadPmdata24hLtpListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata24hLtpList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadPmdata24hDeviceListOutput>> readPmdata24hDeviceList(ReadPmdata24hDeviceListInput input) {
+            LOG.debug("RPC Request: readPmdataDeviceList with input {}", input);
+            RpcResultBuilder<ReadPmdata24hDeviceListOutput> result = read(()-> DataProviderServiceImpl.this.dataProvider.readPmdata24hDeviceList(input));
+            return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadConnectionlogListOutput>> readConnectionlogList(
+            ReadConnectionlogListInput input) {
+        LOG.debug("RPC Request: readConnectionlogList with input {}", input);
+        RpcResultBuilder<ReadConnectionlogListOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.readConnectionlogList(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<CreateNetworkElementConnectionOutput>> createNetworkElementConnection(
+            CreateNetworkElementConnectionInput input) {
+        LOG.debug("RPC Request: createNetworkElementConnection with input {}", input);
+        RpcResultBuilder<CreateNetworkElementConnectionOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.createNetworkElementConnection(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<UpdateNetworkElementConnectionOutput>> updateNetworkElementConnection(
+            UpdateNetworkElementConnectionInput input) {
+        LOG.debug("RPC Request: updateNetworkElementConnection with input {}", input);
+        RpcResultBuilder<UpdateNetworkElementConnectionOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.updateNetworkElementConnection(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<DeleteNetworkElementConnectionOutput>> deleteNetworkElementConnection(
+            DeleteNetworkElementConnectionInput input) {
+        RpcResultBuilder<DeleteNetworkElementConnectionOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.deleteNetworkElementConnection(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<DeleteMediatorServerOutput>> deleteMediatorServer(
+            DeleteMediatorServerInput input) {
+        LOG.debug("RPC Request: deleteMediatorServer with input {}", input);
+        RpcResultBuilder<DeleteMediatorServerOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.deleteMediatorServer(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<CreateMediatorServerOutput>> createMediatorServer(
+            CreateMediatorServerInput input) {
+        LOG.debug("RPC Request: createMediatorServer with input {}", input);
+        RpcResultBuilder<CreateMediatorServerOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.createMediatorServer(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<CreateMaintenanceOutput>> createMaintenance(CreateMaintenanceInput input) {
+        LOG.debug("RPC Request: createMaintenance with input {}", input);
+        RpcResultBuilder<CreateMaintenanceOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.createMaintenance(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<DeleteMaintenanceOutput>> deleteMaintenance(DeleteMaintenanceInput input) {
+        LOG.debug("RPC Request: deleteMaintenance with input {}", input);
+        RpcResultBuilder<DeleteMaintenanceOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.deleteMaintenance(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<UpdateMediatorServerOutput>> updateMediatorServer(
+            UpdateMediatorServerInput input) {
+        LOG.debug("RPC Request: updateMediatorServer with input {}", input);
+        RpcResultBuilder<UpdateMediatorServerOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.updateMediatorServer(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<UpdateMaintenanceOutput>> updateMaintenance(UpdateMaintenanceInput input) {
+        LOG.debug("RPC Request: updateMaintenance with input {}", input);
+        RpcResultBuilder<UpdateMaintenanceOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.updateMaintenance(input));
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ReadEventlogListOutput>> readEventlogList(ReadEventlogListInput input) {
+        LOG.debug("RPC Request: readEventlogList with input {}", input);
+        RpcResultBuilder<ReadEventlogListOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.readEventlogList(input));
+        return result.buildFuture();
+    }
+
+    // -- private classes and functions
+
+    private static String assembleExceptionMessage(Exception e) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        e.printStackTrace(pw);
+
+        StringBuffer buf = new StringBuffer();
+        buf.append("Exception: ");
+        buf.append(sw.toString());
+        return buf.toString();
+    }
+
+    private interface GetEntityInput<O extends DataObject> {
+        Builder<O> get() throws IOException;
+    }
+
+    private static <O extends DataObject,I extends DataObject> RpcResultBuilder<O> read(GetEntityInput<O> inputgetter ) {
+        RpcResultBuilder<O> result;
+        try {
+            Builder<O> outputBuilder = inputgetter.get();
+            result = RpcResultBuilder.success(outputBuilder);
+        } catch (Exception e) {
+            LOG.info("Exception", e);
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, assembleExceptionMessage(e));
+        }
+        return result;
+    }
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/resources/about/README.md b/sdnr/wt/data-provider/provider/src/main/resources/about/README.md
new file mode 100644
index 000000000..9c45d8354
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/resources/about/README.md
@@ -0,0 +1,2 @@
+# About
+ONAP SDN-R | ONF Wireless for ONAP {release-name} ({odl-version}) - Build: {build-time} {odlux-revision} {package-version}
\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/main/resources/about/test.bmp b/sdnr/wt/data-provider/provider/src/main/resources/about/test.bmp
new file mode 100644
index 000000000..d049ea5bc
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/resources/about/test.bmp
diff --git a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..bc2e3f9cf
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : ccsdk feature sdnr wt data-provider
+ ================================================================================
+Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
+
+  <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"
+    odl:type="default" />
+
+  <bean id="readyServlet"
+    class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.ReadyHttpServlet">
+  </bean>
+  <service interface="javax.servlet.http.HttpServlet"
+    ref="readyServlet">
+    <service-properties>
+      <entry key="alias" value="/ready" />
+    </service-properties>
+  </service>
+
+ <bean id="provider"
+  class="org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataProviderImpl"
+  init-method="init" destroy-method="close">
+  <property name="rpcProviderService" ref="rpcProviderService" />
+  <property name="readyServlet" ref="readyServlet" />
+</bean>
+  <bean id="yangServlet"
+    class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.YangSchemaHttpServlet">
+  </bean>
+  <service interface="javax.servlet.http.HttpServlet"
+    ref="yangServlet">
+    <service-properties>
+      <entry key="alias" value="/yang-schema" />
+    </service-properties>
+  </service>
+
+  <bean id="aboutServlet"
+    class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.AboutHttpServlet">
+  </bean>
+  <service interface="javax.servlet.http.HttpServlet"
+    ref="aboutServlet">
+    <service-properties>
+      <entry key="alias" value="/about" />
+    </service-properties>
+  </service>
+ 
+  <service ref="provider"
+    interface="org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider" />
+
+</blueprint>
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java
new file mode 100644
index 000000000..e87ef9d9b
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.http.AboutHttpServlet;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class TestAbout {
+
+	@Test
+	public void testReadmeRequest() throws IOException, ServletException {
+		AboutHelperServlet servlet =new AboutHelperServlet();
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletResponse response =  mock(HttpServletResponse.class);
+		when(request.getRequestURI()).thenReturn("/about");
+		StringWriter out = new StringWriter();
+		ServletOutputStream printOut = new ServletOutputStream() {
+
+			@Override
+			public void write(int arg0) throws IOException {
+				out.write(arg0);
+			}
+		};
+		when(response.getOutputStream()).thenReturn(printOut);
+		servlet.doGet(request,response);
+		verify(response).setStatus(200);
+		verify(response).setContentType("text/plain");
+		System.out.println(out.getBuffer().toString());
+		assertTrue(out.getBuffer().length()>0);
+	}
+
+	@Test
+	public void testReadmeResourceRequest() throws IOException, ServletException {
+		AboutHelperServlet servlet =new AboutHelperServlet();
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletResponse response =  mock(HttpServletResponse.class);
+		when(request.getRequestURI()).thenReturn("/about/test.bmp");
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		ServletOutputStream printOut = new ServletOutputStream() {
+
+			@Override
+			public void write(int arg0) throws IOException {
+				out.write(arg0);
+			}
+		};
+		when(response.getOutputStream()).thenReturn(printOut);
+		servlet.doGet(request,response);
+		verify(response).setStatus(200);
+		verify(response).setContentType("image/bmp");
+		assertTrue(out.size()>0);
+	}
+
+
+	private class AboutHelperServlet extends AboutHttpServlet{
+
+		/**
+		 *
+		 */
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+			super.doGet(req, resp);
+		}
+
+	}
+}
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java
new file mode 100644
index 000000000..f1d512530
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java
@@ -0,0 +1,1453 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.BaseRequest;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.ElasticSearchDataProvider;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMaintenanceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateMediatorServerOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateNetworkElementConnectionOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMaintenanceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteMediatorServerInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.DeleteNetworkElementConnectionInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadConnectionlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadEventlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultcurrentListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadFaultlogListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadInventoryListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMaintenanceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadMediatorServerListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadNetworkElementConnectionListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mDeviceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata15mLtpListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hDeviceListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ReadPmdata24hLtpListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMaintenanceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateMediatorServerOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.UpdateNetworkElementConnectionOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.FilterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Pagination;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.PaginationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.mediator.server.list.output.Data;
+
+public class TestCRUDforDatabase {
+
+    private static ElasticSearchDataProvider dbProvider;
+    private static HtDatabaseClient dbRawProvider;
+    private static HostInfo[] hosts = new HostInfo[] { new HostInfo("localhost", Integer
+            .valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200")) };
+
+    @BeforeClass
+    public static void init() throws Exception {
+
+        dbProvider = new ElasticSearchDataProvider(hosts);
+        dbProvider.waitForYellowDatabaseStatus(30, TimeUnit.SECONDS);
+        dbRawProvider = new HtDatabaseClient(hosts);
+    }
+
+    private static void trySleep(long ms) {
+        try {
+            Thread.sleep(ms);
+        } catch (Exception e) {
+            Thread.interrupted();
+        }
+    }
+
+    private static void trySleep() {
+        trySleep(0);
+    }
+
+    @Test
+    public void testStatus() throws IOException {
+
+        //== CLEAR AND CREATE ================================
+        clearAndCreatefaultEntity("1", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.Critical);
+        createFaultEntity("Lorem Ipsum", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.Major);
+        createFaultEntity("3", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.Minor);
+        createFaultEntity("4", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.Warning);
+
+        //== READ ================================
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.status.output.Data> readOutput = dbProvider.readStatus().getData();
+        System.out.println(readOutput);
+
+        assertEquals(1,readOutput.get(0).getFaults().getMajors().intValue());
+        assertEquals(1,readOutput.get(0).getFaults().getMinors().intValue());
+        assertEquals(1,readOutput.get(0).getFaults().getWarnings().intValue());
+        assertEquals(1,readOutput.get(0).getFaults().getCriticals().intValue());
+
+        //== DELETE ================================
+
+         System.out.println("try to delete entries");
+         try {
+             dbRawProvider.doRemove(Entity.Faultcurrent.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting entry: " + e.getMessage());
+         }
+
+       //== VERIFY DELETE ===========================
+         System.out.println("verify entries were deleted");
+         readOutput = dbProvider.readStatus().getData();
+         assertEquals(0,readOutput.get(0).getFaults().getMajors().intValue());
+         assertEquals(0,readOutput.get(0).getFaults().getMinors().intValue());
+         assertEquals(0,readOutput.get(0).getFaults().getWarnings().intValue());
+         assertEquals(0,readOutput.get(0).getFaults().getCriticals().intValue());
+    }
+
+     @Test
+    public void testMediatorServer() {
+        final String NAME = "ms1";
+        final String URL = "http://11.23.45.55:4599";
+        final String NAME2 = "ms1-nu";
+        final String URL2 = "http://11.23.45.56:4599";
+
+        // ==CLEAR BEFORE TEST============================
+        System.out.println("try to clear entry");
+        try {
+            dbRawProvider.doRemove(Entity.MediatorServer.getName(), QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting entry: " + e.getMessage());
+        }
+        trySleep();
+        // ==CREATE============================
+        System.out.println("try to create entry");
+        CreateMediatorServerOutputBuilder createOutput = null;
+        CreateMediatorServerInput input = new CreateMediatorServerInputBuilder().setName(NAME).setUrl(URL).build();
+        String dbId = null;
+
+        try {
+            createOutput = dbProvider.createMediatorServer(input);
+            dbId = createOutput.getId();
+            System.out.println(createOutput);
+        } catch (Exception e) {
+            fail("failed to create " + input.toString() + ":" + e.getMessage());
+        }
+        assertNotNull(createOutput);
+        assertNotNull(dbId);
+        trySleep();
+        // ==READ===========================
+        System.out.println("try to read entry");
+        ReadMediatorServerListInput readinput = new ReadMediatorServerListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+        ReadMediatorServerListOutputBuilder readoutput = dbProvider.readMediatorServerList(readinput);
+        List<Data> data = readoutput.getData();
+        assertNotNull(data);
+        assertEquals("no entry found", 1, data.size());
+        assertEquals(NAME, data.get(0).getName());
+        assertEquals(URL, data.get(0).getUrl());
+        String dbId2 = data.get(0).getId();
+        assertEquals(dbId, dbId2);
+        System.out.println(data);
+        // ==UPDATE============================
+        System.out.println("try to update entry");
+        UpdateMediatorServerInput updateInput = new UpdateMediatorServerInputBuilder().setId(dbId2).setName(NAME2)
+                .setUrl(URL2).build();
+        UpdateMediatorServerOutputBuilder updateOutput = null;
+        try {
+            updateOutput = dbProvider.updateMediatorServer(updateInput);
+            System.out.println(updateOutput);
+        } catch (Exception e) {
+            fail("problem updating entry:" + e.getMessage());
+        }
+        assertNotNull(updateOutput);
+        trySleep();
+        // ==READ============================
+        System.out.println("try to read entry");
+        readinput = new ReadMediatorServerListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("name").setFiltervalue(NAME2).build()))
+                .setPagination(getPagination(20, 1)).build();
+        readoutput = dbProvider.readMediatorServerList(readinput);
+        data = readoutput.getData();
+        System.out.println(data);
+        assertNotNull("no update response", data);
+        assertEquals("update not verifiied", 1, data.size());
+        assertEquals("update not verifiied", NAME2, data.get(0).getName());
+        assertEquals("update not verifiied", URL2, data.get(0).getUrl());
+        assertEquals("update not verifiied", dbId, data.get(0).getId());
+        // ==DELETE============================
+        System.out.println("try to delete entry");
+        DeleteMediatorServerInput deleteInput = new DeleteMediatorServerInputBuilder().setId(dbId).build();
+        try {
+            dbProvider.deleteMediatorServer(deleteInput);
+        } catch (Exception e) {
+            fail("problem deleting entry: " + e.getMessage());
+        }
+
+        trySleep();
+        // ==READ/VERIFY DELETE============================
+        System.out.println("try to read entry");
+        readinput = new ReadMediatorServerListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("name").setFiltervalue(NAME2).build()))
+                .setPagination(getPagination(20, 1)).build();
+        readoutput = dbProvider.readMediatorServerList(readinput);
+        data = readoutput.getData();
+        assertNotNull("delete not verifiied", data);
+        assertEquals("delete not verifiied", 0, data.size());
+    }
+
+     @Test
+    public void testNetworkElementConnectionCurrent() {
+
+        System.out.println("networkElementConnection test start");
+
+        // ==CLEAR BEFORE TEST============================
+        System.out.println("try to clear entry");
+        try {
+            dbRawProvider.doRemove(Entity.NetworkelementConnection.getName(), QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting entry: " + e.getMessage());
+        }
+
+        // ==CREATE============================
+        System.out.println("try to create");
+        final String name = "sim87";
+        final String url = "10.5.10.1";
+        final long port = 5959;
+
+        CreateNetworkElementConnectionOutputBuilder create = null;
+        CreateNetworkElementConnectionInput input = new CreateNetworkElementConnectionInputBuilder().setNodeId(name)
+                .setIsRequired(true).setHost(url).setPort(port).build();
+        String dbId = null;
+
+        try {
+            create = dbProvider.createNetworkElementConnection(input);
+            dbId = create.getId();
+        } catch (Exception e) {
+            fail("networkElementConnection create failed" + e.getMessage());
+        }
+
+        assertNotNull(dbId);
+        assertNotNull(create);
+
+        // ==READ===========================
+
+        ReadNetworkElementConnectionListInput readInput = new ReadNetworkElementConnectionListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        ReadNetworkElementConnectionListOutputBuilder readOperation = dbProvider
+                .readNetworkElementConnectionList(readInput);
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.network.element.connection.list.output.Data> data = readOperation
+                .getData();
+
+        assertNotNull(data);
+        assertEquals(dbId, data.get(0).getId());
+        assertEquals(name, data.get(0).getNodeId());
+        assertEquals(url, data.get(0).getHost());
+        assertEquals(port, data.get(0).getPort().longValue());
+
+        // ==UPDATE============================
+        System.out.println("Trying to update...");
+        final String name2 = "sim88";
+        final String url2 = "10.5.10.2";
+        final long port2 = 5960;
+
+        UpdateNetworkElementConnectionInput updateInput = new UpdateNetworkElementConnectionInputBuilder().setId(dbId).setHost(url2).setPort(port2).setIsRequired(false).build();
+        UpdateNetworkElementConnectionOutputBuilder updateOutput = null;
+        try {
+            updateOutput = dbProvider.updateNetworkElementConnection(updateInput);
+        } catch (Exception e) {
+            fail("update failed: " + e.getMessage());
+        }
+
+        assertNotNull(updateOutput);
+
+        // == Verify UPDATE============================
+        System.out.println("Verfiying update...");
+
+        readOperation = dbProvider.readNetworkElementConnectionList(readInput);
+        data = readOperation.getData();
+
+        assertNotNull(data);
+        assertEquals(url2, data.get(0).getHost());
+        assertEquals(port2, data.get(0).getPort().longValue());
+
+        // ==PARTIAL UPDATE============================
+        System.out.println("Try partial update...");
+        assertEquals(false, data.get(0).isIsRequired());
+        updateInput = new UpdateNetworkElementConnectionInputBuilder().setId(dbId).setIsRequired(true).build();
+        try {
+            updateOutput = dbProvider.updateNetworkElementConnection(updateInput);
+        } catch (Exception e) {
+            fail("update failed: " + e.getMessage());
+        }
+
+        assertNotNull(updateOutput);
+
+        readOperation = dbProvider.readNetworkElementConnectionList(readInput);
+        data = readOperation.getData();
+
+        assertEquals(true, data.get(0).isIsRequired());
+        assertEquals(url2, data.get(0).getHost());
+        assertEquals(port2, data.get(0).getPort().longValue());
+
+        // ==DELETE============================
+        System.out.println("Try delete...");
+
+        DeleteNetworkElementConnectionInput deleteInput = new DeleteNetworkElementConnectionInputBuilder().setId(dbId)
+                .build();
+        try {
+            dbProvider.deleteNetworkElementConnection(deleteInput);
+        } catch (Exception e) {
+            fail("problem deleting "+e.getMessage());
+        }
+
+        readInput = new ReadNetworkElementConnectionListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+        readOperation = dbProvider.readNetworkElementConnectionList(readInput);
+        data = readOperation.getData();
+        assertEquals(0, data.size());
+
+    }
+
+     @Test
+    public void testMaintenance() {
+        System.out.println("Starting Maintenance tests...");
+
+        // ==CLEAR BEFORE TEST============================
+        System.out.println("try to clear entry");
+        try {
+            dbRawProvider.doRemove(Entity.Maintenancemode.getName(), QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting entry: " + e.getMessage());
+        }
+
+        // ==CREATE============================
+
+        final String nodeId = "Lorem Ipsum";
+        final boolean isActive = true;
+
+        CreateMaintenanceOutputBuilder create = null;
+        CreateMaintenanceInput input = new CreateMaintenanceInputBuilder().setNodeId(nodeId).setActive(isActive)
+                .build();
+        String dbId = null;
+        try {
+            create = dbProvider.createMaintenance(input);
+            dbId = create.getId();
+        } catch (Exception e) {
+            fail("Failed to create:" + e.getMessage());
+        }
+
+        System.out.println(dbId);
+        assertNotNull(create);
+        assertNotNull(dbId);
+
+        // ==READ===========================
+        System.out.println("Try read...");
+
+        ReadMaintenanceListInput readinput = new ReadMaintenanceListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+        ReadMaintenanceListOutputBuilder readResult = dbProvider.readMaintenanceList(readinput);
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.maintenance.list.output.Data> data = readResult
+                .getData();
+
+        assertNotEquals(0, data.size());
+        assertNotNull(data);
+        assertEquals(nodeId, data.get(0).getNodeId());
+        assertEquals(isActive, data.get(0).isActive());
+
+        // ==UPDATE============================
+
+        System.out.println("Trying to update...");
+        final String nodeId2 = "Name2";
+        final boolean isActive2 = false;
+
+        UpdateMaintenanceInput updateInput = new UpdateMaintenanceInputBuilder().setId(dbId).setNodeId(nodeId2)
+                .setActive(isActive2).build();
+        UpdateMaintenanceOutputBuilder updateResult = null;
+        try {
+            updateResult = dbProvider.updateMaintenance(updateInput);
+        } catch (Exception e) {
+            fail("maintenance update failed..." + e.getMessage());
+        }
+
+        assertNotNull(updateResult);
+
+        // == VERIFY UPDATE============================
+        System.out.println("Verfify update...");
+        readResult = dbProvider.readMaintenanceList(readinput);
+        data = readResult.getData();
+
+        assertNotNull(data);
+        assertEquals(nodeId2, data.get(0).getNodeId());
+        assertEquals(isActive2, data.get(0).isActive());
+
+        // ==DELETE================================
+        System.out.println("Trying to delete...");
+
+        DeleteMaintenanceInput deleteInput = new DeleteMaintenanceInputBuilder().setId(dbId).build();
+        try {
+            dbProvider.deleteMaintenance(deleteInput);
+        } catch (Exception e) {
+            fail("Maintenance entry couldn't be deleted" + e.getMessage());
+        }
+
+        readResult = dbProvider.readMaintenanceList(readinput);
+        data = readResult.getData();
+
+        assertEquals(0, data.size());
+    }
+
+    @Test
+    public void testFaultLog() {
+
+        System.out.println("Starting fault log tests...");
+        String dbId = clearAndCreatefaultEntity("1", Entity.Faultlog.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultlogInput", SeverityType.Critical);
+
+        // ==READ===========================
+        System.out.println("try to read entry");
+
+        ReadFaultlogListInput readinput = new ReadFaultlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        ReadFaultlogListOutputBuilder readResult = null;
+        try {
+            readResult = dbProvider.readFaultLogList(readinput);
+
+        } catch (Exception e) {
+            fail("Fault log not read: " + e.getMessage());
+        }
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultlog.list.output.Data> data = readResult
+                .getData();
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("signalIsLost", data.get(0).getProblem());
+        assertEquals("Critical", data.get(0).getSeverity().toString());
+        assertEquals("s1", data.get(0).getNodeId());
+
+      //== UPDATE ================================
+        System.out.println("try to update entry");
+
+        dbRawProvider.doUpdateOrCreate(Entity.Faultlog.getName(), "1", "{'problem': 'CableLOS', 'severity': 'Major', 'node-id': 'test4657-78'}");
+
+        System.out.println("try to search entry 1");
+        readinput = new ReadFaultlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-id").setFiltervalue("test").build()))
+                .setPagination(getPagination(20, 1)).build();
+
+      //== VERIFY UPDATE ================================
+        readResult = dbProvider.readFaultLogList(readinput);
+        data = readResult.getData();
+
+
+        assertNotNull(data);
+        System.out.println(data);
+        assertEquals(0, data.size());
+
+        System.out.println("try to search entry 2");
+
+        readinput = new ReadFaultlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-id").setFiltervalue("test*").build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        readResult = dbProvider.readFaultLogList(readinput);
+        data = readResult.getData();
+
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("CableLOS", data.get(0).getProblem());
+        assertEquals("Major", data.get(0).getSeverity().toString());
+        assertEquals("test4657-78", data.get(0).getNodeId());
+
+      //== DELETE ================================
+
+        System.out.println("try to clear entry");
+        try {
+            dbRawProvider.doRemove(Entity.Faultlog.getName(), dbId);
+        } catch (Exception e) {
+            fail("problem deleting entry: " + e.getMessage());
+        }
+
+      //== VERIFY DELETE ===========================
+        System.out.println("verify entries deleted");
+        readResult = dbProvider.readFaultLogList(new ReadFaultlogListInputBuilder().setPagination(getPagination(20, 1)).build());
+        data = readResult.getData();
+        assertEquals(0, data.size());
+    }
+
+    @Test
+    public void testFaultCurrent() {
+        System.out.println("Starting faultCurrent test...");
+         String dbId = null;
+         dbId = clearAndCreatefaultEntity("1", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.NonAlarmed);
+         assertEquals("1", dbId);
+
+        // ==READ===========================
+         System.out.println("Trying to read...");
+
+
+        ReadFaultcurrentListInput readinput = new ReadFaultcurrentListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        ReadFaultcurrentListOutputBuilder readResult = null;
+        try {
+            readResult = dbProvider.readFaultCurrentList(readinput);
+
+        } catch (Exception e) {
+            fail("Fault log not read: " + e.getMessage());
+        }
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.faultcurrent.list.output.Data> data = readResult
+                .getData();
+
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("signalIsLost", data.get(0).getProblem());
+        assertEquals("NonAlarmed", data.get(0).getSeverity().toString());
+        assertEquals("s1", data.get(0).getNodeId());
+        assertEquals(4340, data.get(0).getCounter().intValue());
+        assertEquals(new DateAndTime("2019-10-28T11:55:58.3Z"), data.get(0).getTimestamp());
+        assertEquals(4340, data.get(0).getCounter().intValue());
+        assertEquals("LP-MWPS-RADIO", data.get(0).getObjectId());
+
+
+        // ==UPDATE============================
+        System.out.println("Trying to update...");
+
+        String json = "{\n" +
+                "\"timestamp\": \"2019-12-28T11:55:58.3Z\",\n" +
+                "\"node-id\": \"SDN-Controller-0\",\n" +
+                "\"counter\": 75,\n" +
+                "\"problem\": \"connectionLossNeOAM\",\n" +
+                "}";
+
+        String updatedDbId = dbRawProvider.doUpdateOrCreate(Entity.Faultcurrent.getName(), dbId, json);
+        assertEquals(dbId, updatedDbId);
+
+        // ==READ============================
+
+        try {
+            readResult = dbProvider.readFaultCurrentList(readinput);
+
+        } catch (Exception e) {
+            fail("Fault log not read: " + e.getMessage());
+        }
+
+        data = readResult.getData();
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("connectionLossNeOAM", data.get(0).getProblem());
+        assertEquals("SDN-Controller-0", data.get(0).getNodeId());
+        assertEquals(75, data.get(0).getCounter().intValue());
+        assertEquals("LP-MWPS-RADIO", data.get(0).getObjectId());
+
+        // ==DELETE============================
+        try {
+            dbRawProvider.doRemove(Entity.Faultcurrent.getName(), QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting: " + e.getMessage());
+        }
+
+        // ==READ/VERIFY DELETE============================
+
+        try {
+            readResult = dbProvider.readFaultCurrentList(readinput);
+
+        } catch (Exception e) {
+            fail("Fault log not read: " + e.getMessage());
+        }
+
+        data = readResult.getData();
+
+        assertNotNull(data);
+        assertEquals(0, data.size());
+    }
+
+    @Test
+    public void testConnectionLog() {
+
+        // ==CLEAR================================
+        System.out.println("Clear before test");
+         try {
+             dbRawProvider.doRemove(Entity.Connectionlog.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+
+        // ==CREATE================================
+
+        System.out.println("Try create entry");
+        final String initialDbId = "1";
+        String dbId = null;
+        String json ="{\n" +
+                "\"timestamp\": \"2019-11-01T11:28:34.7Z\",\n" +
+                "\"status\": \"Connecting\",\n" +
+                "\"node-id\": \"sim2230\",\n" +
+                "\"implemented-interface\": \"org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateConnectionlogInput\"\n" +
+                "}";
+
+        dbId = dbRawProvider.doUpdateOrCreate(Entity.Connectionlog.getName(), initialDbId, json);
+
+        assertEquals(initialDbId, dbId);
+
+        // ==READ================================
+        System.out.println("Try read entry");
+
+        ReadConnectionlogListInput readinput = new ReadConnectionlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        ReadConnectionlogListOutputBuilder readResult = null;
+        try {
+            readResult = dbProvider.readConnectionlogList(readinput);
+
+        } catch (Exception e) {
+            fail("Connection log not read: " + e.getMessage());
+        }
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.connectionlog.list.output.Data> data = readResult
+                .getData();
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("Connecting", data.get(0).getStatus().toString());
+        assertEquals("sim2230", data.get(0).getNodeId());
+
+
+        // ==UPDATE================================
+        System.out.println("Try update entry");
+
+        dbRawProvider.doUpdateOrCreate(Entity.Connectionlog.getName(), dbId, "{'status' : 'Connected'}");
+
+        // ==READ 2================================
+        System.out.println("Try read updated entry");
+
+        readinput = new ReadConnectionlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("status").setFiltervalue("Connected").build()))
+                .setPagination(getPagination(20, 1)).build();
+
+        try {
+            readResult = dbProvider.readConnectionlogList(readinput);
+
+        } catch (Exception e) {
+            fail("Connection log not read: " + e.getMessage());
+        }
+
+        data = readResult.getData();
+
+        assertNotNull(data);
+        assertEquals(1, data.size());
+        assertEquals("Connected", data.get(0).getStatus().toString());
+        assertEquals("sim2230", data.get(0).getNodeId());
+
+      //== DELETE ================================
+
+           System.out.println("try to clear entry");
+           try {
+               dbRawProvider.doRemove(Entity.Connectionlog.getName(), dbId);
+           } catch (Exception e) {
+               fail("problem deleting entry: " + e.getMessage());
+           }
+
+         //== VERIFY DELETE ===========================
+           System.out.println("verify entries deleted");
+           readResult = dbProvider.readConnectionlogList(new ReadConnectionlogListInputBuilder().setPagination(getPagination(20, 1)).build());
+           data = readResult.getData();
+           assertEquals(0, data.size());
+
+    }
+
+     @Test
+    public void testEventLog() {
+        System.out.println("Test event log starting...");
+
+        // ==CLEAR================================
+        System.out.println("Clear before test");
+         try {
+             dbRawProvider.doRemove(Entity.Eventlog.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+        // ==CREATE============================
+
+         String dbId = null;
+        String json = " {\n" +
+                "\"timestamp\": \"2019-11-08T16:39:23.0Z\",\n" +
+                "\"new-value\": \"done\",\n" +
+                "\"object-id\": \"SDN-Controller-0\",\n" +
+                "\"attribute-name\": \"startup\",\n" +
+                "\"counter\": 0,\n" +
+                "\"implemented-interface\": \"org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Eventlog\",\n" +
+                "\"node-id\": \"SDN-Controller-0\"\n" +
+                "}";
+
+        dbId = dbRawProvider.doUpdateOrCreate(Entity.Eventlog.getName(), "1", json);
+        assertNotNull(dbId);
+
+        // ==READ===========================
+
+        ReadEventlogListInput readinput = new ReadEventlogListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+        ReadEventlogListOutputBuilder readResult = null;
+        try {
+             readResult = dbProvider.readEventlogList(readinput);
+
+        } catch (Exception e) {
+            fail("problem reading eventlog");
+        }
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.eventlog.list.output.Data> data = readResult.getData();
+        assertEquals(1,data.size());
+
+        //== DELETE ================================
+
+          System.out.println("try to clear entry");
+          try {
+              dbRawProvider.doRemove(Entity.Eventlog.getName(), dbId);
+          } catch (Exception e) {
+              fail("problem deleting entry: " + e.getMessage());
+          }
+
+        //== VERIFY DELETE ===========================
+          System.out.println("verify entries deleted");
+          try {
+            readResult = dbProvider.readEventlogList(new ReadEventlogListInputBuilder().setPagination(getPagination(20, 1)).build());
+        } catch (IOException e) {
+            fail("problem reading eventlog");
+        }
+          data = readResult.getData();
+          assertEquals(0, data.size());
+
+    }
+
+     @Test
+    public void testInventory() {
+
+         System.out.println("Test inventory starting...");
+
+         // ==CLEAR================================
+         System.out.println("Clear before test");
+          try {
+              dbRawProvider.doRemove(Entity.Inventoryequipment.getName(), QueryBuilders.matchAllQuery());
+          } catch (Exception e) {
+              fail("problem deleting: " + e.getMessage());
+          }
+
+
+        // ==CREATE============================
+
+         String dbId = null;
+         String json = " {\"tree-level\": 1,\n" +
+                 "    \"parent-uuid\": \"SHELF-1.1.0.0\",\n" +
+                 "    \"node-id\": \"sim2\",\n" +
+                 "    \"uuid\": \"CARD-1.1.8.0\",\n" +
+                 "    \"contained-holder\": [ ],\n" +
+                 "    \"manufacturer-name\": \"Lorem Ipsum\",\n" +
+                 "    \"manufacturer-identifier\": \"ONF-Wireless-Transport\",\n" +
+                 "    \"serial\": \"sd-dsa-eqw\",\n" +
+                 "    \"date\": \"2008-10-21T00:00:00.0Z\",\n" +
+                 "\"implemented-interface\": \"org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory\",\n" +
+                 "    \"version\": \"unknown\",\n" +
+                 "    \"description\": \"WS/DS3\",\n" +
+                 "    \"part-type-id\": \"unknown\",\n" +
+                 "    \"model-identifier\": \"model-id-s3s\",\n" +
+                 "    \"type-name\": \"p4.module\"}";
+
+         dbId = dbRawProvider.doUpdateOrCreate(Entity.Inventoryequipment.getName(), "1 1", json);
+         assertNotNull(dbId);
+
+        // ==READ===========================
+         ReadInventoryListInput readinput = new ReadInventoryListInputBuilder()
+                .setFilter(Arrays.asList(new FilterBuilder().setProperty("id").setFiltervalue(dbId).build()))
+                .setPagination(getPagination(20, 1)).build();
+        ReadInventoryListOutputBuilder readResult = null;
+        try {
+             readResult = dbProvider.readInventoryList(readinput);
+
+        } catch (Exception e) {
+            fail("Problem reading inventory list"+e.getMessage());
+        }
+
+        List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.inventory.list.output.Data> data = readResult.getData();
+        assertEquals(1,data.size());
+        assertEquals("Lorem Ipsum", data.get(0).getManufacturerName());
+        assertEquals("ONF-Wireless-Transport", data.get(0).getManufacturerIdentifier());
+        assertEquals("sim2", data.get(0).getNodeId());
+        assertEquals("unknown", data.get(0).getVersion());
+        assertEquals("WS/DS3", data.get(0).getDescription());
+        assertEquals("2008-10-21T00:00:00.0Z", data.get(0).getDate());
+        assertEquals("sd-dsa-eqw", data.get(0).getSerial());
+        System.out.println(data.get(0).getDate());
+
+        // ==UPDATE============================
+        String updatedDbId=null;
+        final String[] holderArray = {"Lorem Ipsum 1", "Lorem Ipsum 2", "Lorem Ipsum &%/$_2"};
+        String updatejson = " {" +
+                 "    \"node-id\": \"sim5\",\n" +
+                 "    \"contained-holder\": [ \"Lorem Ipsum 1\", \"Lorem Ipsum 2\", \"Lorem Ipsum &%/$_2\" ],\n" +
+                 "    \"serial\": \"sd-dsa-eww\",\n" +
+                 "    \"date\": \"2008-11-21T00:00:00.0Z\",\n" +
+                 "    \"part-type-id\": \"not unknown\",\n" +
+                 "}";
+
+        updatedDbId = dbRawProvider.doUpdateOrCreate(Entity.Inventoryequipment.getName(), dbId, updatejson);
+        assertEquals(dbId, updatedDbId);
+
+        try {
+            readResult = dbProvider.readInventoryList(readinput);
+
+        } catch (Exception e) {
+            fail("Problem reading inventory list"+e.getMessage());
+        }
+
+        data = readResult.getData();
+
+        assertEquals(1,data.size());
+        assertEquals("Lorem Ipsum", data.get(0).getManufacturerName());
+        assertEquals("ONF-Wireless-Transport", data.get(0).getManufacturerIdentifier());
+        assertEquals("sim5", data.get(0).getNodeId());
+        assertEquals("not unknown", data.get(0).getPartTypeId());
+        assertEquals("WS/DS3", data.get(0).getDescription());
+        assertEquals("2008-11-21T00:00:00.0Z", data.get(0).getDate());
+        assertEquals("sd-dsa-eww", data.get(0).getSerial());
+        assertEquals(holderArray.length,data.get(0).getContainedHolder().size());
+        assertEquals(holderArray[0],data.get(0).getContainedHolder().get(0));
+        assertEquals(holderArray[1],data.get(0).getContainedHolder().get(1));
+        assertEquals(holderArray[2],data.get(0).getContainedHolder().get(2));
+
+        // ==DELETE============================
+
+        System.out.println("delete after test");
+        try {
+            dbRawProvider.doRemove(Entity.Inventoryequipment.getName(), QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting: " + e.getMessage());
+        }
+
+     // ==VERIFY DELETE ============================
+
+        try {
+               readResult = dbProvider.readInventoryList(readinput);
+
+           } catch (Exception e) {
+               fail("Problem reading inventory list"+e.getMessage());
+           }
+
+           data = readResult.getData();
+           assertEquals(0,data.size());
+
+    }
+
+     @Test
+     public void test15MinPerformanceReadLtpListWithoutNodeIdSetThrowsException() {
+
+         System.out.println("Reading 15m ltp list without node id filter set throws an exception test start...");
+
+         try {
+             dbRawProvider.doRemove(Entity.Historicalperformance15min.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+
+         System.out.println("create entries...");
+
+         createPerformanceData("1", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a2");
+         createPerformanceData("2", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a2");
+
+         createPerformanceData("4", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a3");
+         createPerformanceData("5", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a3");
+         createPerformanceData("6", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_7", "LP-MWPS-TTP-03", "a3");
+         createPerformanceData("3", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_7", "LP-MWPS-TTP-05", "a3");
+
+         System.out.println("trying to read, should throw exception...");
+
+
+         ReadPmdata15mLtpListInput readLtp = new ReadPmdata15mLtpListInputBuilder()
+                 .setPagination(getPagination(20, 1)).build();
+
+         ReadPmdata15mLtpListOutputBuilder readltpResult = null;
+
+         try {
+            readltpResult = dbProvider.readPmdata15mLtpList(readLtp);
+            fail("No exception thrown!");
+        } catch (Exception e) {
+            System.out.println(e);
+            assertTrue(e instanceof IllegalArgumentException);
+            assertEquals("no nodename in filter found ", e.getMessage());
+        }
+
+         assertNull(readltpResult);
+
+          //== DELETE ================================
+
+            System.out.println("try to clear entry");
+            try {
+                dbRawProvider.doRemove(Entity.Historicalperformance15min.getName(), QueryBuilders.matchAllQuery());
+            } catch (Exception e) {
+                fail("problem deleting entry: " + e.getMessage());
+            }
+
+          //== VERIFY DELETE ===========================
+            System.out.println("verify entries deleted");
+            List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> data = dbProvider.readPmdata15mList(new ReadPmdata15mListInputBuilder()
+                    .setPagination(getPagination(20, 1)).build()).getData();
+
+            assertEquals(0, data.size());
+     }
+
+     @Test
+     public void test15MinPerformanceData() {
+        // == CLEAR BEFORE TESTS ============================
+         System.out.println("Test 15 min performance...");
+
+         try {
+             dbRawProvider.doRemove(Entity.Historicalperformance15min.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+
+        // == CREATE ============================
+
+         System.out.println("create entries...");
+
+         createPerformanceData("1", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a2");
+         createPerformanceData("2", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a2");
+
+         createPerformanceData("4", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a3");
+         createPerformanceData("5", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a3");
+         createPerformanceData("6", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_7", "LP-MWPS-TTP-03", "a3");
+         createPerformanceData("3", timeInterval.PERIOD_15MIN, "PM_RADIO_15M_7", "LP-MWPS-TTP-05", "a3");
+
+        // == READ ============================
+         System.out.println("read list entries...");
+
+         ReadPmdata15mListInput read = new ReadPmdata15mListInputBuilder()
+                 .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-name").setFiltervalue("a2").build()))
+                 .setPagination(getPagination(20, 1)).build();
+
+         ReadPmdata15mListOutputBuilder readResult = null;
+
+         try {
+             readResult = dbProvider.readPmdata15mList(read);
+        } catch (Exception e) {
+            fail("Problem reading 15m data");
+        }
+
+          List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._15m.list.output.Data> data = readResult
+                  .getData();
+
+          assertNotNull(data);
+          assertEquals(2, data.size());
+
+          System.out.println("read ltp entries with node name set...");
+
+          ReadPmdata15mLtpListInput readLtp = new ReadPmdata15mLtpListInputBuilder()
+                  .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-name").setFiltervalue("a2").build()))
+                  .setPagination(getPagination(20, 1)).build();
+
+          ReadPmdata15mLtpListOutputBuilder readltpResult = null;
+
+          try {
+             readltpResult = dbProvider.readPmdata15mLtpList(readLtp);
+         } catch (Exception e) {
+             fail("Problem reading 15m ltp data");
+         }
+
+          List<String> dataLtp = readltpResult.getData();
+
+          assertNotNull(dataLtp);
+         assertEquals(2, dataLtp.size());
+         assertTrue(dataLtp.contains("LP-MWPS-TTP-02"));
+         assertTrue(dataLtp.contains("LP-MWPS-TTP-01"));
+
+         System.out.println("read device entries...");
+
+         ReadPmdata15mDeviceListInput readDevices = new ReadPmdata15mDeviceListInputBuilder()
+                   .setPagination(getPagination(20, 1)).build();
+
+           ReadPmdata15mDeviceListOutputBuilder readDeviceResult = null;
+
+           try {
+              readDeviceResult = dbProvider.readPmdata15mDeviceList(readDevices);
+          } catch (Exception e) {
+              fail("Problem reading 15m device data");
+          }
+
+            List<String> dataDevice = readDeviceResult.getData();
+
+            assertNotNull(dataDevice);
+          assertEquals(2, dataDevice.size());
+          assertTrue(dataDevice.contains("a2"));
+          assertTrue(dataDevice.contains("a3"));
+
+          //== DELETE ================================
+
+            System.out.println("try to clear entry");
+            try {
+                dbRawProvider.doRemove(Entity.Historicalperformance15min.getName(), QueryBuilders.matchAllQuery());
+            } catch (Exception e) {
+                fail("problem deleting entry: " + e.getMessage());
+            }
+
+          //== VERIFY DELETE ===========================
+            System.out.println("verify entries deleted");
+            readResult = dbProvider.readPmdata15mList(new ReadPmdata15mListInputBuilder()
+                    .setPagination(getPagination(20, 1)).build());
+            data = readResult.getData();
+            assertEquals(0, data.size());
+
+     }
+
+     @Test
+     public void test24hPerformanceData() {
+         System.out.println("Test 24h performance...");
+
+         try {
+             dbRawProvider.doRemove(Entity.Historicalperformance24h.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+
+         System.out.println("create entries...");
+
+         createPerformanceData("1", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a2");
+         createPerformanceData("2", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a2");
+         String aDbId = createPerformanceData("4", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_6", "LP-MWPS-TTP-06", "a2");
+
+         createPerformanceData("5", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a3");
+         createPerformanceData("6", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_7", "LP-MWPS-TTP-03", "a3");
+         createPerformanceData("3", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_7", "LP-MWPS-TTP-05", "a3");
+
+         System.out.println("read all list entries...");
+
+         ReadPmdata24hListInput read = new ReadPmdata24hListInputBuilder()
+                 .setPagination(getPagination(20, 1)).build();
+
+         ReadPmdata24hListOutputBuilder readResult = null;
+
+         try {
+             readResult = dbProvider.readPmdata24hList(read);
+        } catch (Exception e) {
+            fail("Problem reading 24h data");
+        }
+
+         List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.read.pmdata._24h.list.output.Data> data = readResult
+                 .getData();
+
+         assertNotNull(data);
+         assertEquals(6, data.size());
+
+
+         System.out.println("filter list entries...");
+
+          read = new ReadPmdata24hListInputBuilder()
+                 .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-name").setFiltervalue("a2").build()))
+                 .setPagination(getPagination(20, 1)).build();
+
+          readResult = null;
+
+         try {
+             readResult = dbProvider.readPmdata24hList(read);
+        } catch (Exception e) {
+            fail("Problem reading 24h data");
+        }
+
+         data = readResult.getData();
+
+          assertNotNull(data);
+          assertEquals(3, data.size());
+
+          System.out.println("read ltp entries with node name set...");
+
+          ReadPmdata24hLtpListInput readLtp = new ReadPmdata24hLtpListInputBuilder()
+                   .setFilter(Arrays.asList(new FilterBuilder().setProperty("node-name").setFiltervalue("a2").build()))
+                   .setPagination(getPagination(20, 1)).build();
+
+           ReadPmdata24hLtpListOutputBuilder readltpResult = null;
+
+           try {
+              readltpResult = dbProvider.readPmdata24hLtpList(readLtp);
+          } catch (Exception e) {
+              fail("Problem reading 24h ltp data");
+          }
+
+           List<String> dataLtp = readltpResult.getData();
+
+            assertNotNull(dataLtp);
+            assertEquals(3, dataLtp.size());
+            assertTrue(dataLtp.contains("LP-MWPS-TTP-02"));
+            assertTrue(dataLtp.contains("LP-MWPS-TTP-01"));
+            assertTrue(dataLtp.contains("LP-MWPS-TTP-06"));
+
+
+            System.out.println("read device entries...");
+
+            ReadPmdata24hDeviceListInput readDevices = new ReadPmdata24hDeviceListInputBuilder()
+                       .setPagination(getPagination(20, 1)).build();
+
+               ReadPmdata24hDeviceListOutputBuilder readDeviceResult = null;
+
+               try {
+                  readDeviceResult = dbProvider.readPmdata24hDeviceList(readDevices);
+              } catch (Exception e) {
+                  fail("Problem reading 24h device data");
+              }
+
+                List<String> dataDevice = readDeviceResult.getData();
+
+                assertNotNull(dataDevice);
+              assertEquals(2, dataDevice.size());
+              assertTrue(dataDevice.contains("a2"));
+              assertTrue(dataDevice.contains("a3"));
+
+              // == UPDATE ==============================
+
+              String shouldbeEmpty = dbRawProvider.doUpdate(Entity.Historicalperformance24h.getName(), "{'uuid-interface':'LTP-TEST-MWP-097'}", QueryBuilders.termQuery("_id", aDbId));
+              assertEquals("",shouldbeEmpty);
+              try {
+              readltpResult = dbProvider.readPmdata24hLtpList(readLtp);
+        } catch (Exception e) {
+            fail("Problem reading 24h ltp data");
+        }
+
+              // == VERIFY UPDATE ==============================
+
+              dataLtp = readltpResult.getData();
+
+              assertNotNull(dataLtp);
+             assertEquals(3, dataLtp.size());
+             assertTrue(dataLtp.contains("LP-MWPS-TTP-02"));
+             assertTrue(dataLtp.contains("LP-MWPS-TTP-01"));
+             assertTrue(dataLtp.contains("LTP-TEST-MWP-097"));
+
+
+
+              //== DELETE ===========================
+
+              System.out.println("try to clear entries");
+              try {
+                  dbRawProvider.doRemove(Entity.Historicalperformance24h.getName(), QueryBuilders.matchAllQuery());
+              } catch (Exception e) {
+                  fail("problem deleting entry: " + e.getMessage());
+              }
+
+            //== VERIFY DELETE ===========================
+              System.out.println("verify entries deleted");
+              readResult = dbProvider.readPmdata24hList(new ReadPmdata24hListInputBuilder()
+                      .setPagination(getPagination(20, 1)).build());
+              data = readResult.getData();
+              assertEquals(0, data.size());
+     }
+
+     @Test
+     public void test24hPerformanceDataReadLtpListWithoutNodeIdSetThrowsException() {
+         System.out.println("Test 24 hour tp list without node id filter set throws an exception test start...\"...");
+
+         try {
+             dbRawProvider.doRemove(Entity.Historicalperformance24h.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+
+         System.out.println("create entries...");
+
+         createPerformanceData("1", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a2");
+         createPerformanceData("2", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a2");
+
+         createPerformanceData("4", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_6", "LP-MWPS-TTP-02", "a3");
+         createPerformanceData("5", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_4", "LP-MWPS-TTP-01", "a3");
+         createPerformanceData("6", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_7", "LP-MWPS-TTP-03", "a3");
+         createPerformanceData("3", timeInterval.PERIOD_24HOURS, "PM_RADIO_15M_7", "LP-MWPS-TTP-05", "a3");
+
+         System.out.println("trying to read, should throw exception...");
+
+
+         ReadPmdata24hLtpListInput readLtp = new ReadPmdata24hLtpListInputBuilder()
+                 .setPagination(getPagination(20, 1)).build();
+
+         ReadPmdata24hLtpListOutputBuilder readltpResult = null;
+
+         try {
+            readltpResult = dbProvider.readPmdata24hLtpList(readLtp);
+            fail("No exception thrown!");
+        } catch (Exception e) {
+            System.out.println(e);
+            assertTrue(e instanceof IllegalArgumentException);
+            assertEquals("no nodename in filter found ", e.getMessage());
+        }
+
+         assertNull(readltpResult);
+
+         try {
+             dbRawProvider.doRemove(Entity.Historicalperformance24h.getName(), QueryBuilders.matchAllQuery());
+         } catch (Exception e) {
+             fail("problem deleting: " + e.getMessage());
+         }
+     }
+
+    @Test
+    public void testUrlEncoding() {
+        System.out.println("Testing url encding");
+
+        final String test = "Lorem Ipsum";
+        final String test1 = "Lorem/Ipsum";
+        final String test2 = "Lorem_Ipsum";
+        final String test3 = "Lorem%Ipsum";
+
+        assertEquals("Lorem%20Ipsum", BaseRequest.urlEncodeValue(test));
+        assertEquals("Lorem%2FIpsum", BaseRequest.urlEncodeValue(test1));
+        assertEquals("Lorem_Ipsum", BaseRequest.urlEncodeValue(test2));
+        assertEquals("Lorem%25Ipsum", BaseRequest.urlEncodeValue(test3));
+    }
+
+    @Test
+    public void testDoUpdateOrCreateWithNullId() {
+        System.out.println("Test DoUpdateOrCreate doesn't create new database entry if null is passed");
+
+        String dbId = clearAndCreatefaultEntity(null, Entity.Faultlog.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultlogInput", SeverityType.Critical);
+        assertNull(dbId);
+    }
+
+    @Test
+    public void readTestFaultCurrentViaRawDbProvider() {
+        System.out.println("Starting faultCurrent test...");
+        String dbId = null;
+        dbId = clearAndCreatefaultEntity("1", Entity.Faultcurrent.getName(), "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput", SeverityType.Critical);
+        assertEquals("1", dbId);
+
+       // ==READ===========================
+        System.out.println("Trying to read...");
+
+       String readResult = null;
+       try {
+           readResult = dbRawProvider.doReadJsonData(Entity.Faultcurrent.getName(), dbId);
+
+       } catch (Exception e) {
+           fail("Fault log not read: " + e.getMessage());
+       }
+
+
+       String expectedDbResult ="{\"severity\":\"Critical\",\"node-id\":\"s1\",\"problem\":\"signalIsLost\",\"counter\":4340,\"object-id\":\"LP-MWPS-RADIO\",\"implemented-interface\":\"org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.CreateFaultcurrentInput\",\"type\":\"ProblemNotificationXml\",\"timestamp\":\"2019-10-28T11:55:58.3Z\"}";
+
+       System.out.println(readResult);
+       assertNotNull(readResult);
+       assertEquals(expectedDbResult, readResult);
+
+       SearchResult<SearchHit> searchResult = dbRawProvider.doReadAllJsonData(Entity.Faultcurrent.getName());
+       assertNotNull(searchResult);
+
+       List<SearchHit> hits = searchResult.getHits();
+
+       assertNotNull(hits);
+       assertEquals(1, searchResult.getTotal());
+       assertEquals(expectedDbResult, hits.get(0).getSourceAsString());
+
+       //== DELETE ==============================
+       try {
+           dbRawProvider.doRemove(Entity.Faultcurrent.getName(), QueryBuilders.matchAllQuery());
+       } catch (Exception e) {
+           fail("problem deleting: " + e.getMessage());
+       }
+       //== VERIFY DELETE ========================
+       searchResult = dbRawProvider.doReadAllJsonData(Entity.Faultcurrent.getName());
+        hits = searchResult.getHits();
+        assertNotNull(hits);
+        assertEquals(0, searchResult.getTotal());
+
+    }
+
+
+    private Pagination getPagination(long pageSize, int page) {
+        return new PaginationBuilder().setPage(BigInteger.valueOf(page)).setSize(pageSize).build();
+    }
+
+
+    private String clearAndCreatefaultEntity(String initialDbId,  String entityType, String implementedInterface, SeverityType severity) {
+        // ==CLEAR BEFORE TEST============================
+        System.out.println("try to clear entry");
+        try {
+            dbRawProvider.doRemove(entityType, QueryBuilders.matchAllQuery());
+        } catch (Exception e) {
+            fail("problem deleting: " + e.getMessage());
+        }
+
+
+        return createFaultEntity(initialDbId, entityType, implementedInterface, severity);
+    }
+
+    private String createFaultEntity(String initialDbId,  String entityType, String implementedInterface, SeverityType severity) {
+         // ==CREATE============================
+        System.out.println("try to create entry");
+        String dbId = null;
+
+        try {
+
+            dbId = dbRawProvider.doUpdateOrCreate(entityType, initialDbId,"{\n" +
+                    "\"timestamp\": \"2019-10-28T11:55:58.3Z\",\n" +
+                    "\"object-id\": \"LP-MWPS-RADIO\",\n" +
+                    "\"severity\": \""+severity.toString()+"\",\n" +
+                    "\"node-id\": \"s1\",\n" +
+                    "\"implemented-interface\": \""+implementedInterface+"\",\n" +
+                    "\"counter\": 4340,\n" +
+                    "\"problem\": \"signalIsLost\",\n" +
+                    "\"type\": \"ProblemNotificationXml\"\n" +
+                    "}");
+
+
+
+        } catch (Exception e) {
+            fail("Problem creating fault log entry" + e.getMessage());
+        }
+
+        return dbId;
+    }
+
+    private enum timeInterval{
+        PERIOD_15MIN,
+        PERIOD_24HOURS
+    }
+
+    private String createPerformanceData(String initialDbId, timeInterval timeInterval, String scannerId, String uuidInterface, String nodename) {
+
+        String json = "{\n" +
+                "\"node-name\": \""+nodename+"\",\n" +
+                "\"uuid-interface\": \""+uuidInterface+"\",\n" +
+                "\"layer-protocol-name\": \"MWPS\",\n" +
+                "\"radio-signal-id\": \"Test8\",\n" +
+                "\"time-stamp\": \"2017-03-01T06:15:00.0Z\",\n" +
+                "\"granularity-period\": \""+timeInterval.toString()+"\",\n" +
+                "\"scanner-id\": \""+scannerId+"\",\n" +
+                "\"performance-data\": {\n" +
+                "\"cses\": 0,\n" +
+                "\"ses\": 0,\n" +
+                "\"es\": 0,\n" +
+                "\"tx-level-max\": 3,\n" +
+                "\"tx-level-avg\": 3,\n" +
+                "\"rx-level-min\": -44,\n" +
+                "\"rx-level-max\": -45,\n" +
+                "\"rx-level-avg\": -44,\n" +
+                "\"time2-states\": 0,\n" +
+                "\"time4-states-s\": 0,\n" +
+                "\"time4-states\": 0,\n" +
+                "\"time8-states\": -1,\n" +
+                "\"time16-states-s\": -1,\n" +
+                "\"time16-states\": 0,\n" +
+                "\"time32-states\": -1,\n" +
+                "\"time64-states\": 900,\n" +
+                "\"time128-states\": -1,\n" +
+                "\"time256-states\": -1,\n" +
+                "\"time512-states\": -1,\n" +
+                "\"time512-states-l\": -1,\n" +
+                "\"unavailability\": 0,\n" +
+                "\"tx-level-min\": 3,\n" +
+                "\"time1024-states\": -1,\n" +
+                "\"time1024-states-l\": -1,\n" +
+                "\"time2048-states\": -1,\n" +
+                "\"time2048-states-l\": -1,\n" +
+                "\"time4096-states\": -1,\n" +
+                "\"time4096-states-l\": -1,\n" +
+                "\"time8192-states\": -1,\n" +
+                "\"time8192-states-l\": -1,\n" +
+                "\"snir-min\": -99,\n" +
+                "\"snir-max\": -99,\n" +
+                "\"snir-avg\": -99,\n" +
+                "\"xpd-min\": -99,\n" +
+                "\"xpd-max\": -99,\n" +
+                "\"xpd-avg\": -99,\n" +
+                "\"rf-temp-min\": -99,\n" +
+                "\"rf-temp-max\": -99,\n" +
+                "\"rf-temp-avg\": -99,\n" +
+                "\"defect-blocks-sum\": -1,\n" +
+                "\"time-period\": 900\n" +
+                "},\n" +
+                "\"suspect-interval-flag\": false\n" +
+                "}";
+
+        if(timeInterval.toString().equals("PERIOD_15MIN")) {
+            return dbRawProvider.doUpdateOrCreate(Entity.Historicalperformance15min.getName(), initialDbId, json);
+        }else {
+            return dbRawProvider.doUpdateOrCreate(Entity.Historicalperformance24h.getName(), initialDbId, json);
+        }
+    }
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestFilterConversion.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestFilterConversion.java
new file mode 100644
index 000000000..51fe76d92
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestFilterConversion.java
@@ -0,0 +1,22 @@
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.QueryByFilter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Filter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.FilterBuilder;
+
+public class TestFilterConversion {
+
+	private static final String PROPERTY = "node-id";
+
+	@Test
+	public void testQuestionMark() {
+		 List<Filter> filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY).setFiltervalue("si?ba").build());
+		QueryBuilder query = QueryByFilter.fromFilter(filters );
+		System.out.println(query.toJSON());
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/EsObject.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestInitalMaintenanceObjectInDatabase.java
index 4b188d1de..633912579 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/EsObject.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestInitalMaintenanceObjectInDatabase.java
@@ -6,36 +6,29 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import static org.junit.Assert.*;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.junit.Test;
 
 /**
- * @author Herbert
- *
+ * - Handling of inital values for Maintenance mode.
  */
-public class EsObject implements IsEsObject {
-
-    @JsonIgnore
-    private String esId;
-
-    @Override
-    public String getEsId() {
-        return esId;
-    }
+public class TestInitalMaintenanceObjectInDatabase {
 
-    @Override
-    public void setEsId(String esId) {
-        this.esId = esId;
-    }
+	//@Test
+	public void test() {
+		fail("Not yet implemented");
+	}
 
 }
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTimestampFilter.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTimestampFilter.java
new file mode 100644
index 000000000..c32149ba5
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTimestampFilter.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.json.JSONObject;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.QueryByFilter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.Filter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.entity.input.FilterBuilder;
+
+public class TestTimestampFilter {
+
+
+	
+	@Test
+	public void testTimestampRange() {
+		final String PROPERTY_TIMESTAMP = "timestamp";
+		List<Filter> filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2017*").build());
+		QueryBuilder query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2017-01-01T00:00:00.0Z", "2018-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2000-01-01T00:00:00.0Z", "3000-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("20*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2000-01-01T00:00:00.0Z", "2100-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("205*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-01-01T00:00:00.0Z", "2060-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-01-01T00:00:00.0Z", "2051-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-01-01T00:00:00.0Z", "2051-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-1*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-01T00:00:00.0Z", "2051-01-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-01T00:00:00.0Z", "2050-11-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-01T00:00:00.0Z", "2050-11-01T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-0*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-01T00:00:00.0Z", "2050-10-10T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-02*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-02T00:00:00.0Z", "2050-10-03T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T00:00:00.0Z", "2050-10-15T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T00:00:00.0Z", "2050-10-15T00:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T1*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T10:00:00.0Z", "2050-10-14T20:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:00:00.0Z", "2050-10-14T13:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:00:00.0Z", "2050-10-14T13:00:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:4*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:40:00.0Z", "2050-10-14T12:50:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:42*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:42:00.0Z", "2050-10-14T12:43:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:42:*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:42:00.0Z", "2050-10-14T12:43:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:42:5*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:42:50.0Z", "2050-10-14T12:43:00.0Z");
+		
+		filters = Arrays.asList(new FilterBuilder().setProperty(PROPERTY_TIMESTAMP).setFiltervalue("2050-10-14T12:42:56*").build());
+		query=  QueryByFilter.fromFilter(filters );
+		assertRange(query.getInner(), PROPERTY_TIMESTAMP, "2050-10-14T12:42:56.0Z", "2050-10-14T12:42:57.0Z");
+	}
+	private void assertRange(JSONObject rangeQuery,String property,String lower,String upper) {
+		System.out.println("==test for "+rangeQuery.toString());
+		assertTrue(rangeQuery.has("range"));
+		assertTrue(rangeQuery.getJSONObject("range").has(property));
+		JSONObject o=rangeQuery.getJSONObject("range").getJSONObject(property);
+		assertNotNull(o);
+		assertTrue(o.has("lt"));
+		assertEquals(upper, o.getString("lt"));
+		assertTrue(o.has("gte"));
+		assertEquals(lower, o.getString("gte"));
+		System.out.println("succeeded");
+	}
+}
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangProvider.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangProvider.java
new file mode 100644
index 000000000..c911100ef
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangProvider.java
@@ -0,0 +1,195 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.YangFileProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.YangFilename;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.http.YangSchemaHttpServlet;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class TestYangProvider {
+
+	private static final String TESTPATH = "cache/schema/";
+
+
+	@BeforeClass
+	public static void init() {
+		Set<PosixFilePermission> perms;
+		FileAttribute<?> attr;
+		perms     = EnumSet.noneOf(PosixFilePermission.class);
+
+		perms.add(PosixFilePermission.OWNER_READ);
+		perms.add(PosixFilePermission.OWNER_WRITE);
+		perms.add(PosixFilePermission.OWNER_EXECUTE);
+
+		attr = PosixFilePermissions.asFileAttribute(perms);
+		try {
+			Files.createDirectories(new File(TESTPATH).toPath(),attr);
+			new File(TESTPATH+new YangFilename("module1","2010-01-01").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module2","2010-01-01").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module2","2010-04-01").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module3","2010-01-01").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module4","2010-05-01").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module5","2010-01-11").getFilename()).createNewFile();
+			new File(TESTPATH+new YangFilename("module6","2010-01-01").getFilename()).createNewFile();
+		} catch (IOException | ParseException e) {
+
+		}
+	}
+	@AfterClass
+	public static void deinit() {
+		try {
+			Files.walk(new File("cache").toPath())
+		      .sorted(Comparator.reverseOrder())
+		      .map(Path::toFile)
+		      .forEach(File::delete);
+		} catch (IOException e) {
+			System.err.println(e);
+		}
+	}
+	@Test
+	public void testExisting() {
+		YangFileProvider provider= new YangFileProvider(TESTPATH);
+		assertTrue(provider.hasFileForModule("module1","2010-01-01"));
+		assertTrue(provider.hasFileForModule("module2"));
+		assertTrue(provider.hasFileForModule("module3"));
+		assertFalse(provider.hasFileForModule("module5","2010-01-01"));
+	}
+	@Test
+	public void testRevision() throws ParseException {
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+		YangFileProvider provider= new YangFileProvider(TESTPATH);
+		YangFilename f1 = provider.getFileForModule("module1","2010-01-01");
+		assertEquals("module1",f1.getModule());
+		assertEquals(sdf.parse("2010-01-01"),f1.getRevision());
+		YangFilename f2 = provider.getFileForModule("module2");
+		assertEquals("module2",f2.getModule());
+		assertEquals(sdf.parse("2010-04-01"),f2.getRevision());
+		f2 = provider.getFileForModule("module2","2010-02-01");
+		assertEquals("module2",f2.getModule());
+		assertEquals(sdf.parse("2010-04-01"),f2.getRevision());
+		YangFilename f3 = provider.getFileForModule("module3");
+		assertEquals("module3",f3.getModule());
+		assertEquals(sdf.parse("2010-01-01"),f3.getRevision());
+		f3 = provider.getFileForModule("module3","2010-04-01");
+		assertNull(f3);
+	}
+	@Test
+	public void testServlet() throws IOException, ServletException {
+		HelpYangSchemaHttpServlet servlet = new HelpYangSchemaHttpServlet();
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+
+		when(req.getRequestURI()).thenReturn("/yang-schema/module1");
+		StringWriter out = new StringWriter();
+		ServletOutputStream printOut = new ServletOutputStream() {
+
+			@Override
+			public void write(int arg0) throws IOException {
+				out.write(arg0);
+			}
+		};
+		when(resp.getOutputStream()).thenReturn(printOut);
+		servlet.doGet(req,resp);
+		verify(resp).setStatus(200);
+		verify(resp).setContentType("text/plain");
+
+	}
+	@Test
+	public void testServletBad() throws IOException, ServletException {
+		HelpYangSchemaHttpServlet servlet = new HelpYangSchemaHttpServlet();
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+
+		when(req.getRequestURI()).thenReturn("/yang-schema/module1/2020-01-01");
+		StringWriter out = new StringWriter();
+		ServletOutputStream printOut = new ServletOutputStream() {
+
+			@Override
+			public void write(int arg0) throws IOException {
+				out.write(arg0);
+			}
+		};
+		when(resp.getOutputStream()).thenReturn(printOut);
+		servlet.doGet(req,resp);
+		verify(resp).sendError(HttpServletResponse.SC_NOT_FOUND);
+
+	}
+	@Test
+	public void testServletNear() throws IOException, ServletException {
+		HelpYangSchemaHttpServlet servlet = new HelpYangSchemaHttpServlet();
+		HttpServletRequest req = mock(HttpServletRequest.class);
+		HttpServletResponse resp = mock(HttpServletResponse.class);
+
+		when(req.getRequestURI()).thenReturn("/yang-schema/module2/2010-03-01");
+		StringWriter out = new StringWriter();
+		ServletOutputStream printOut = new ServletOutputStream() {
+
+			@Override
+			public void write(int arg0) throws IOException {
+				out.write(arg0);
+			}
+		};
+		when(resp.getOutputStream()).thenReturn(printOut);
+		servlet.doGet(req,resp);
+		verify(resp).setStatus(200);
+		verify(resp).setContentType("text/plain");
+
+	}
+	private static class HelpYangSchemaHttpServlet extends YangSchemaHttpServlet{
+
+		/**
+		 *
+		 */
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+			super.doGet(req, resp);
+		}
+	}
+
+
+}
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties b/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
new file mode 100644
index 000000000..142663bd2
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
@@ -0,0 +1,12 @@
+log4j.rootLogger=INFO, out
+
+log4j.logger.org.apache.camel.impl.converter=WARN
+log4j.logger.org.apache.camel.management=WARN
+log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN
+log4j.logger.org.springframework=ERROR
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml b/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..164e93f54
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/resources/log4j2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration package="log4j.test" 
+               status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="log4j.test.Log4jTest" level="debug">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Root level="trace">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..a2f1e7e76
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,6 @@
+org.slf4j.simpleLogger.defaultLogLevel=debug
+org.slf4j.simpleLogger.showDateTime=true
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+#org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=false
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager-gran/feature/pom.xml b/sdnr/wt/devicemanager-gran/feature/pom.xml
new file mode 100644
index 000000000..bc7ff2cb4
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/feature/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.feature
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-gran-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-gran-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sdnr/wt/devicemanager-gran/installer/pom.xml b/sdnr/wt/devicemanager-gran/installer/pom.xml
new file mode 100755
index 000000000..e0764ab3f
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/installer/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.installer
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-gran-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-devicemanager-gran</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644
index 000000000..c4eb9aa25
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -0,0 +1,49 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : CCSDK
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>repo</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sdnr/wt/devicemanager-gran/model/pom.xml b/sdnr/wt/devicemanager-gran/model/pom.xml
new file mode 100644
index 000000000..39d2b5346
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/model/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-gran-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang b/sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang
new file mode 100644
index 000000000..ca52678dd
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang
@@ -0,0 +1,15 @@
+module devicemanager-gran {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-gran";
+    prefix "devicemanager-gran";
+
+    description
+        "DeviceManager 3gpp Api Module";
+
+    revision "2019-11-29" {
+        description
+            "Initial revision";
+    }
+
+ }
+
diff --git a/sdnr/wt/devicemanager-gran/pom.xml b/sdnr/wt/devicemanager-gran/pom.xml
new file mode 100755
index 000000000..b39543812
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-gran-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>sdnr-wt-devicemanager-gran</feature-name>
+    </properties>
+</project>
diff --git a/sdnr/wt/devicemanager-gran/provider/copyright b/sdnr/wt/devicemanager-gran/provider/copyright
new file mode 100644
index 000000000..754b6218f
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/copyright
@@ -0,0 +1,17 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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/sdnr/wt/devicemanager-gran/provider/pom.xml b/sdnr/wt/devicemanager-gran/provider/pom.xml
new file mode 100644
index 000000000..16f4dbaf0
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/pom.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    ONAP : CCSDK / SDNR / WT / devicemanager
+    ================================================================================
+    Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-gran-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <databaseport>49400</databaseport>
+    </properties>
+
+    <dependencies>
+        <!-- begin for testing -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- end for testing -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-gran-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-devicemanager-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java
new file mode 100644
index 000000000..31d545889
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.gran;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author herbert
+ *
+ */
+public class GRanNetworkElement implements NetworkElement {
+
+    private static final Logger log = LoggerFactory.getLogger(GRanNetworkElement.class);
+
+    private final INetconfAcessor netconfAccessor;
+    @SuppressWarnings("unused")
+    private final DataProvider databaseService;
+
+    GRanNetworkElement(INetconfAcessor netconfAccess, DataProvider databaseService) {
+        log.info("Create {}",GRanNetworkElement.class.getSimpleName());
+        this.netconfAccessor = netconfAccess;
+        this.databaseService = databaseService;
+    }
+
+    @Override
+    public void register() {
+        log.info("Register actions should be here");
+    }
+
+    @Override
+    public void deregister() {
+    }
+
+    @Override
+    public void warmstart() {
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return netconfAccessor.getNodeId();
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.RAN3GPP;
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java
new file mode 100644
index 000000000..97d594a5e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.gran;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731.TopGrp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GRanNetworkElementFactory implements NetworkElementFactory {
+
+    private static final Logger log = LoggerFactory.getLogger(GRanNetworkElementFactory.class);
+
+	@Override
+	public Optional<NetworkElement> create(INetconfAcessor acessor, DeviceManagerServiceProvider serviceProvider) {
+        if (acessor.getCapabilites().isSupportingNamespace(TopGrp.QNAME)) {
+            log.info("Create device {} ",GRanNetworkElement.class.getName());
+            return Optional.of(new GRanNetworkElement(acessor, serviceProvider.getDataProvider()));
+        } else {
+            return Optional.empty();
+        }
+	}
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java
new file mode 100644
index 000000000..744f3405a
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.gran.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.FactoryRegistration;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.gran.GRanNetworkElementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeviceManagerGRanImpl implements AutoCloseable  {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerGRanImpl.class);
+    private static final String APPLICATION_NAME = "DeviceManagerGRan";
+    private static final String CONFIGURATIONFILE = "etc/devicemanager-gran.properties";
+
+    private NetconfNetworkElementService netconfNetworkElementService;
+
+    private Boolean devicemanagerInitializationOk;
+    private DataProvider dataProvider;
+    private FactoryRegistration<GRanNetworkElementFactory> factoryRegistration;
+
+    // Blueprint 1
+    public DeviceManagerGRanImpl() {
+        LOG.info("Creating provider for {}", APPLICATION_NAME);
+        devicemanagerInitializationOk = false;
+
+        netconfNetworkElementService = null;
+        factoryRegistration = null;
+        dataProvider = null;
+    }
+   public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
+       this.netconfNetworkElementService = netconfNetworkElementService;
+   }
+
+    public void init() throws Exception {
+
+        LOG.info("Session Initiated start {}", APPLICATION_NAME);
+        // Intialization
+        factoryRegistration = netconfNetworkElementService.registerNetworkElementFactory(new GRanNetworkElementFactory());
+        dataProvider = netconfNetworkElementService.getServiceProvider().getDataProvider();
+
+        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
+        this.devicemanagerInitializationOk = true;
+
+        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
+    }
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("closing ...");
+        if (factoryRegistration != null) {
+            factoryRegistration.close();
+        }
+        LOG.info("closing done");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java
new file mode 100644
index 000000000..925890b1a
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java
@@ -0,0 +1,8 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
+
+public final class $YangModelBindingProvider implements org.opendaylight.yangtools.yang.binding.YangModelBindingProvider {
+    @java.lang.Override
+    public org.opendaylight.yangtools.yang.binding.YangModuleInfo getModuleInfo() {
+        return $YangModuleInfoImpl.getInstance();
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java
new file mode 100644
index 000000000..7b43064b7
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java
@@ -0,0 +1,46 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
+
+import org.opendaylight.yangtools.yang.binding.ResourceYangModuleInfo;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
+import java.util.Set;
+import java.util.HashSet;
+import com.google.common.collect.ImmutableSet;
+
+public final class $YangModuleInfoImpl extends ResourceYangModuleInfo {
+    private static final QName NAME = QName.create("urn:3gpp:tsg:sa5:nrm:Top", "2018-07-31", "_3gpp-common-top").intern();
+    private static final YangModuleInfo INSTANCE = new $YangModuleInfoImpl();
+
+    private final Set<YangModuleInfo> importedModules;
+
+    public static YangModuleInfo getInstance() {
+        return INSTANCE;
+    }
+
+    public static QName qnameOf(final java.lang.String localName) {
+        return QName.create(NAME, localName).intern();
+    }
+
+    private $YangModuleInfoImpl() {
+        Set<YangModuleInfo> set = new HashSet<>();
+        set.add(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl.getInstance());
+        importedModules = ImmutableSet.copyOf(set);
+    }
+
+    @java.lang.Override
+    public QName getName() {
+        return NAME;
+    }
+
+    @java.lang.Override
+    protected java.lang.String resourceName() {
+        return "/META-INF/yang/_3gpp-common-top@2018-07-31.yang";
+    }
+
+    @java.lang.Override
+    public Set<YangModuleInfo> getImportedModules() {
+        return importedModules;
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java
new file mode 100644
index 000000000..521651261
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java
@@ -0,0 +1,45 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
+import java.lang.String;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDistinguishedName;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-top</b>
+ * <pre>
+ * grouping TopGrp {
+ *   leaf objectClass {
+ *     type string;
+ *   }
+ *   leaf id {
+ *     type nrm-type:t_DistinguishedName;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-top/TopGrp</i>
+ *
+ */
+public interface TopGrp
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("TopGrp");
+
+    /**
+     * @return <code>java.lang.String</code> <code>objectClass</code>, or <code>null</code> if not present
+     */
+    @Nullable String getObjectClass();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDistinguishedName</code> <code>id</code>, or <code>null</code> if not present
+     */
+    @Nullable TDistinguishedName getId();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java
new file mode 100644
index 000000000..9bfd8cb97
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java
@@ -0,0 +1,8 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+
+public final class $YangModelBindingProvider implements org.opendaylight.yangtools.yang.binding.YangModelBindingProvider {
+    @java.lang.Override
+    public org.opendaylight.yangtools.yang.binding.YangModuleInfo getModuleInfo() {
+        return $YangModuleInfoImpl.getInstance();
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java
new file mode 100644
index 000000000..7ad939ace
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java
@@ -0,0 +1,47 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+
+import org.opendaylight.yangtools.yang.binding.ResourceYangModuleInfo;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
+import java.util.Set;
+import java.util.HashSet;
+import com.google.common.collect.ImmutableSet;
+
+public final class $YangModuleInfoImpl extends ResourceYangModuleInfo {
+    private static final QName NAME = QName.create("urn:3gpp:tsg:sa5:nrm:types", "2018-07-31", "_3gpp-common-yang-types").intern();
+    private static final YangModuleInfo INSTANCE = new $YangModuleInfoImpl();
+
+    private final Set<YangModuleInfo> importedModules;
+
+    public static YangModuleInfo getInstance() {
+        return INSTANCE;
+    }
+
+    public static QName qnameOf(final java.lang.String localName) {
+        return QName.create(NAME, localName).intern();
+    }
+
+    private $YangModuleInfoImpl() {
+        Set<YangModuleInfo> set = new HashSet<>();
+        set.add(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.$YangModuleInfoImpl.getInstance());
+        set.add(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.$YangModuleInfoImpl.getInstance());
+        importedModules = ImmutableSet.copyOf(set);
+    }
+    
+    @java.lang.Override
+    public QName getName() {
+        return NAME;
+    }
+    
+    @java.lang.Override
+    protected java.lang.String resourceName() {
+        return "/META-INF/yang/_3gpp-common-yang-types@2018-07-31.yang";
+    }
+    
+    @java.lang.Override
+    public Set<YangModuleInfo> getImportedModules() {
+        return importedModules;
+    }
+    
+    
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java
new file mode 100644
index 000000000..6068ed2e8
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java
@@ -0,0 +1,51 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping aMFIdentifier {
+ *   leaf AMF-Region-id {
+ *     type t_aMF-Region-id;
+ *   }
+ *   leaf AMF-Set-id {
+ *     type t_aMF-Set-id;
+ *   }
+ *   leaf AMF-Pointer {
+ *     type t_aMF-Pointer;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/aMFIdentifier</i>
+ *
+ */
+public interface AMFIdentifier
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("aMFIdentifier");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFRegionId</code> <code>aMFRegionId</code>, or <code>null</code> if not present
+     */
+    @Nullable TAMFRegionId getAMFRegionId();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFSetId</code> <code>aMFSetId</code>, or <code>null</code> if not present
+     */
+    @Nullable TAMFSetId getAMFSetId();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFPointer</code> <code>aMFPointer</code>, or <code>null</code> if not present
+     */
+    @Nullable TAMFPointer getAMFPointer();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java
new file mode 100644
index 000000000..c9e052bdd
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum BwpContext implements Enumeration {
+    DL(0, "DL"),
+    
+    UL(1, "UL"),
+    
+    SUL(2, "SUL")
+    ;
+
+    private static final Map<String, BwpContext> NAME_MAP;
+    private static final Map<Integer, BwpContext> VALUE_MAP;
+
+    static {
+        final Builder<String, BwpContext> nb = ImmutableMap.builder();
+        final Builder<Integer, BwpContext> vb = ImmutableMap.builder();
+        for (BwpContext enumItem : BwpContext.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private BwpContext(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding BwpContext item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<BwpContext> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding BwpContext item, or null if no such item exists
+     */
+    public static BwpContext forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java
new file mode 100644
index 000000000..3585bfbad
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java
@@ -0,0 +1,75 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum DataSetId implements Enumeration {
+    SUBSCRIPTION(0, "SUBSCRIPTION"),
+    
+    POLICY(1, "POLICY"),
+    
+    EXPOSURE(2, "EXPOSURE"),
+    
+    APPLICATION(3, "APPLICATION")
+    ;
+
+    private static final Map<String, DataSetId> NAME_MAP;
+    private static final Map<Integer, DataSetId> VALUE_MAP;
+
+    static {
+        final Builder<String, DataSetId> nb = ImmutableMap.builder();
+        final Builder<Integer, DataSetId> vb = ImmutableMap.builder();
+        for (DataSetId enumItem : DataSetId.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private DataSetId(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding DataSetId item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<DataSetId> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding DataSetId item, or null if no such item exists
+     */
+    public static DataSetId forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java
new file mode 100644
index 000000000..969d5cb9e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java
@@ -0,0 +1,60 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping defaultNotificationSubscription {
+ *   leaf notificationType {
+ *     type NotificationType;
+ *   }
+ *   leaf callbackUri {
+ *     type inet:uri;
+ *   }
+ *   leaf n1MessageClass {
+ *     type N1MessageClass;
+ *   }
+ *   leaf n2InformationClass {
+ *     type N2InformationClass;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/defaultNotificationSubscription</i>
+ *
+ */
+public interface DefaultNotificationSubscription
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("defaultNotificationSubscription");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.NotificationType</code> <code>notificationType</code>, or <code>null</code> if not present
+     */
+    @Nullable NotificationType getNotificationType();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri</code> <code>callbackUri</code>, or <code>null</code> if not present
+     */
+    @Nullable Uri getCallbackUri();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.N1MessageClass</code> <code>n1MessageClass</code>, or <code>null</code> if not present
+     */
+    @Nullable N1MessageClass getN1MessageClass();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.N2InformationClass</code> <code>n2InformationClass</code>, or <code>null</code> if not present
+     */
+    @Nullable N2InformationClass getN2InformationClass();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java
new file mode 100644
index 000000000..a21ffc13a
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java
@@ -0,0 +1,35 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping DnnUpfInfoItem {
+ *   leaf dnn {
+ *     type t_Dnn;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/DnnUpfInfoItem</i>
+ *
+ */
+public interface DnnUpfInfoItem
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("DnnUpfInfoItem");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn</code> <code>dnn</code>, or <code>null</code> if not present
+     */
+    @Nullable TDnn getDnn();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java
new file mode 100644
index 000000000..94a4ca1f3
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java
@@ -0,0 +1,45 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.AmfId;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.PlmnId;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping Guami {
+ *   container plmnId {
+ *     uses pLMNId;
+ *   }
+ *   container amfId {
+ *     uses aMFIdentifier;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Guami</i>
+ *
+ */
+public interface Guami
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Guami");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.PlmnId</code> <code>plmnId</code>, or <code>null</code> if not present
+     */
+    @Nullable PlmnId getPlmnId();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.AmfId</code> <code>amfId</code>, or <code>null</code> if not present
+     */
+    @Nullable AmfId getAmfId();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java
new file mode 100644
index 000000000..4146a260e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java
@@ -0,0 +1,52 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping IdentityRange {
+ *   leaf start {
+ *     type string;
+ *   }
+ *   leaf end {
+ *     type string;
+ *   }
+ *   leaf pattern {
+ *     type string;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/IdentityRange</i>
+ *
+ */
+public interface IdentityRange
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("IdentityRange");
+
+    /**
+     * @return <code>java.lang.String</code> <code>start</code>, or <code>null</code> if not present
+     */
+    @Nullable String getStart();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>end</code>, or <code>null</code> if not present
+     */
+    @Nullable String getEnd();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>pattern</code>, or <code>null</code> if not present
+     */
+    @Nullable String getPattern();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java
new file mode 100644
index 000000000..a3a32e2f3
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java
@@ -0,0 +1,72 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping InterfaceUpfInfoItem {
+ *   leaf interfaceType {
+ *     type UPInterfaceType;
+ *   }
+ *   choice address {
+ *     case ipv4Address {
+ *       leaf ipv4Address {
+ *         type inet:ipv4-address;
+ *       }
+ *     }
+ *     case ipv6Address {
+ *       leaf ipv6Address {
+ *         type inet:ipv6-address;
+ *       }
+ *     }
+ *     case ipv6Prefix {
+ *       leaf ipv6Prefix {
+ *         type inet:ipv6-prefix;
+ *       }
+ *     }
+ *     case endpointFqdn {
+ *       leaf endpointFqdn {
+ *         type inet:domain-name;
+ *       }
+ *     }
+ *   }
+ *   leaf networkInstance {
+ *     type string;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem</i>
+ *
+ */
+public interface InterfaceUpfInfoItem
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("InterfaceUpfInfoItem");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.UPInterfaceType</code> <code>interfaceType</code>, or <code>null</code> if not present
+     */
+    @Nullable UPInterfaceType getInterfaceType();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address</code> <code>address</code>, or <code>null</code> if not present
+     */
+    @Nullable Address getAddress();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>networkInstance</code>, or <code>null</code> if not present
+     */
+    @Nullable String getNetworkInstance();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java
new file mode 100644
index 000000000..4853cc331
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java
@@ -0,0 +1,67 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.Integer;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping ipEndPoint {
+ *   choice address {
+ *     case ipv4Address {
+ *       leaf ipv4Address {
+ *         type inet:ipv4-address;
+ *       }
+ *     }
+ *     case ipv6Address {
+ *       leaf ipv6Address {
+ *         type inet:ipv6-address;
+ *       }
+ *     }
+ *     case ipv6Prefix {
+ *       leaf ipv6Prefix {
+ *         type inet:ipv6-prefix;
+ *       }
+ *     }
+ *   }
+ *   leaf transport {
+ *     type t_TransportProtocol;
+ *   }
+ *   leaf port {
+ *     type uint16;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/ipEndPoint</i>
+ *
+ */
+public interface IpEndPoint
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipEndPoint");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address</code> <code>address</code>, or <code>null</code> if not present
+     */
+    @Nullable Address getAddress();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TTransportProtocol</code> <code>transport</code>, or <code>null</code> if not present
+     */
+    @Nullable TTransportProtocol getTransport();
+    
+    /**
+     * @return <code>java.lang.Integer</code> <code>port</code>, or <code>null</code> if not present
+     */
+    @Nullable Integer getPort();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java
new file mode 100644
index 000000000..16848931d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java
@@ -0,0 +1,44 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping Ipv4AddressRange {
+ *   leaf start {
+ *     type inet:ipv4-address;
+ *   }
+ *   leaf end {
+ *     type inet:ipv4-address;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Ipv4AddressRange</i>
+ *
+ */
+public interface Ipv4AddressRange
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Ipv4AddressRange");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>start</code>, or <code>null</code> if not present
+     */
+    @Nullable Ipv4Address getStart();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>end</code>, or <code>null</code> if not present
+     */
+    @Nullable Ipv4Address getEnd();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java
new file mode 100644
index 000000000..60bb7db7d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java
@@ -0,0 +1,44 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping Ipv6PrefixRange {
+ *   leaf start {
+ *     type inet:ipv6-prefix;
+ *   }
+ *   leaf end {
+ *     type inet:ipv6-prefix;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Ipv6PrefixRange</i>
+ *
+ */
+public interface Ipv6PrefixRange
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Ipv6PrefixRange");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>start</code>, or <code>null</code> if not present
+     */
+    @Nullable Ipv6Prefix getStart();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>end</code>, or <code>null</code> if not present
+     */
+    @Nullable Ipv6Prefix getEnd();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java
new file mode 100644
index 000000000..7073ca517
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java
@@ -0,0 +1,71 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum IsInitialBwp implements Enumeration {
+    INITIAL(0, "INITIAL"),
+    
+    OTHER(1, "OTHER")
+    ;
+
+    private static final Map<String, IsInitialBwp> NAME_MAP;
+    private static final Map<Integer, IsInitialBwp> VALUE_MAP;
+
+    static {
+        final Builder<String, IsInitialBwp> nb = ImmutableMap.builder();
+        final Builder<Integer, IsInitialBwp> vb = ImmutableMap.builder();
+        for (IsInitialBwp enumItem : IsInitialBwp.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private IsInitialBwp(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding IsInitialBwp item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<IsInitialBwp> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding IsInitialBwp item, or null if no such item exists
+     */
+    public static IsInitialBwp forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java
new file mode 100644
index 000000000..f08c1015f
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java
@@ -0,0 +1,75 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum N1MessageClass implements Enumeration {
+    _5GMM(0, "5GMM"),
+    
+    SM(1, "SM"),
+    
+    LPP(2, "LPP"),
+    
+    SMS(3, "SMS")
+    ;
+
+    private static final Map<String, N1MessageClass> NAME_MAP;
+    private static final Map<Integer, N1MessageClass> VALUE_MAP;
+
+    static {
+        final Builder<String, N1MessageClass> nb = ImmutableMap.builder();
+        final Builder<Integer, N1MessageClass> vb = ImmutableMap.builder();
+        for (N1MessageClass enumItem : N1MessageClass.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private N1MessageClass(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding N1MessageClass item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<N1MessageClass> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding N1MessageClass item, or null if no such item exists
+     */
+    public static N1MessageClass forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java
new file mode 100644
index 000000000..8353780bc
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java
@@ -0,0 +1,77 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum N2InformationClass implements Enumeration {
+    SM(0, "SM"),
+    
+    NRPPa(1, "NRPPa"),
+    
+    PWS(2, "PWS"),
+    
+    PWSBCAL(3, "PWS-BCAL"),
+    
+    PWSRF(4, "PWS-RF")
+    ;
+
+    private static final Map<String, N2InformationClass> NAME_MAP;
+    private static final Map<Integer, N2InformationClass> VALUE_MAP;
+
+    static {
+        final Builder<String, N2InformationClass> nb = ImmutableMap.builder();
+        final Builder<Integer, N2InformationClass> vb = ImmutableMap.builder();
+        for (N2InformationClass enumItem : N2InformationClass.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private N2InformationClass(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding N2InformationClass item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<N2InformationClass> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding N2InformationClass item, or null if no such item exists
+     */
+    public static N2InformationClass forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java
new file mode 100644
index 000000000..983cc5be7
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java
@@ -0,0 +1,53 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping NFServiceVersion {
+ *   leaf apiVersionInUri {
+ *     type string;
+ *   }
+ *   leaf apiFullVersion {
+ *     type string;
+ *   }
+ *   leaf expiry {
+ *     type yang:date-and-time;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/NFServiceVersion</i>
+ *
+ */
+public interface NFServiceVersion
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("NFServiceVersion");
+
+    /**
+     * @return <code>java.lang.String</code> <code>apiVersionInUri</code>, or <code>null</code> if not present
+     */
+    @Nullable String getApiVersionInUri();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>apiFullVersion</code>, or <code>null</code> if not present
+     */
+    @Nullable String getApiFullVersion();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime</code> <code>expiry</code>, or <code>null</code> if not present
+     */
+    @Nullable DateAndTime getExpiry();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java
new file mode 100644
index 000000000..aa11f7135
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java
@@ -0,0 +1,71 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum NFStatus implements Enumeration {
+    REGISTERED(0, "REGISTERED"),
+    
+    SUSPENDED(1, "SUSPENDED")
+    ;
+
+    private static final Map<String, NFStatus> NAME_MAP;
+    private static final Map<Integer, NFStatus> VALUE_MAP;
+
+    static {
+        final Builder<String, NFStatus> nb = ImmutableMap.builder();
+        final Builder<Integer, NFStatus> vb = ImmutableMap.builder();
+        for (NFStatus enumItem : NFStatus.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private NFStatus(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding NFStatus item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<NFStatus> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding NFStatus item, or null if no such item exists
+     */
+    public static NFStatus forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java
new file mode 100644
index 000000000..8789e4395
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java
@@ -0,0 +1,107 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum NFType implements Enumeration {
+    NRF(0, "NRF"),
+    
+    UDM(1, "UDM"),
+    
+    AMF(2, "AMF"),
+    
+    SMF(3, "SMF"),
+    
+    AUSF(4, "AUSF"),
+    
+    NEF(5, "NEF"),
+    
+    PCF(6, "PCF"),
+    
+    SMSF(7, "SMSF"),
+    
+    NSSF(8, "NSSF"),
+    
+    UDR(9, "UDR"),
+    
+    LMF(10, "LMF"),
+    
+    GMLC(11, "GMLC"),
+    
+    _5GEIR(12, "5G_EIR"),
+    
+    SEPP(13, "SEPP"),
+    
+    UPF(14, "UPF"),
+    
+    N3IWF(15, "N3IWF"),
+    
+    AF(16, "AF"),
+    
+    UDSF(17, "UDSF"),
+    
+    BSF(18, "BSF"),
+    
+    CHF(19, "CHF")
+    ;
+
+    private static final Map<String, NFType> NAME_MAP;
+    private static final Map<Integer, NFType> VALUE_MAP;
+
+    static {
+        final Builder<String, NFType> nb = ImmutableMap.builder();
+        final Builder<Integer, NFType> vb = ImmutableMap.builder();
+        for (NFType enumItem : NFType.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private NFType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding NFType item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<NFType> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding NFType item, or null if no such item exists
+     */
+    public static NFType forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java
new file mode 100644
index 000000000..e0857a80d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum NotificationEventType implements Enumeration {
+    NFREGISTERED(0, "NF_REGISTERED"),
+    
+    NFDEREGISTERED(1, "NF_DEREGISTERED"),
+    
+    NFPROFILECHANGED(2, "NF_PROFILE_CHANGED")
+    ;
+
+    private static final Map<String, NotificationEventType> NAME_MAP;
+    private static final Map<Integer, NotificationEventType> VALUE_MAP;
+
+    static {
+        final Builder<String, NotificationEventType> nb = ImmutableMap.builder();
+        final Builder<Integer, NotificationEventType> vb = ImmutableMap.builder();
+        for (NotificationEventType enumItem : NotificationEventType.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private NotificationEventType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding NotificationEventType item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<NotificationEventType> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding NotificationEventType item, or null if no such item exists
+     */
+    public static NotificationEventType forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java
new file mode 100644
index 000000000..e78ba7b4d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum NotificationType implements Enumeration {
+    N1MESSAGES(0, "N1_MESSAGES"),
+    
+    N2INFORMATION(1, "N2_INFORMATION"),
+    
+    LOCATIONNOTIFICATION(2, "LOCATION_NOTIFICATION")
+    ;
+
+    private static final Map<String, NotificationType> NAME_MAP;
+    private static final Map<Integer, NotificationType> VALUE_MAP;
+
+    static {
+        final Builder<String, NotificationType> nb = ImmutableMap.builder();
+        final Builder<Integer, NotificationType> vb = ImmutableMap.builder();
+        for (NotificationType enumItem : NotificationType.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private NotificationType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding NotificationType item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<NotificationType> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding NotificationType item, or null if no such item exists
+     */
+    public static NotificationType forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java
new file mode 100644
index 000000000..24bb8d6d5
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java
@@ -0,0 +1,55 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ * A Public Land Mobile Network is uniquely identified by its PLMN identifier. 
+ * PLMN-Id consists of Mobile Country Code (MCC) and Mobile Network Code (MNC).
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping pLMNId {
+ *   leaf MCC {
+ *     type t_mcc;
+ *   }
+ *   leaf MNC {
+ *     type t_mnc;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/pLMNId</i>
+ *
+ */
+public interface PLMNId
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("pLMNId");
+
+    /**
+     * Mobile Country Code (MCC), consisting of three decimal digits.The MCC identifies
+     * uniquely the country of domicile of the mobile subscription.
+     *
+     *
+     *
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc</code> <code>mCC</code>, or <code>null</code> if not present
+     */
+    @Nullable TMcc getMCC();
+    
+    /**
+     * Mobile Network Code (MNC), consisting of two or three decimal digits.The MNC 
+     * identifies the home PLMN of the mobile subscription.
+     *
+     *
+     *
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc</code> <code>mNC</code>, or <code>null</code> if not present
+     */
+    @Nullable TMnc getMNC();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java
new file mode 100644
index 000000000..5854ab526
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java
@@ -0,0 +1,83 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.Short;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class QOffsetRange
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 6398961204554971940L;
+    private final Short _value;
+
+    private static void check_valueRange(final short value) {
+        if (value >= (short)0 && value <= (short)255) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..255]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public QOffsetRange(Short _value) {
+        if (_value != null) {
+            check_valueRange(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public QOffsetRange(QOffsetRange source) {
+        this._value = source._value;
+    }
+
+    public static QOffsetRange getDefaultInstance(String defaultValue) {
+        return new QOffsetRange(Short.valueOf(defaultValue));
+    }
+
+    public Short getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        QOffsetRange other = (QOffsetRange) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(QOffsetRange.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java
new file mode 100644
index 000000000..5669971d9
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java
@@ -0,0 +1,86 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.Integer;
+import java.lang.Short;
+import java.util.List;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping RRMPolicyRatio2 {
+ *   leaf groupId {
+ *     type uint16;
+ *   }
+ *   leaf-list sNSSAI {
+ *     type t_s-NSSAI;
+ *   }
+ *   leaf quotaType {
+ *     type t_quotaType;
+ *   }
+ *   leaf rRMPolicyMaxRation {
+ *     type uint8;
+ *   }
+ *   leaf rRMPolicyMarginMaxRation {
+ *     type uint8;
+ *   }
+ *   leaf rRMPolicyMinRation {
+ *     type uint8;
+ *   }
+ *   leaf rRMPolicyMarginMinRation {
+ *     type uint8;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/RRMPolicyRatio2</i>
+ *
+ */
+public interface RRMPolicyRatio2
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("RRMPolicyRatio2");
+
+    /**
+     * @return <code>java.lang.Integer</code> <code>groupId</code>, or <code>null</code> if not present
+     */
+    @Nullable Integer getGroupId();
+    
+    /**
+     * @return <code>java.util.List</code> <code>sNSSAI</code>, or <code>null</code> if not present
+     */
+    @Nullable List<TSNSSAI> getSNSSAI();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TQuotaType</code> <code>quotaType</code>, or <code>null</code> if not present
+     */
+    @Nullable TQuotaType getQuotaType();
+    
+    /**
+     * @return <code>java.lang.Short</code> <code>rRMPolicyMaxRation</code>, or <code>null</code> if not present
+     */
+    @Nullable Short getRRMPolicyMaxRation();
+    
+    /**
+     * @return <code>java.lang.Short</code> <code>rRMPolicyMarginMaxRation</code>, or <code>null</code> if not present
+     */
+    @Nullable Short getRRMPolicyMarginMaxRation();
+    
+    /**
+     * @return <code>java.lang.Short</code> <code>rRMPolicyMinRation</code>, or <code>null</code> if not present
+     */
+    @Nullable Short getRRMPolicyMinRation();
+    
+    /**
+     * @return <code>java.lang.Short</code> <code>rRMPolicyMarginMinRation</code>, or <code>null</code> if not present
+     */
+    @Nullable Short getRRMPolicyMarginMinRation();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java
new file mode 100644
index 000000000..04f47b0f4
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java
@@ -0,0 +1,55 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.util.List;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem.DnnUpfInfo;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping SnssaiUpfInfoItem {
+ *   leaf sNssai {
+ *     type t_s-NSSAI;
+ *   }
+ *   list dnnUpfInfo {
+ *     key dnn;
+ *     uses DnnUpfInfoItem;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/SnssaiUpfInfoItem</i>
+ *
+ */
+public interface SnssaiUpfInfoItem
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("SnssaiUpfInfoItem");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TSNSSAI</code> <code>sNssai</code>, or <code>null</code> if not present
+     */
+    @Nullable TSNSSAI getSNssai();
+    
+    /**
+     * @return <code>java.util.List</code> <code>dnnUpfInfo</code>, or <code>null</code> if not present
+     */
+    @Nullable List<DnnUpfInfo> getDnnUpfInfo();
+    
+    /**
+     * @return <code>java.util.List</code> <code>dnnUpfInfo</code>, or an empty list if it is not present
+     */
+    default @NonNull List<DnnUpfInfo> nonnullDnnUpfInfo() {
+        return CodeHelpers.nonnull(getDnnUpfInfo());
+    }
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java
new file mode 100644
index 000000000..e959fcaad
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java
@@ -0,0 +1,52 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping SupiRange {
+ *   leaf start {
+ *     type string;
+ *   }
+ *   leaf end {
+ *     type string;
+ *   }
+ *   leaf pattern {
+ *     type string;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/SupiRange</i>
+ *
+ */
+public interface SupiRange
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("SupiRange");
+
+    /**
+     * @return <code>java.lang.String</code> <code>start</code>, or <code>null</code> if not present
+     */
+    @Nullable String getStart();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>end</code>, or <code>null</code> if not present
+     */
+    @Nullable String getEnd();
+    
+    /**
+     * @return <code>java.lang.String</code> <code>pattern</code>, or <code>null</code> if not present
+     */
+    @Nullable String getPattern();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java
new file mode 100644
index 000000000..dec0ed6c6
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java
@@ -0,0 +1,85 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class SupportedFeatures
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 237085469237900179L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[A-Fa-f0-9]*)$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[A-Fa-f0-9]*";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+    }
+
+    @ConstructorProperties("value")
+    public SupportedFeatures(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public SupportedFeatures(SupportedFeatures source) {
+        this._value = source._value;
+    }
+
+    public static SupportedFeatures getDefaultInstance(String defaultValue) {
+        return new SupportedFeatures(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        SupportedFeatures other = (SupportedFeatures) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(SupportedFeatures.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java
new file mode 100644
index 000000000..05ec3a321
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java
@@ -0,0 +1,90 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TAMFPointer
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -7925647994457565082L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[01]*";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+        final int length = value.length();
+        if (length == 6) {
+            return;
+        }
+        CodeHelpers.throwInvalidLength("[[6..6]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TAMFPointer(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TAMFPointer(TAMFPointer source) {
+        this._value = source._value;
+    }
+
+    public static TAMFPointer getDefaultInstance(String defaultValue) {
+        return new TAMFPointer(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TAMFPointer other = (TAMFPointer) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFPointer.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java
new file mode 100644
index 000000000..bb70b4fc4
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java
@@ -0,0 +1,90 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TAMFRegionId
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -4812289071560773109L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[01]*";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+        final int length = value.length();
+        if (length == 8) {
+            return;
+        }
+        CodeHelpers.throwInvalidLength("[[8..8]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TAMFRegionId(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TAMFRegionId(TAMFRegionId source) {
+        this._value = source._value;
+    }
+
+    public static TAMFRegionId getDefaultInstance(String defaultValue) {
+        return new TAMFRegionId(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TAMFRegionId other = (TAMFRegionId) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFRegionId.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java
new file mode 100644
index 000000000..6ecd82e95
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java
@@ -0,0 +1,90 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TAMFSetId
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 6265848852591033404L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[01]*";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+        final int length = value.length();
+        if (length == 10) {
+            return;
+        }
+        CodeHelpers.throwInvalidLength("[[10..10]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TAMFSetId(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TAMFSetId(TAMFSetId source) {
+        this._value = source._value;
+    }
+
+    public static TAMFSetId getDefaultInstance(String defaultValue) {
+        return new TAMFSetId(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TAMFSetId other = (TAMFSetId) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFSetId.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java
new file mode 100644
index 000000000..2838c3c5c
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java
@@ -0,0 +1,89 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TAdministrativeState implements Enumeration {
+    /**
+     * The resource is administratively prohibited from performingservices for its 
+     * users.
+     *
+     */
+    Locked(0, "Locked"),
+    
+    /**
+     * Use of the resource is administratively permitted to existinginstances of use 
+     * only. While the system remains in the shutting down statethe manager may at any 
+     * time cause the managed object to revert to theunlocked state.
+     *
+     */
+    Shutdown(1, "Shutdown"),
+    
+    /**
+     * The resource is administratively permitted to perform services forits users. 
+     * This is independent of its inherent operability.
+     *
+     */
+    Unlocked(2, "Unlocked")
+    ;
+
+    private static final Map<String, TAdministrativeState> NAME_MAP;
+    private static final Map<Integer, TAdministrativeState> VALUE_MAP;
+
+    static {
+        final Builder<String, TAdministrativeState> nb = ImmutableMap.builder();
+        final Builder<Integer, TAdministrativeState> vb = ImmutableMap.builder();
+        for (TAdministrativeState enumItem : TAdministrativeState.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TAdministrativeState(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TAdministrativeState item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TAdministrativeState> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TAdministrativeState item, or null if no such item exists
+     */
+    public static TAdministrativeState forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java
new file mode 100644
index 000000000..d86f68880
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java
@@ -0,0 +1,147 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TAvailabilityStatus implements Enumeration {
+    /**
+     * The resource is undergoing a test procedure. If the administrativestate is 
+     * locked or shutting down then normal users are precluded from usingthe resource 
+     * and the control status attribute has the value reserved for test.Tests that do 
+     * not exclude additional users can be present in any operationalor administrative 
+     * state but the reserved for test condition should not bepresent.
+     *
+     */
+    INTEST(0, "IN TEST"),
+    
+    /**
+     * The resource has an internal fault that prevents it from operating.The 
+     * operational state is disabled.
+     *
+     */
+    FAILED(1, "FAILED"),
+    
+    /**
+     * The resource requires power to be applied and is not powered on.For example, a 
+     * fuse or other protection device is known to have removedpower or a low voltage 
+     * condition has been detected. The operational stateis disabled.
+     *
+     */
+    POWEROFF(2, "POWER OFF"),
+    
+    /**
+     * The resource requires a routine operation to be performed to placeit online and 
+     * make it available for use. The operation may be manual orautomatic, or both. The
+     * operational state is disabled.
+     *
+     */
+    OFFLINE(3, "OFF LINE"),
+    
+    /**
+     * The resource has been made inactive by an internal control processin accordance 
+     * with a predetermined time schedule. Under normal conditionsthe control process 
+     * can be expected to reactivate the resource at somescheduled time, and it is 
+     * therefore considered to be optional. Theoperational state is enabled or 
+     * disabled.
+     *
+     */
+    OFFDUTY(4, "OFF DUTY"),
+    
+    /**
+     * The resource cannot operate because some other resource on which itdepends is 
+     * (i.e. a resource not represented by the same managed object)unavailable. For 
+     * example, a device is not accessible because its controlleris powered off. The 
+     * operational state is disabled.
+     *
+     */
+    DEPENDENCY(5, "DEPENDENCY"),
+    
+    /**
+     * The service available from the resource is degraded in some respect,such as in 
+     * speed or operating capacity. Failure of a test or an unacceptableperformance 
+     * measurement has established that some or all services are notfunctional or are 
+     * degraded due to the presence of a defect. However, theresource remains available
+     * for service, either because some services aresatisfactory or because degraded 
+     * service is preferable to no service at all.Object specific attributes may be 
+     * defined to represent further informationindicating, for example, which services 
+     * are not functional and the nature ofthe degradation. The operational state is 
+     * enabled.
+     *
+     */
+    DEGRADED(6, "DEGRADED"),
+    
+    /**
+     * The resource represented by the managed object is not present, or isincomplete. 
+     * For example, a plug-in module is missing, a cable is disconnectedor a software 
+     * module is not loaded. The operational state is disabled.
+     *
+     */
+    NOTINSTALLED(7, "NOT INSTALLED"),
+    
+    /**
+     * This indicates a log full condition.
+     *
+     */
+    LOGFULL(8, "LOG FULL")
+    ;
+
+    private static final Map<String, TAvailabilityStatus> NAME_MAP;
+    private static final Map<Integer, TAvailabilityStatus> VALUE_MAP;
+
+    static {
+        final Builder<String, TAvailabilityStatus> nb = ImmutableMap.builder();
+        final Builder<Integer, TAvailabilityStatus> vb = ImmutableMap.builder();
+        for (TAvailabilityStatus enumItem : TAvailabilityStatus.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TAvailabilityStatus(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TAvailabilityStatus item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TAvailabilityStatus> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TAvailabilityStatus item, or null if no such item exists
+     */
+    public static TAvailabilityStatus forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java
new file mode 100644
index 000000000..0082d6c4b
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java
@@ -0,0 +1,85 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TCellState implements Enumeration {
+    /**
+     * The resource is not currently in use.
+     *
+     */
+    Idle(0, "Idle"),
+    
+    /**
+     * The resource is not available for use.
+     *
+     */
+    Inactive(1, "Inactive"),
+    
+    /**
+     * The resource is in use.
+     *
+     */
+    Active(2, "Active")
+    ;
+
+    private static final Map<String, TCellState> NAME_MAP;
+    private static final Map<Integer, TCellState> VALUE_MAP;
+
+    static {
+        final Builder<String, TCellState> nb = ImmutableMap.builder();
+        final Builder<Integer, TCellState> vb = ImmutableMap.builder();
+        for (TCellState enumItem : TCellState.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TCellState(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TCellState item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TCellState> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TCellState item, or null if no such item exists
+     */
+    public static TCellState forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java
new file mode 100644
index 000000000..e8b2f3fed
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java
@@ -0,0 +1,71 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TCyclicPrefix implements Enumeration {
+    Normal(0, "Normal"),
+    
+    Extended(1, "Extended")
+    ;
+
+    private static final Map<String, TCyclicPrefix> NAME_MAP;
+    private static final Map<Integer, TCyclicPrefix> VALUE_MAP;
+
+    static {
+        final Builder<String, TCyclicPrefix> nb = ImmutableMap.builder();
+        final Builder<Integer, TCyclicPrefix> vb = ImmutableMap.builder();
+        for (TCyclicPrefix enumItem : TCyclicPrefix.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TCyclicPrefix(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TCyclicPrefix item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TCyclicPrefix> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TCyclicPrefix item, or null if no such item exists
+     */
+    public static TCyclicPrefix forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java
new file mode 100644
index 000000000..fbf1a49d1
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TDistinguishedName
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 2209417379079206418L;
+    private final String _value;
+
+
+    @ConstructorProperties("value")
+    public TDistinguishedName(String _value) {
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TDistinguishedName(TDistinguishedName source) {
+        this._value = source._value;
+    }
+
+    public static TDistinguishedName getDefaultInstance(String defaultValue) {
+        return new TDistinguishedName(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TDistinguishedName other = (TDistinguishedName) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TDistinguishedName.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java
new file mode 100644
index 000000000..b7d485793
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TDnn
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -6761478371390250952L;
+    private final String _value;
+
+
+    @ConstructorProperties("value")
+    public TDnn(String _value) {
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TDnn(TDnn source) {
+        this._value = source._value;
+    }
+
+    public static TDnn getDefaultInstance(String defaultValue) {
+        return new TDnn(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TDnn other = (TDnn) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TDnn.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java
new file mode 100644
index 000000000..65038cb7d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java
@@ -0,0 +1,83 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.Short;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TLoad
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -1391841480548249841L;
+    private final Short _value;
+
+    private static void check_valueRange(final short value) {
+        if (value >= (short)0 && value <= (short)100) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..100]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TLoad(Short _value) {
+        if (_value != null) {
+            check_valueRange(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TLoad(TLoad source) {
+        this._value = source._value;
+    }
+
+    public static TLoad getDefaultInstance(String defaultValue) {
+        return new TLoad(Short.valueOf(defaultValue));
+    }
+
+    public Short getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TLoad other = (TLoad) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TLoad.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java
new file mode 100644
index 000000000..a5d32a30b
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java
@@ -0,0 +1,85 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TMcc
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 8336530756398858673L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[02-79][0-9][0-9])$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[02-79][0-9][0-9]";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+    }
+
+    @ConstructorProperties("value")
+    public TMcc(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TMcc(TMcc source) {
+        this._value = source._value;
+    }
+
+    public static TMcc getDefaultInstance(String defaultValue) {
+        return new TMcc(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TMcc other = (TMcc) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TMcc.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java
new file mode 100644
index 000000000..d5de22dfe
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java
@@ -0,0 +1,85 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TMnc
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 7207647705509368021L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[0-9][0-9][0-9]|[0-9][0-9])$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[0-9][0-9][0-9]|[0-9][0-9]";
+    private final String _value;
+
+    private static void check_valueLength(final String value) {
+    }
+
+    @ConstructorProperties("value")
+    public TMnc(String _value) {
+        if (_value != null) {
+            check_valueLength(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+        CodeHelpers.checkPattern(_value, patterns, regexes);
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TMnc(TMnc source) {
+        this._value = source._value;
+    }
+
+    public static TMnc getDefaultInstance(String defaultValue) {
+        return new TMnc(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TMnc other = (TMnc) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TMnc.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java
new file mode 100644
index 000000000..e7786506f
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java
@@ -0,0 +1,93 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TNCI
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 6536694555014033331L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$", "^(?:[a-fA-F0-9]*)$");
+    private static final Pattern[] patterns = CodeHelpers.compilePatterns(PATTERN_CONSTANTS);
+    private static final String[] regexes = { "[01]*", "[a-fA-F0-9]*" };
+    private final String _string;
+
+
+    private static void check_stringLength(final String value) {
+        final int length = value.length();
+        if (length == 36) {
+            return;
+        }
+        CodeHelpers.throwInvalidLength("[[36..36]]", value);
+    }
+    public TNCI(String _string) {
+        super();
+        check_stringLength(_string);
+        
+        this._string = _string;
+    }
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TNCI(TNCI source) {
+        this._string = source._string;
+    }
+    
+    /**
+     * Return a String representing the value of this union.
+     *
+     * @return String representation of this union's value.
+     */
+    public String stringValue() {
+        if (_string != null) {
+            return _string;
+        }
+    
+        throw new IllegalStateException("No value assinged");
+    }
+
+
+    public String getString() {
+        return _string;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_string);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TNCI other = (TNCI) obj;
+        if (!Objects.equals(_string, other._string)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNCI.class);
+        CodeHelpers.appendValue(helper, "_string", _string);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java
new file mode 100644
index 000000000..3c8462dd0
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java
@@ -0,0 +1,23 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import java.lang.UnsupportedOperationException;
+
+/**
+ * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
+ * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
+ *
+ * The reason behind putting it under src/main/java is:
+ * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
+ * loss of user code.
+ *
+ */
+public class TNCIBuilder {
+    private TNCIBuilder() {
+        //Exists only to defeat instantiation.
+    }
+
+    public static TNCI getDefaultInstance(String defaultValue) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java
new file mode 100644
index 000000000..72a8400ba
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java
@@ -0,0 +1,83 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TNRPCI
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -8223745380422869872L;
+    private final Long _value;
+
+    private static void check_valueRange(final long value) {
+        if (value >= 0L && value <= 4294967295L) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..4294967295]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TNRPCI(Long _value) {
+        if (_value != null) {
+            check_valueRange(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TNRPCI(TNRPCI source) {
+        this._value = source._value;
+    }
+
+    public static TNRPCI getDefaultInstance(String defaultValue) {
+        return new TNRPCI(Long.valueOf(defaultValue));
+    }
+
+    public Long getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TNRPCI other = (TNRPCI) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNRPCI.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java
new file mode 100644
index 000000000..1ae6f3c02
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TNsiId
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = 5629408106052088513L;
+    private final String _value;
+
+
+    @ConstructorProperties("value")
+    public TNsiId(String _value) {
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TNsiId(TNsiId source) {
+        this._value = source._value;
+    }
+
+    public static TNsiId getDefaultInstance(String defaultValue) {
+        return new TNsiId(defaultValue);
+    }
+
+    public String getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TNsiId other = (TNsiId) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNsiId.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java
new file mode 100644
index 000000000..8aae8b46d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java
@@ -0,0 +1,79 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TOperationalState implements Enumeration {
+    /**
+     * The resource is partially or fully operable and available for use.
+     *
+     */
+    Enabled(0, "Enabled"),
+    
+    /**
+     * The resource is totally inoperable and unable to provide serviceto the user(s).
+     *
+     */
+    Disabled(1, "Disabled")
+    ;
+
+    private static final Map<String, TOperationalState> NAME_MAP;
+    private static final Map<Integer, TOperationalState> VALUE_MAP;
+
+    static {
+        final Builder<String, TOperationalState> nb = ImmutableMap.builder();
+        final Builder<Integer, TOperationalState> vb = ImmutableMap.builder();
+        for (TOperationalState enumItem : TOperationalState.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TOperationalState(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TOperationalState item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TOperationalState> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TOperationalState item, or null if no such item exists
+     */
+    public static TOperationalState forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java
new file mode 100644
index 000000000..2b66b0cbf
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java
@@ -0,0 +1,71 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TQuotaType implements Enumeration {
+    Strict(0, "strict"),
+    
+    Float(1, "float")
+    ;
+
+    private static final Map<String, TQuotaType> NAME_MAP;
+    private static final Map<Integer, TQuotaType> VALUE_MAP;
+
+    static {
+        final Builder<String, TQuotaType> nb = ImmutableMap.builder();
+        final Builder<Integer, TQuotaType> vb = ImmutableMap.builder();
+        for (TQuotaType enumItem : TQuotaType.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TQuotaType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TQuotaType item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TQuotaType> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TQuotaType item, or null if no such item exists
+     */
+    public static TQuotaType forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java
new file mode 100644
index 000000000..ea8eca6ec
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java
@@ -0,0 +1,71 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TResourceSharingLevel implements Enumeration {
+    Shared(0, "shared"),
+    
+    NotShared(1, "not-shared")
+    ;
+
+    private static final Map<String, TResourceSharingLevel> NAME_MAP;
+    private static final Map<Integer, TResourceSharingLevel> VALUE_MAP;
+
+    static {
+        final Builder<String, TResourceSharingLevel> nb = ImmutableMap.builder();
+        final Builder<Integer, TResourceSharingLevel> vb = ImmutableMap.builder();
+        for (TResourceSharingLevel enumItem : TResourceSharingLevel.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TResourceSharingLevel(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TResourceSharingLevel item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TResourceSharingLevel> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TResourceSharingLevel item, or null if no such item exists
+     */
+    public static TResourceSharingLevel forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java
new file mode 100644
index 000000000..09cf3522e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java
@@ -0,0 +1,120 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.io.Serializable;
+import java.lang.Long;
+import java.lang.Override;
+import java.lang.Short;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TSNSSAI
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -2943261658086489871L;
+    private final Short _uint8;
+    private final Long _uint32;
+
+
+    private static void checkUint8Range(final short value) {
+        if (value >= (short)0 && value <= (short)255) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..255]]", value);
+    }
+    public TSNSSAI(Short _uint8) {
+        super();
+        checkUint8Range(_uint8);
+        
+        this._uint8 = _uint8;
+        this._uint32 = null;
+    }
+    
+    private static void checkUint32Range(final long value) {
+        if (value >= 0L && value <= 4294967295L) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..4294967295]]", value);
+    }
+    public TSNSSAI(Long _uint32) {
+        super();
+        checkUint32Range(_uint32);
+        
+        this._uint32 = _uint32;
+        this._uint8 = null;
+    }
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TSNSSAI(TSNSSAI source) {
+        this._uint8 = source._uint8;
+        this._uint32 = source._uint32;
+    }
+    
+    /**
+     * Return a String representing the value of this union.
+     *
+     * @return String representation of this union's value.
+     */
+    public String stringValue() {
+        if (_uint8 != null) {
+            return _uint8.toString();
+        }
+        if (_uint32 != null) {
+            return _uint32.toString();
+        }
+    
+        throw new IllegalStateException("No value assinged");
+    }
+
+
+    public Short getUint8() {
+        return _uint8;
+    }
+    
+    public Long getUint32() {
+        return _uint32;
+    }
+
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Objects.hashCode(_uint8);
+        result = prime * result + Objects.hashCode(_uint32);
+        return result;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TSNSSAI other = (TSNSSAI) obj;
+        if (!Objects.equals(_uint8, other._uint8)) {
+            return false;
+        }
+        if (!Objects.equals(_uint32, other._uint32)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TSNSSAI.class);
+        CodeHelpers.appendValue(helper, "_uint8", _uint8);
+        CodeHelpers.appendValue(helper, "_uint32", _uint32);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java
new file mode 100644
index 000000000..b0d11a747
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java
@@ -0,0 +1,23 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import java.lang.UnsupportedOperationException;
+
+/**
+ * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
+ * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
+ *
+ * The reason behind putting it under src/main/java is:
+ * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
+ * loss of user code.
+ *
+ */
+public class TSNSSAIBuilder {
+    private TSNSSAIBuilder() {
+        //Exists only to defeat instantiation.
+    }
+
+    public static TSNSSAI getDefaultInstance(String defaultValue) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java
new file mode 100644
index 000000000..1045aa995
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java
@@ -0,0 +1,83 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.Short;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TSST
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -2844923602415446951L;
+    private final Short _value;
+
+    private static void check_valueRange(final short value) {
+        if (value >= (short)0 && value <= (short)255) {
+            return;
+        }
+        CodeHelpers.throwInvalidRange("[[0..255]]", value);
+    }
+
+    @ConstructorProperties("value")
+    public TSST(Short _value) {
+        if (_value != null) {
+            check_valueRange(_value);
+        }
+    
+        Objects.requireNonNull(_value, "Supplied value may not be null");
+    
+        this._value = _value;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TSST(TSST source) {
+        this._value = source._value;
+    }
+
+    public static TSST getDefaultInstance(String defaultValue) {
+        return new TSST(Short.valueOf(defaultValue));
+    }
+
+    public Short getValue() {
+        return _value;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_value);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TSST other = (TSST) obj;
+        if (!Objects.equals(_value, other._value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TSST.class);
+        CodeHelpers.appendValue(helper, "_value", _value);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java
new file mode 100644
index 000000000..49124021e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java
@@ -0,0 +1,75 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TSubcarrierSpacing implements Enumeration {
+    _15(0, "15"),
+    
+    _30(1, "30"),
+    
+    _60(2, "60"),
+    
+    _120(3, "120")
+    ;
+
+    private static final Map<String, TSubcarrierSpacing> NAME_MAP;
+    private static final Map<Integer, TSubcarrierSpacing> VALUE_MAP;
+
+    static {
+        final Builder<String, TSubcarrierSpacing> nb = ImmutableMap.builder();
+        final Builder<Integer, TSubcarrierSpacing> vb = ImmutableMap.builder();
+        for (TSubcarrierSpacing enumItem : TSubcarrierSpacing.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TSubcarrierSpacing(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TSubcarrierSpacing item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TSubcarrierSpacing> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TSubcarrierSpacing item, or null if no such item exists
+     */
+    public static TSubcarrierSpacing forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java
new file mode 100644
index 000000000..f85c972b7
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java
@@ -0,0 +1,93 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import java.io.Serializable;
+import java.lang.Override;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+
+public class TTAC
+ implements TypeObject, Serializable {
+    private static final long serialVersionUID = -7663797870532797015L;
+    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[a-fA-F0-9]*)$");
+    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
+    private static final String regexes = "[a-fA-F0-9]*";
+    private final String _string;
+
+
+    private static void check_stringLength(final String value) {
+        final int length = value.length();
+        if (length == 4) {
+            return;
+        }
+        CodeHelpers.throwInvalidLength("[[4..4]]", value);
+    }
+    public TTAC(String _string) {
+        super();
+        check_stringLength(_string);
+        
+        this._string = _string;
+    }
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public TTAC(TTAC source) {
+        this._string = source._string;
+    }
+    
+    /**
+     * Return a String representing the value of this union.
+     *
+     * @return String representation of this union's value.
+     */
+    public String stringValue() {
+        if (_string != null) {
+            return _string;
+        }
+    
+        throw new IllegalStateException("No value assinged");
+    }
+
+
+    public String getString() {
+        return _string;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_string);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TTAC other = (TTAC) obj;
+        if (!Objects.equals(_string, other._string)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TTAC.class);
+        CodeHelpers.appendValue(helper, "_string", _string);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java
new file mode 100644
index 000000000..e9aba2668
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java
@@ -0,0 +1,23 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import java.lang.String;
+import java.lang.UnsupportedOperationException;
+
+/**
+ * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
+ * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
+ *
+ * The reason behind putting it under src/main/java is:
+ * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
+ * loss of user code.
+ *
+ */
+public class TTACBuilder {
+    private TTACBuilder() {
+        //Exists only to defeat instantiation.
+    }
+
+    public static TTAC getDefaultInstance(String defaultValue) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java
new file mode 100644
index 000000000..bfdf26cc1
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TTransportProtocol implements Enumeration {
+    TCP(0, "TCP"),
+    
+    STCP(1, "STCP"),
+    
+    UDP(2, "UDP")
+    ;
+
+    private static final Map<String, TTransportProtocol> NAME_MAP;
+    private static final Map<Integer, TTransportProtocol> VALUE_MAP;
+
+    static {
+        final Builder<String, TTransportProtocol> nb = ImmutableMap.builder();
+        final Builder<Integer, TTransportProtocol> vb = ImmutableMap.builder();
+        for (TTransportProtocol enumItem : TTransportProtocol.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TTransportProtocol(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TTransportProtocol item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TTransportProtocol> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TTransportProtocol item, or null if no such item exists
+     */
+    public static TTransportProtocol forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java
new file mode 100644
index 000000000..96aa56c07
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java
@@ -0,0 +1,75 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TUEMobilityLevel implements Enumeration {
+    Stationary(0, "stationary"),
+    
+    Nomadic(1, "nomadic"),
+    
+    RestrictedMobility(2, "restricted mobility"),
+    
+    FullyMobility(3, "fully mobility")
+    ;
+
+    private static final Map<String, TUEMobilityLevel> NAME_MAP;
+    private static final Map<Integer, TUEMobilityLevel> VALUE_MAP;
+
+    static {
+        final Builder<String, TUEMobilityLevel> nb = ImmutableMap.builder();
+        final Builder<Integer, TUEMobilityLevel> vb = ImmutableMap.builder();
+        for (TUEMobilityLevel enumItem : TUEMobilityLevel.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TUEMobilityLevel(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TUEMobilityLevel item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TUEMobilityLevel> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TUEMobilityLevel item, or null if no such item exists
+     */
+    public static TUEMobilityLevel forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java
new file mode 100644
index 000000000..325f70a66
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java
@@ -0,0 +1,44 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai.PlmnId;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * grouping Tai {
+ *   container plmnId {
+ *     uses pLMNId;
+ *   }
+ *   leaf tac {
+ *     type t_tAC;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Tai</i>
+ *
+ */
+public interface Tai
+    extends
+    DataObject
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Tai");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai.PlmnId</code> <code>plmnId</code>, or <code>null</code> if not present
+     */
+    @Nullable PlmnId getPlmnId();
+    
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TTAC</code> <code>tac</code>, or <code>null</code> if not present
+     */
+    @Nullable TTAC getTac();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java
new file mode 100644
index 000000000..a02cee620
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum TxDirection implements Enumeration {
+    DL(0, "DL"),
+    
+    UL(1, "UL"),
+    
+    DLAndUL(2, "DL and UL")
+    ;
+
+    private static final Map<String, TxDirection> NAME_MAP;
+    private static final Map<Integer, TxDirection> VALUE_MAP;
+
+    static {
+        final Builder<String, TxDirection> nb = ImmutableMap.builder();
+        final Builder<Integer, TxDirection> vb = ImmutableMap.builder();
+        for (TxDirection enumItem : TxDirection.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private TxDirection(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding TxDirection item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<TxDirection> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding TxDirection item, or null if no such item exists
+     */
+    public static TxDirection forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java
new file mode 100644
index 000000000..bdcf43aee
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java
@@ -0,0 +1,73 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.lang.Integer;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.Enumeration;
+
+public enum UPInterfaceType implements Enumeration {
+    N3(0, "N3"),
+    
+    N6(1, "N6"),
+    
+    N9(2, "N9")
+    ;
+
+    private static final Map<String, UPInterfaceType> NAME_MAP;
+    private static final Map<Integer, UPInterfaceType> VALUE_MAP;
+
+    static {
+        final Builder<String, UPInterfaceType> nb = ImmutableMap.builder();
+        final Builder<Integer, UPInterfaceType> vb = ImmutableMap.builder();
+        for (UPInterfaceType enumItem : UPInterfaceType.values()) {
+            vb.put(enumItem.value, enumItem);
+            nb.put(enumItem.name, enumItem);
+        }
+
+        NAME_MAP = nb.build();
+        VALUE_MAP = vb.build();
+    }
+
+    private final String name;
+    private final int value;
+
+    private UPInterfaceType(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getIntValue() {
+        return value;
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getName()} matches specified value.
+     *
+     * @param name YANG assigned name
+     * @return corresponding UPInterfaceType item, if present
+     * @throws NullPointerException if name is null
+     */
+    public static Optional<UPInterfaceType> forName(String name) {
+        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
+    }
+
+    /**
+     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
+     *
+     * @param intValue integer value
+     * @return corresponding UPInterfaceType item, or null if no such item exists
+     */
+    public static UPInterfaceType forValue(int intValue) {
+        return VALUE_MAP.get(intValue);
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java
new file mode 100644
index 000000000..3918d23d0
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java
@@ -0,0 +1,37 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Guami;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * container amfId {
+ *   uses aMFIdentifier;
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Guami/amfId</i>
+ *
+ * <p>To create instances of this class use {@link AmfIdBuilder}.
+ * @see AmfIdBuilder
+ *
+ */
+public interface AmfId
+    extends
+    ChildOf<Guami>,
+    Augmentable<AmfId>,
+    AMFIdentifier
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("amfId");
+
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java
new file mode 100644
index 000000000..03348babe
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java
@@ -0,0 +1,255 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFPointer;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFRegionId;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFSetId;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link AmfIdBuilder} instances.
+ *
+ * @see AmfIdBuilder
+ *
+ */
+public class AmfIdBuilder implements Builder<AmfId> {
+
+    private TAMFPointer _aMFPointer;
+    private TAMFRegionId _aMFRegionId;
+    private TAMFSetId _aMFSetId;
+
+
+    Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> augmentation = Collections.emptyMap();
+
+    public AmfIdBuilder() {
+    }
+    public AmfIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier arg) {
+        this._aMFRegionId = arg.getAMFRegionId();
+        this._aMFSetId = arg.getAMFSetId();
+        this._aMFPointer = arg.getAMFPointer();
+    }
+
+    public AmfIdBuilder(AmfId base) {
+        this._aMFPointer = base.getAMFPointer();
+        this._aMFRegionId = base.getAMFRegionId();
+        this._aMFSetId = base.getAMFSetId();
+        if (base instanceof AmfIdImpl) {
+            AmfIdImpl impl = (AmfIdImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> aug =((AugmentationHolder<AmfId>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+    /**
+     * Set fields from given grouping argument. Valid argument is instance of one of following types:
+     * <ul>
+     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier</li>
+     * </ul>
+     *
+     * @param arg grouping object
+     * @throws IllegalArgumentException if given argument is none of valid types
+    */
+    public void fieldsFrom(DataObject arg) {
+        boolean isValidArg = false;
+        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier) {
+            this._aMFRegionId = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFRegionId();
+            this._aMFSetId = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFSetId();
+            this._aMFPointer = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFPointer();
+            isValidArg = true;
+        }
+        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier]");
+    }
+
+    public TAMFPointer getAMFPointer() {
+        return _aMFPointer;
+    }
+    
+    public TAMFRegionId getAMFRegionId() {
+        return _aMFRegionId;
+    }
+    
+    public TAMFSetId getAMFSetId() {
+        return _aMFSetId;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<AmfId>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public AmfIdBuilder setAMFPointer(final TAMFPointer value) {
+        this._aMFPointer = value;
+        return this;
+    }
+    
+    public AmfIdBuilder setAMFRegionId(final TAMFRegionId value) {
+        this._aMFRegionId = value;
+        return this;
+    }
+    
+    public AmfIdBuilder setAMFSetId(final TAMFSetId value) {
+        this._aMFSetId = value;
+        return this;
+    }
+    
+    public AmfIdBuilder addAugmentation(Class<? extends Augmentation<AmfId>> augmentationType, Augmentation<AmfId> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public AmfIdBuilder removeAugmentation(Class<? extends Augmentation<AmfId>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public AmfId build() {
+        return new AmfIdImpl(this);
+    }
+
+    private static final class AmfIdImpl implements AmfId {
+    
+        private final TAMFPointer _aMFPointer;
+        private final TAMFRegionId _aMFRegionId;
+        private final TAMFSetId _aMFSetId;
+    
+        private Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> augmentation = Collections.emptyMap();
+    
+        AmfIdImpl(AmfIdBuilder base) {
+            this._aMFPointer = base.getAMFPointer();
+            this._aMFRegionId = base.getAMFRegionId();
+            this._aMFSetId = base.getAMFSetId();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<AmfId> getImplementedInterface() {
+            return AmfId.class;
+        }
+    
+        @Override
+        public TAMFPointer getAMFPointer() {
+            return _aMFPointer;
+        }
+        
+        @Override
+        public TAMFRegionId getAMFRegionId() {
+            return _aMFRegionId;
+        }
+        
+        @Override
+        public TAMFSetId getAMFSetId() {
+            return _aMFSetId;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<AmfId>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_aMFPointer);
+            result = prime * result + Objects.hashCode(_aMFRegionId);
+            result = prime * result + Objects.hashCode(_aMFSetId);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!AmfId.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            AmfId other = (AmfId)obj;
+            if (!Objects.equals(_aMFPointer, other.getAMFPointer())) {
+                return false;
+            }
+            if (!Objects.equals(_aMFRegionId, other.getAMFRegionId())) {
+                return false;
+            }
+            if (!Objects.equals(_aMFSetId, other.getAMFSetId())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                AmfIdImpl otherImpl = (AmfIdImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("AmfId");
+            CodeHelpers.appendValue(helper, "_aMFPointer", _aMFPointer);
+            CodeHelpers.appendValue(helper, "_aMFRegionId", _aMFRegionId);
+            CodeHelpers.appendValue(helper, "_aMFSetId", _aMFSetId);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java
new file mode 100644
index 000000000..6f0017139
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java
@@ -0,0 +1,37 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Guami;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * container plmnId {
+ *   uses pLMNId;
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Guami/plmnId</i>
+ *
+ * <p>To create instances of this class use {@link PlmnIdBuilder}.
+ * @see PlmnIdBuilder
+ *
+ */
+public interface PlmnId
+    extends
+    ChildOf<Guami>,
+    Augmentable<PlmnId>,
+    PLMNId
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("plmnId");
+
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java
new file mode 100644
index 000000000..d1087256f
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java
@@ -0,0 +1,229 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link PlmnIdBuilder} instances.
+ *
+ * @see PlmnIdBuilder
+ *
+ */
+public class PlmnIdBuilder implements Builder<PlmnId> {
+
+    private TMcc _mCC;
+    private TMnc _mNC;
+
+
+    Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
+
+    public PlmnIdBuilder() {
+    }
+    public PlmnIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId arg) {
+        this._mCC = arg.getMCC();
+        this._mNC = arg.getMNC();
+    }
+
+    public PlmnIdBuilder(PlmnId base) {
+        this._mCC = base.getMCC();
+        this._mNC = base.getMNC();
+        if (base instanceof PlmnIdImpl) {
+            PlmnIdImpl impl = (PlmnIdImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> aug =((AugmentationHolder<PlmnId>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+    /**
+     * Set fields from given grouping argument. Valid argument is instance of one of following types:
+     * <ul>
+     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId</li>
+     * </ul>
+     *
+     * @param arg grouping object
+     * @throws IllegalArgumentException if given argument is none of valid types
+    */
+    public void fieldsFrom(DataObject arg) {
+        boolean isValidArg = false;
+        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId) {
+            this._mCC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMCC();
+            this._mNC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMNC();
+            isValidArg = true;
+        }
+        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId]");
+    }
+
+    public TMcc getMCC() {
+        return _mCC;
+    }
+    
+    public TMnc getMNC() {
+        return _mNC;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public PlmnIdBuilder setMCC(final TMcc value) {
+        this._mCC = value;
+        return this;
+    }
+    
+    public PlmnIdBuilder setMNC(final TMnc value) {
+        this._mNC = value;
+        return this;
+    }
+    
+    public PlmnIdBuilder addAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType, Augmentation<PlmnId> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public PlmnIdBuilder removeAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public PlmnId build() {
+        return new PlmnIdImpl(this);
+    }
+
+    private static final class PlmnIdImpl implements PlmnId {
+    
+        private final TMcc _mCC;
+        private final TMnc _mNC;
+    
+        private Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
+    
+        PlmnIdImpl(PlmnIdBuilder base) {
+            this._mCC = base.getMCC();
+            this._mNC = base.getMNC();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<PlmnId> getImplementedInterface() {
+            return PlmnId.class;
+        }
+    
+        @Override
+        public TMcc getMCC() {
+            return _mCC;
+        }
+        
+        @Override
+        public TMnc getMNC() {
+            return _mNC;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_mCC);
+            result = prime * result + Objects.hashCode(_mNC);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!PlmnId.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            PlmnId other = (PlmnId)obj;
+            if (!Objects.equals(_mCC, other.getMCC())) {
+                return false;
+            }
+            if (!Objects.equals(_mNC, other.getMNC())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                PlmnIdImpl otherImpl = (PlmnIdImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("PlmnId");
+            CodeHelpers.appendValue(helper, "_mCC", _mCC);
+            CodeHelpers.appendValue(helper, "_mNC", _mNC);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java
new file mode 100644
index 000000000..d9718e665
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java
@@ -0,0 +1,49 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.InterfaceUpfInfoItem;
+import org.opendaylight.yangtools.yang.binding.ChoiceIn;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * choice address {
+ *   case ipv4Address {
+ *     leaf ipv4Address {
+ *       type inet:ipv4-address;
+ *     }
+ *   }
+ *   case ipv6Address {
+ *     leaf ipv6Address {
+ *       type inet:ipv6-address;
+ *     }
+ *   }
+ *   case ipv6Prefix {
+ *     leaf ipv6Prefix {
+ *       type inet:ipv6-prefix;
+ *     }
+ *   }
+ *   case endpointFqdn {
+ *     leaf endpointFqdn {
+ *       type inet:domain-name;
+ *     }
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address</i>
+ *
+ */
+public interface Address
+    extends
+    ChoiceIn<InterfaceUpfInfoItem>
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("address");
+
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java
new file mode 100644
index 000000000..4bf58dda3
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java
@@ -0,0 +1,41 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case endpointFqdn {
+ *   leaf endpointFqdn {
+ *     type inet:domain-name;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/endpointFqdn</i>
+ *
+ */
+public interface EndpointFqdn
+    extends
+    DataObject,
+    Augmentable<EndpointFqdn>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("endpointFqdn");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName</code> <code>endpointFqdn</code>, or <code>null</code> if not present
+     */
+    @Nullable DomainName getEndpointFqdn();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java
new file mode 100644
index 000000000..2abed8b15
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java
@@ -0,0 +1,183 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link EndpointFqdnBuilder} instances.
+ *
+ * @see EndpointFqdnBuilder
+ *
+ */
+public class EndpointFqdnBuilder implements Builder<EndpointFqdn> {
+
+    private DomainName _endpointFqdn;
+
+
+    Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> augmentation = Collections.emptyMap();
+
+    public EndpointFqdnBuilder() {
+    }
+
+    public EndpointFqdnBuilder(EndpointFqdn base) {
+        this._endpointFqdn = base.getEndpointFqdn();
+        if (base instanceof EndpointFqdnImpl) {
+            EndpointFqdnImpl impl = (EndpointFqdnImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> aug =((AugmentationHolder<EndpointFqdn>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public DomainName getEndpointFqdn() {
+        return _endpointFqdn;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<EndpointFqdn>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public EndpointFqdnBuilder setEndpointFqdn(final DomainName value) {
+        this._endpointFqdn = value;
+        return this;
+    }
+    
+    public EndpointFqdnBuilder addAugmentation(Class<? extends Augmentation<EndpointFqdn>> augmentationType, Augmentation<EndpointFqdn> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public EndpointFqdnBuilder removeAugmentation(Class<? extends Augmentation<EndpointFqdn>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public EndpointFqdn build() {
+        return new EndpointFqdnImpl(this);
+    }
+
+    private static final class EndpointFqdnImpl implements EndpointFqdn {
+    
+        private final DomainName _endpointFqdn;
+    
+        private Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> augmentation = Collections.emptyMap();
+    
+        EndpointFqdnImpl(EndpointFqdnBuilder base) {
+            this._endpointFqdn = base.getEndpointFqdn();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<EndpointFqdn> getImplementedInterface() {
+            return EndpointFqdn.class;
+        }
+    
+        @Override
+        public DomainName getEndpointFqdn() {
+            return _endpointFqdn;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<EndpointFqdn>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_endpointFqdn);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!EndpointFqdn.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            EndpointFqdn other = (EndpointFqdn)obj;
+            if (!Objects.equals(_endpointFqdn, other.getEndpointFqdn())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                EndpointFqdnImpl otherImpl = (EndpointFqdnImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("EndpointFqdn");
+            CodeHelpers.appendValue(helper, "_endpointFqdn", _endpointFqdn);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java
new file mode 100644
index 000000000..92483f476
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv4Address {
+ *   leaf ipv4Address {
+ *     type inet:ipv4-address;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv4Address</i>
+ *
+ */
+public interface Ipv4Address
+    extends
+    DataObject,
+    Augmentable<Ipv4Address>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv4Address");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>ipv4Address</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv4Address getIpv4Address();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java
new file mode 100644
index 000000000..4ad474a9c
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv4AddressBuilder} instances.
+ *
+ * @see Ipv4AddressBuilder
+ *
+ */
+public class Ipv4AddressBuilder implements Builder<Ipv4Address> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
+
+
+    Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
+
+    public Ipv4AddressBuilder() {
+    }
+
+    public Ipv4AddressBuilder(Ipv4Address base) {
+        this._ipv4Address = base.getIpv4Address();
+        if (base instanceof Ipv4AddressImpl) {
+            Ipv4AddressImpl impl = (Ipv4AddressImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> aug =((AugmentationHolder<Ipv4Address>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
+        return _ipv4Address;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv4AddressBuilder setIpv4Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address value) {
+        this._ipv4Address = value;
+        return this;
+    }
+    
+    public Ipv4AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType, Augmentation<Ipv4Address> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv4AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv4Address build() {
+        return new Ipv4AddressImpl(this);
+    }
+
+    private static final class Ipv4AddressImpl implements Ipv4Address {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
+    
+        private Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
+    
+        Ipv4AddressImpl(Ipv4AddressBuilder base) {
+            this._ipv4Address = base.getIpv4Address();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv4Address> getImplementedInterface() {
+            return Ipv4Address.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
+            return _ipv4Address;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv4Address);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv4Address.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv4Address other = (Ipv4Address)obj;
+            if (!Objects.equals(_ipv4Address, other.getIpv4Address())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv4AddressImpl otherImpl = (Ipv4AddressImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv4Address");
+            CodeHelpers.appendValue(helper, "_ipv4Address", _ipv4Address);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java
new file mode 100644
index 000000000..93a8affbd
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv6Address {
+ *   leaf ipv6Address {
+ *     type inet:ipv6-address;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv6Address</i>
+ *
+ */
+public interface Ipv6Address
+    extends
+    DataObject,
+    Augmentable<Ipv6Address>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Address");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address</code> <code>ipv6Address</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Address getIpv6Address();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java
new file mode 100644
index 000000000..4d0416e3b
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv6AddressBuilder} instances.
+ *
+ * @see Ipv6AddressBuilder
+ *
+ */
+public class Ipv6AddressBuilder implements Builder<Ipv6Address> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
+
+
+    Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
+
+    public Ipv6AddressBuilder() {
+    }
+
+    public Ipv6AddressBuilder(Ipv6Address base) {
+        this._ipv6Address = base.getIpv6Address();
+        if (base instanceof Ipv6AddressImpl) {
+            Ipv6AddressImpl impl = (Ipv6AddressImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> aug =((AugmentationHolder<Ipv6Address>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
+        return _ipv6Address;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv6AddressBuilder setIpv6Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address value) {
+        this._ipv6Address = value;
+        return this;
+    }
+    
+    public Ipv6AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType, Augmentation<Ipv6Address> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv6AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv6Address build() {
+        return new Ipv6AddressImpl(this);
+    }
+
+    private static final class Ipv6AddressImpl implements Ipv6Address {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
+    
+        private Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
+    
+        Ipv6AddressImpl(Ipv6AddressBuilder base) {
+            this._ipv6Address = base.getIpv6Address();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv6Address> getImplementedInterface() {
+            return Ipv6Address.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
+            return _ipv6Address;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv6Address);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv6Address.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv6Address other = (Ipv6Address)obj;
+            if (!Objects.equals(_ipv6Address, other.getIpv6Address())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv6AddressImpl otherImpl = (Ipv6AddressImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Address");
+            CodeHelpers.appendValue(helper, "_ipv6Address", _ipv6Address);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java
new file mode 100644
index 000000000..e18a666dd
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv6Prefix {
+ *   leaf ipv6Prefix {
+ *     type inet:ipv6-prefix;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv6Prefix</i>
+ *
+ */
+public interface Ipv6Prefix
+    extends
+    DataObject,
+    Augmentable<Ipv6Prefix>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Prefix");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>ipv6Prefix</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Prefix getIpv6Prefix();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java
new file mode 100644
index 000000000..2fc644826
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv6PrefixBuilder} instances.
+ *
+ * @see Ipv6PrefixBuilder
+ *
+ */
+public class Ipv6PrefixBuilder implements Builder<Ipv6Prefix> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
+
+
+    Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
+
+    public Ipv6PrefixBuilder() {
+    }
+
+    public Ipv6PrefixBuilder(Ipv6Prefix base) {
+        this._ipv6Prefix = base.getIpv6Prefix();
+        if (base instanceof Ipv6PrefixImpl) {
+            Ipv6PrefixImpl impl = (Ipv6PrefixImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> aug =((AugmentationHolder<Ipv6Prefix>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
+        return _ipv6Prefix;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv6PrefixBuilder setIpv6Prefix(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix value) {
+        this._ipv6Prefix = value;
+        return this;
+    }
+    
+    public Ipv6PrefixBuilder addAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType, Augmentation<Ipv6Prefix> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv6PrefixBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv6Prefix build() {
+        return new Ipv6PrefixImpl(this);
+    }
+
+    private static final class Ipv6PrefixImpl implements Ipv6Prefix {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
+    
+        private Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
+    
+        Ipv6PrefixImpl(Ipv6PrefixBuilder base) {
+            this._ipv6Prefix = base.getIpv6Prefix();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv6Prefix> getImplementedInterface() {
+            return Ipv6Prefix.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
+            return _ipv6Prefix;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv6Prefix);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv6Prefix.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv6Prefix other = (Ipv6Prefix)obj;
+            if (!Objects.equals(_ipv6Prefix, other.getIpv6Prefix())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv6PrefixImpl otherImpl = (Ipv6PrefixImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Prefix");
+            CodeHelpers.appendValue(helper, "_ipv6Prefix", _ipv6Prefix);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java
new file mode 100644
index 000000000..f15a2bdc6
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java
@@ -0,0 +1,44 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.IpEndPoint;
+import org.opendaylight.yangtools.yang.binding.ChoiceIn;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * choice address {
+ *   case ipv4Address {
+ *     leaf ipv4Address {
+ *       type inet:ipv4-address;
+ *     }
+ *   }
+ *   case ipv6Address {
+ *     leaf ipv6Address {
+ *       type inet:ipv6-address;
+ *     }
+ *   }
+ *   case ipv6Prefix {
+ *     leaf ipv6Prefix {
+ *       type inet:ipv6-prefix;
+ *     }
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/ipEndPoint/address</i>
+ *
+ */
+public interface Address
+    extends
+    ChoiceIn<IpEndPoint>
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("address");
+
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java
new file mode 100644
index 000000000..b387e3fc8
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv4Address {
+ *   leaf ipv4Address {
+ *     type inet:ipv4-address;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv4Address</i>
+ *
+ */
+public interface Ipv4Address
+    extends
+    DataObject,
+    Augmentable<Ipv4Address>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv4Address");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>ipv4Address</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv4Address getIpv4Address();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java
new file mode 100644
index 000000000..530eafef0
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv4AddressBuilder} instances.
+ *
+ * @see Ipv4AddressBuilder
+ *
+ */
+public class Ipv4AddressBuilder implements Builder<Ipv4Address> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
+
+
+    Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
+
+    public Ipv4AddressBuilder() {
+    }
+
+    public Ipv4AddressBuilder(Ipv4Address base) {
+        this._ipv4Address = base.getIpv4Address();
+        if (base instanceof Ipv4AddressImpl) {
+            Ipv4AddressImpl impl = (Ipv4AddressImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> aug =((AugmentationHolder<Ipv4Address>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
+        return _ipv4Address;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv4AddressBuilder setIpv4Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address value) {
+        this._ipv4Address = value;
+        return this;
+    }
+    
+    public Ipv4AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType, Augmentation<Ipv4Address> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv4AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv4Address build() {
+        return new Ipv4AddressImpl(this);
+    }
+
+    private static final class Ipv4AddressImpl implements Ipv4Address {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
+    
+        private Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
+    
+        Ipv4AddressImpl(Ipv4AddressBuilder base) {
+            this._ipv4Address = base.getIpv4Address();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv4Address> getImplementedInterface() {
+            return Ipv4Address.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
+            return _ipv4Address;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv4Address);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv4Address.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv4Address other = (Ipv4Address)obj;
+            if (!Objects.equals(_ipv4Address, other.getIpv4Address())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv4AddressImpl otherImpl = (Ipv4AddressImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv4Address");
+            CodeHelpers.appendValue(helper, "_ipv4Address", _ipv4Address);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java
new file mode 100644
index 000000000..f6a3a4a3d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv6Address {
+ *   leaf ipv6Address {
+ *     type inet:ipv6-address;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv6Address</i>
+ *
+ */
+public interface Ipv6Address
+    extends
+    DataObject,
+    Augmentable<Ipv6Address>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Address");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address</code> <code>ipv6Address</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Address getIpv6Address();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java
new file mode 100644
index 000000000..525e2b3a6
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv6AddressBuilder} instances.
+ *
+ * @see Ipv6AddressBuilder
+ *
+ */
+public class Ipv6AddressBuilder implements Builder<Ipv6Address> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
+
+
+    Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
+
+    public Ipv6AddressBuilder() {
+    }
+
+    public Ipv6AddressBuilder(Ipv6Address base) {
+        this._ipv6Address = base.getIpv6Address();
+        if (base instanceof Ipv6AddressImpl) {
+            Ipv6AddressImpl impl = (Ipv6AddressImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> aug =((AugmentationHolder<Ipv6Address>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
+        return _ipv6Address;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv6AddressBuilder setIpv6Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address value) {
+        this._ipv6Address = value;
+        return this;
+    }
+    
+    public Ipv6AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType, Augmentation<Ipv6Address> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv6AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv6Address build() {
+        return new Ipv6AddressImpl(this);
+    }
+
+    private static final class Ipv6AddressImpl implements Ipv6Address {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
+    
+        private Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
+    
+        Ipv6AddressImpl(Ipv6AddressBuilder base) {
+            this._ipv6Address = base.getIpv6Address();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv6Address> getImplementedInterface() {
+            return Ipv6Address.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
+            return _ipv6Address;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv6Address);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv6Address.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv6Address other = (Ipv6Address)obj;
+            if (!Objects.equals(_ipv6Address, other.getIpv6Address())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv6AddressImpl otherImpl = (Ipv6AddressImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Address");
+            CodeHelpers.appendValue(helper, "_ipv6Address", _ipv6Address);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java
new file mode 100644
index 000000000..95022a340
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java
@@ -0,0 +1,40 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * case ipv6Prefix {
+ *   leaf ipv6Prefix {
+ *     type inet:ipv6-prefix;
+ *   }
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv6Prefix</i>
+ *
+ */
+public interface Ipv6Prefix
+    extends
+    DataObject,
+    Augmentable<Ipv6Prefix>,
+    Address
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Prefix");
+
+    /**
+     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>ipv6Prefix</code>, or <code>null</code> if not present
+     */
+    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Prefix getIpv6Prefix();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java
new file mode 100644
index 000000000..8bb742cf3
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java
@@ -0,0 +1,182 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link Ipv6PrefixBuilder} instances.
+ *
+ * @see Ipv6PrefixBuilder
+ *
+ */
+public class Ipv6PrefixBuilder implements Builder<Ipv6Prefix> {
+
+    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
+
+
+    Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
+
+    public Ipv6PrefixBuilder() {
+    }
+
+    public Ipv6PrefixBuilder(Ipv6Prefix base) {
+        this._ipv6Prefix = base.getIpv6Prefix();
+        if (base instanceof Ipv6PrefixImpl) {
+            Ipv6PrefixImpl impl = (Ipv6PrefixImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> aug =((AugmentationHolder<Ipv6Prefix>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+
+    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
+        return _ipv6Prefix;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public Ipv6PrefixBuilder setIpv6Prefix(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix value) {
+        this._ipv6Prefix = value;
+        return this;
+    }
+    
+    public Ipv6PrefixBuilder addAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType, Augmentation<Ipv6Prefix> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public Ipv6PrefixBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public Ipv6Prefix build() {
+        return new Ipv6PrefixImpl(this);
+    }
+
+    private static final class Ipv6PrefixImpl implements Ipv6Prefix {
+    
+        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
+    
+        private Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
+    
+        Ipv6PrefixImpl(Ipv6PrefixBuilder base) {
+            this._ipv6Prefix = base.getIpv6Prefix();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<Ipv6Prefix> getImplementedInterface() {
+            return Ipv6Prefix.class;
+        }
+    
+        @Override
+        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
+            return _ipv6Prefix;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_ipv6Prefix);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!Ipv6Prefix.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            Ipv6Prefix other = (Ipv6Prefix)obj;
+            if (!Objects.equals(_ipv6Prefix, other.getIpv6Prefix())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                Ipv6PrefixImpl otherImpl = (Ipv6PrefixImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Prefix");
+            CodeHelpers.appendValue(helper, "_ipv6Prefix", _ipv6Prefix);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java
new file mode 100644
index 000000000..025706355
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java
@@ -0,0 +1,44 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
+import java.lang.Override;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.SnssaiUpfInfoItem;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.binding.Identifiable;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * list dnnUpfInfo {
+ *   key dnn;
+ *   uses DnnUpfInfoItem;
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/SnssaiUpfInfoItem/dnnUpfInfo</i>
+ *
+ * <p>To create instances of this class use {@link DnnUpfInfoBuilder}.
+ * @see DnnUpfInfoBuilder
+ * @see DnnUpfInfoKey
+ *
+ */
+public interface DnnUpfInfo
+    extends
+    ChildOf<SnssaiUpfInfoItem>,
+    Augmentable<DnnUpfInfo>,
+    DnnUpfInfoItem,
+    Identifiable<DnnUpfInfoKey>
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("dnnUpfInfo");
+
+    @Override
+    DnnUpfInfoKey key();
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java
new file mode 100644
index 000000000..248c8304e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java
@@ -0,0 +1,224 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link DnnUpfInfoBuilder} instances.
+ *
+ * @see DnnUpfInfoBuilder
+ *
+ */
+public class DnnUpfInfoBuilder implements Builder<DnnUpfInfo> {
+
+    private TDnn _dnn;
+    private DnnUpfInfoKey key;
+
+
+    Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> augmentation = Collections.emptyMap();
+
+    public DnnUpfInfoBuilder() {
+    }
+    public DnnUpfInfoBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem arg) {
+        this._dnn = arg.getDnn();
+    }
+
+    public DnnUpfInfoBuilder(DnnUpfInfo base) {
+        this.key = base.key();
+        this._dnn = base.getDnn();
+        if (base instanceof DnnUpfInfoImpl) {
+            DnnUpfInfoImpl impl = (DnnUpfInfoImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> aug =((AugmentationHolder<DnnUpfInfo>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+    /**
+     * Set fields from given grouping argument. Valid argument is instance of one of following types:
+     * <ul>
+     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem</li>
+     * </ul>
+     *
+     * @param arg grouping object
+     * @throws IllegalArgumentException if given argument is none of valid types
+    */
+    public void fieldsFrom(DataObject arg) {
+        boolean isValidArg = false;
+        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem) {
+            this._dnn = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem)arg).getDnn();
+            isValidArg = true;
+        }
+        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem]");
+    }
+
+    public DnnUpfInfoKey key() {
+        return key;
+    }
+    
+    public TDnn getDnn() {
+        return _dnn;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<DnnUpfInfo>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    public DnnUpfInfoBuilder withKey(final DnnUpfInfoKey key) {
+        this.key = key;
+        return this;
+    }
+    
+    public DnnUpfInfoBuilder setDnn(final TDnn value) {
+        this._dnn = value;
+        return this;
+    }
+    
+    public DnnUpfInfoBuilder addAugmentation(Class<? extends Augmentation<DnnUpfInfo>> augmentationType, Augmentation<DnnUpfInfo> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public DnnUpfInfoBuilder removeAugmentation(Class<? extends Augmentation<DnnUpfInfo>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public DnnUpfInfo build() {
+        return new DnnUpfInfoImpl(this);
+    }
+
+    private static final class DnnUpfInfoImpl implements DnnUpfInfo {
+    
+        private final TDnn _dnn;
+        private final DnnUpfInfoKey key;
+    
+        private Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> augmentation = Collections.emptyMap();
+    
+        DnnUpfInfoImpl(DnnUpfInfoBuilder base) {
+            if (base.key() != null) {
+                this.key = base.key();
+            } else {
+                this.key = new DnnUpfInfoKey(base.getDnn());
+            }
+            this._dnn = key.getDnn();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<DnnUpfInfo> getImplementedInterface() {
+            return DnnUpfInfo.class;
+        }
+    
+        @Override
+        public DnnUpfInfoKey key() {
+            return key;
+        }
+        
+        @Override
+        public TDnn getDnn() {
+            return _dnn;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<DnnUpfInfo>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_dnn);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!DnnUpfInfo.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            DnnUpfInfo other = (DnnUpfInfo)obj;
+            if (!Objects.equals(_dnn, other.getDnn())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                DnnUpfInfoImpl otherImpl = (DnnUpfInfoImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("DnnUpfInfo");
+            CodeHelpers.appendValue(helper, "_dnn", _dnn);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java
new file mode 100644
index 000000000..faa589d7d
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java
@@ -0,0 +1,67 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
+import com.google.common.base.MoreObjects;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.Identifier;
+
+public class DnnUpfInfoKey
+ implements Identifier<DnnUpfInfo> {
+    private static final long serialVersionUID = -3246452801435528856L;
+    private final TDnn _dnn;
+
+
+    public DnnUpfInfoKey(TDnn _dnn) {
+    
+    
+        this._dnn = _dnn;
+    }
+    
+    /**
+     * Creates a copy from Source Object.
+     *
+     * @param source Source object
+     */
+    public DnnUpfInfoKey(DnnUpfInfoKey source) {
+        this._dnn = source._dnn;
+    }
+
+
+    public TDnn getDnn() {
+        return _dnn;
+    }
+
+
+    @Override
+    public int hashCode() {
+        return CodeHelpers.wrapperHashCode(_dnn);
+    }
+
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        DnnUpfInfoKey other = (DnnUpfInfoKey) obj;
+        if (!Objects.equals(_dnn, other._dnn)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(DnnUpfInfoKey.class);
+        CodeHelpers.appendValue(helper, "_dnn", _dnn);
+        return helper.toString();
+    }
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java
new file mode 100644
index 000000000..44c34f278
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java
@@ -0,0 +1,37 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Tai;
+import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.common.QName;
+
+/**
+ *
+ * <p>
+ * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
+ * <pre>
+ * container plmnId {
+ *   uses pLMNId;
+ * }
+ * </pre>The schema path to identify an instance is
+ * <i>_3gpp-common-yang-types/Tai/plmnId</i>
+ *
+ * <p>To create instances of this class use {@link PlmnIdBuilder}.
+ * @see PlmnIdBuilder
+ *
+ */
+public interface PlmnId
+    extends
+    ChildOf<Tai>,
+    Augmentable<PlmnId>,
+    PLMNId
+{
+
+
+
+    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("plmnId");
+
+
+}
+
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java
new file mode 100644
index 000000000..530d59d26
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java
@@ -0,0 +1,229 @@
+package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import java.lang.Class;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.SuppressWarnings;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc;
+import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+/**
+ * Class that builds {@link PlmnIdBuilder} instances.
+ *
+ * @see PlmnIdBuilder
+ *
+ */
+public class PlmnIdBuilder implements Builder<PlmnId> {
+
+    private TMcc _mCC;
+    private TMnc _mNC;
+
+
+    Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
+
+    public PlmnIdBuilder() {
+    }
+    public PlmnIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId arg) {
+        this._mCC = arg.getMCC();
+        this._mNC = arg.getMNC();
+    }
+
+    public PlmnIdBuilder(PlmnId base) {
+        this._mCC = base.getMCC();
+        this._mNC = base.getMNC();
+        if (base instanceof PlmnIdImpl) {
+            PlmnIdImpl impl = (PlmnIdImpl) base;
+            if (!impl.augmentation.isEmpty()) {
+                this.augmentation = new HashMap<>(impl.augmentation);
+            }
+        } else if (base instanceof AugmentationHolder) {
+            @SuppressWarnings("unchecked")
+            Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> aug =((AugmentationHolder<PlmnId>) base).augmentations();
+            if (!aug.isEmpty()) {
+                this.augmentation = new HashMap<>(aug);
+            }
+        }
+    }
+
+    /**
+     * Set fields from given grouping argument. Valid argument is instance of one of following types:
+     * <ul>
+     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId</li>
+     * </ul>
+     *
+     * @param arg grouping object
+     * @throws IllegalArgumentException if given argument is none of valid types
+    */
+    public void fieldsFrom(DataObject arg) {
+        boolean isValidArg = false;
+        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId) {
+            this._mCC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMCC();
+            this._mNC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMNC();
+            isValidArg = true;
+        }
+        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId]");
+    }
+
+    public TMcc getMCC() {
+        return _mCC;
+    }
+    
+    public TMnc getMNC() {
+        return _mNC;
+    }
+    
+    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+    public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
+        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+    }
+
+    
+    public PlmnIdBuilder setMCC(final TMcc value) {
+        this._mCC = value;
+        return this;
+    }
+    
+    public PlmnIdBuilder setMNC(final TMnc value) {
+        this._mNC = value;
+        return this;
+    }
+    
+    public PlmnIdBuilder addAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType, Augmentation<PlmnId> augmentationValue) {
+        if (augmentationValue == null) {
+            return removeAugmentation(augmentationType);
+        }
+    
+        if (!(this.augmentation instanceof HashMap)) {
+            this.augmentation = new HashMap<>();
+        }
+    
+        this.augmentation.put(augmentationType, augmentationValue);
+        return this;
+    }
+    
+    public PlmnIdBuilder removeAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType) {
+        if (this.augmentation instanceof HashMap) {
+            this.augmentation.remove(augmentationType);
+        }
+        return this;
+    }
+
+    @Override
+    public PlmnId build() {
+        return new PlmnIdImpl(this);
+    }
+
+    private static final class PlmnIdImpl implements PlmnId {
+    
+        private final TMcc _mCC;
+        private final TMnc _mNC;
+    
+        private Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
+    
+        PlmnIdImpl(PlmnIdBuilder base) {
+            this._mCC = base.getMCC();
+            this._mNC = base.getMNC();
+            this.augmentation = ImmutableMap.copyOf(base.augmentation);
+        }
+    
+        @Override
+        public Class<PlmnId> getImplementedInterface() {
+            return PlmnId.class;
+        }
+    
+        @Override
+        public TMcc getMCC() {
+            return _mCC;
+        }
+        
+        @Override
+        public TMnc getMNC() {
+            return _mNC;
+        }
+        
+        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
+        @Override
+        public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
+            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
+        }
+    
+        private int hash = 0;
+        private volatile boolean hashValid = false;
+        
+        @Override
+        public int hashCode() {
+            if (hashValid) {
+                return hash;
+            }
+        
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(_mCC);
+            result = prime * result + Objects.hashCode(_mNC);
+            result = prime * result + Objects.hashCode(augmentation);
+        
+            hash = result;
+            hashValid = true;
+            return result;
+        }
+    
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof DataObject)) {
+                return false;
+            }
+            if (!PlmnId.class.equals(((DataObject)obj).getImplementedInterface())) {
+                return false;
+            }
+            PlmnId other = (PlmnId)obj;
+            if (!Objects.equals(_mCC, other.getMCC())) {
+                return false;
+            }
+            if (!Objects.equals(_mNC, other.getMNC())) {
+                return false;
+            }
+            if (getClass() == obj.getClass()) {
+                // Simple case: we are comparing against self
+                PlmnIdImpl otherImpl = (PlmnIdImpl) obj;
+                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
+                    return false;
+                }
+            } else {
+                // Hard case: compare our augments with presence there...
+                for (Map.Entry<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> e : augmentation.entrySet()) {
+                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
+                        return false;
+                    }
+                }
+                // .. and give the other one the chance to do the same
+                if (!obj.equals(this)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    
+        @Override
+        public String toString() {
+            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("PlmnId");
+            CodeHelpers.appendValue(helper, "_mCC", _mCC);
+            CodeHelpers.appendValue(helper, "_mNC", _mNC);
+            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
+            return helper.toString();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..944ca35af
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : ccsdk feature sdnr wt devicemanager
+ ================================================================================
+Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
+
+  <reference id="netconfNetworkElementService"
+             availability="mandatory" activation="eager"
+             interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService"  />
+
+  <bean id="provider"
+        class="org.onap.ccsdk.features.sdnr.wt.devicemanager.gran.impl.DeviceManagerGRanImpl"
+        init-method="init" destroy-method="close">
+    <property name="netconfNetworkElementService" ref="netconfNetworkElementService" />
+  </bean>
+</blueprint>
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties
new file mode 100644
index 000000000..80373399e
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties
@@ -0,0 +1,3 @@
+# Proberties filled in by maven during build process
+version = ${project.version}
+build = ${buildtime}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..bdc3c1009
--- /dev/null
+++ b/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,40 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+# org.slf4j.simpleLogger.log.xxx.yyy=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
+
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+#org.slf4j.simpleLogger.showDateTime=false
+
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+#org.slf4j.simpleLogger.showThreadName=true
+
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+#org.slf4j.simpleLogger.showLogName=true
+
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/sdnr/wt/devicemanager-onf/feature/pom.xml b/sdnr/wt/devicemanager-onf/feature/pom.xml
new file mode 100644
index 000000000..6ea6c0e93
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/feature/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.feature
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-onf-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencies>
+        <!--     <dependency> -->
+        <!--       <groupId>${project.groupId}</groupId> -->
+        <!--       <artifactId>sdnr-wt-devicemanager-onf-model</artifactId> -->
+        <!--       <version>${project.version}</version> -->
+        <!--     </dependency> -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-onf-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sdnr/wt/devicemanager-onf/installer/pom.xml b/sdnr/wt/devicemanager-onf/installer/pom.xml
new file mode 100755
index 000000000..a4155a9ab
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/installer/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.installer
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-onf-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-devicemanager-onf</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644
index 000000000..c4eb9aa25
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -0,0 +1,49 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : CCSDK
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>repo</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sdnr/wt/devicemanager-onf/model/pom.xml b/sdnr/wt/devicemanager-onf/model/pom.xml
new file mode 100644
index 000000000..15daa9ddb
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/model/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-onf-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-onf/model/src/main/yang/devicemanager-onf.yang b/sdnr/wt/devicemanager-onf/model/src/main/yang/devicemanager-onf.yang
new file mode 100644
index 000000000..11a3e83ef
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/model/src/main/yang/devicemanager-onf.yang
@@ -0,0 +1,15 @@
+module devicemanager-onf {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-onf";
+    prefix "devicemanager-onf";
+
+    description
+        "DeviceManager Open Network Foundation Api Module";
+
+    revision "2019-12-09" {
+        description
+            "Initial revision";
+    }
+
+ }
+
diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemanager-onf/pom.xml
index e30c7e702..26bcfc407 100755
--- a/sdnr/wt/devicemodel/pom.xml
+++ b/sdnr/wt/devicemanager-onf/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
  * ============LICENSE_START=======================================================
- * ONAP : CCSDK.sdnr.wt.devicemodel
+ * ONAP : CCSDK.sdnr.wt.devicemanager
  * ================================================================================
  * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
  * All rights reserved.
@@ -22,29 +22,30 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-    	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-devicemodel-top</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-onf-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<properties>
-		<feature-name>sdnr-wt-devicemodel</feature-name>
-	</properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-	<modules>
-		<module>model</module>
-		<module>feature</module>
-		<module>installer</module>
-	</modules>
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
 
+    <properties>
+        <feature-name>sdnr-wt-devicemanager-onf</feature-name>
+    </properties>
 </project>
diff --git a/sdnr/wt/devicemanager-onf/provider/copyright b/sdnr/wt/devicemanager-onf/provider/copyright
new file mode 100644
index 000000000..754b6218f
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/copyright
@@ -0,0 +1,17 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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/sdnr/wt/devicemanager-onf/provider/pom.xml b/sdnr/wt/devicemanager-onf/provider/pom.xml
new file mode 100644
index 000000000..92d2516b0
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/pom.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    ONAP : CCSDK / SDNR / WT / devicemanager
+    ================================================================================
+    Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-onf-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <databaseport>49400</databaseport>
+    </properties>
+
+    <dependencies>
+        <!-- begin for testing -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- end for testing -->
+        <!--     <dependency> -->
+        <!--       <groupId>${project.groupId}</groupId> -->
+        <!--       <artifactId>sdnr-wt-devicemanager-onf-model</artifactId> -->
+        <!--       <version>${project.version}</version> -->
+        <!--       <scope>provided</scope> -->
+        <!--     </dependency> -->
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-devicemanager-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--     <dependency> -->
+        <!--       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> -->
+        <!--       <artifactId>rfc6991-ietf-yang-types</artifactId> -->
+        <!--       <scope>provided</scope> -->
+        <!--      </dependency> -->
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/DeviceManagerOnfImpl.java b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/DeviceManagerOnfImpl.java
new file mode 100644
index 000000000..8783a6ad4
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/DeviceManagerOnfImpl.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.impl;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.FactoryRegistration;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeviceManagerOnfImpl implements AutoCloseable  {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerOnfImpl.class);
+    private static final String APPLICATION_NAME = "DeviceManagerOnf";
+    private static final String CONFIGURATIONFILE = "etc/devicemanager-onf.properties";
+
+
+    private NetconfNetworkElementService netconfNetworkElementService;
+
+    private HtDatabaseClient htDatabaseClient;
+    private Boolean devicemanagerInitializationOk = false;
+    private @NonNull FactoryRegistration<OnfNetworkElementFactory> resORan;
+
+    // Blueprint begin
+    public DeviceManagerOnfImpl() {
+        LOG.info("Creating provider for {}", APPLICATION_NAME);
+        resORan = null;
+    }
+
+    public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
+        this.netconfNetworkElementService = netconfNetworkElementService;
+    }
+
+    public void init() throws Exception {
+
+        LOG.info("Session Initiated start {}", APPLICATION_NAME);
+
+        resORan = netconfNetworkElementService.registerNetworkElementFactory(new OnfNetworkElementFactory());
+
+
+        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
+        this.devicemanagerInitializationOk = true;
+
+        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
+    }
+    // Blueprint end
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("closing ...");
+        close(htDatabaseClient);
+        close(resORan);
+        LOG.info("closing done");
+    }
+
+    /**
+     * Used to close all Services, that should support AutoCloseable Pattern
+     *
+     * @param toClose
+     * @throws Exception
+     */
+    private void close(AutoCloseable... toCloseList) {
+        for (AutoCloseable element : toCloseList) {
+            if (element != null) {
+                try {
+                    element.close();
+                } catch (Exception e) {
+                    LOG.warn("Fail during close: ", e);
+                }
+            }
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElement.java b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElement.java
new file mode 100644
index 000000000..03e1706b9
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElement.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.impl;
+
+import java.util.List;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.IetfNetconfNotificationsListener;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfirmedCommit;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionEnd;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ */
+public class OnfNetworkElement implements NetworkElement {
+
+    private static final Logger log = LoggerFactory.getLogger(OnfNetworkElement.class);
+
+    private final INetconfAcessor netconfAccessor;
+
+    private final DataProvider databaseService;
+
+    private @NonNull final OnfListener ranListener;
+
+    private ListenerRegistration<NotificationListener> ranListenerRegistrationResult;
+
+    OnfNetworkElement(INetconfAcessor netconfAccess, DataProvider databaseService) {
+        log.info("Create {}",OnfNetworkElement.class.getSimpleName());
+        this.netconfAccessor = netconfAccess;
+        this.databaseService = databaseService;
+
+        this.ranListenerRegistrationResult = null;
+        this.ranListener = new OnfListener();
+
+    }
+
+    public void initialReadFromNetworkElement() {
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.ORAN;
+    }
+
+    private void doRegisterNotificationListener(MountPoint mountPoint) {
+        log.info("Begin register listener for Mountpoint {}", mountPoint.getIdentifier().toString());
+        final Optional<NotificationService> optionalNotificationService = mountPoint
+                .getService(NotificationService.class);
+        final NotificationService notificationService = optionalNotificationService.get();
+        // notificationService.registerNotificationListener(microwaveEventListener);
+        ranListenerRegistrationResult = notificationService.registerNotificationListener(ranListener);
+        log.info("End registration listener for Mountpoint {} Listener: {} Result: {}",
+                mountPoint.getIdentifier().toString(), optionalNotificationService, ranListenerRegistrationResult);
+    }
+
+    private class OnfListener implements IetfNetconfNotificationsListener {
+
+        @Override
+        public void onNetconfConfirmedCommit(NetconfConfirmedCommit notification) {
+            log.info("onNetconfConfirmedCommit ", notification);
+        }
+
+        @Override
+        public void onNetconfSessionStart(NetconfSessionStart notification) {
+            log.info("onNetconfSessionStart ", notification);
+        }
+
+        @Override
+        public void onNetconfSessionEnd(NetconfSessionEnd notification) {
+            log.info("onNetconfSessionEnd ", notification);
+        }
+
+        @Override
+        public void onNetconfCapabilityChange(NetconfCapabilityChange notification) {
+            log.info("onNetconfCapabilityChange ", notification);
+        }
+
+        @Override
+        public void onNetconfConfigChange(NetconfConfigChange notification) {
+            log.info("onNetconfConfigChange (1) {}", notification);
+            StringBuffer sb = new StringBuffer();
+            List<Edit> editList = notification.nonnullEdit();
+            for (Edit edit : editList) {
+                if (sb.length() > 0) {
+                    sb.append(", ");
+                }
+                sb.append(edit);
+
+                EventlogBuilder eventlogBuilder = new EventlogBuilder();
+
+                InstanceIdentifier<?> target = edit.getTarget();
+                if (target != null) {
+                    eventlogBuilder.setObjectId(target.toString());
+                    log.info("TARGET: {} {} {}", target.getClass(), target.getTargetType());
+                    for (PathArgument pa : target.getPathArguments()) {
+                        log.info("PathArgument {}", pa);
+                    }
+                }
+                eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue());
+                eventlogBuilder.setNewValue(String.valueOf(edit.getOperation()));
+                databaseService.writeEventLog(eventlogBuilder.build());
+            }
+            log.info("onNetconfConfigChange (2) {}", sb);
+        }
+    }
+
+    @Override
+    public void register() {
+    }
+
+    @Override
+    public void deregister() {
+    }
+
+
+    @Override
+    public NodeId getNodeId() {
+        return netconfAccessor.getNodeId();
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void warmstart() {
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElementFactory.java b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElementFactory.java
new file mode 100644
index 000000000..cd590c858
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/impl/OnfNetworkElementFactory.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.impl;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OnfNetworkElementFactory implements NetworkElementFactory {
+
+    private static final Logger log = LoggerFactory.getLogger(OnfNetworkElementFactory.class);
+
+    @Override
+    public Optional<NetworkElement> create(INetconfAcessor acessor, DeviceManagerServiceProvider serviceProvider) {
+        if (acessor.getCapabilites().isSupportingNamespace(org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement.QNAME)) {
+            log.info("Create device {} ",OnfNetworkElement.class.getName());
+            return Optional.of(new OnfNetworkElement(acessor, serviceProvider.getDataProvider()));
+        } else {
+            return Optional.empty();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..48332452f
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : ccsdk feature sdnr wt devicemanager
+ ================================================================================
+Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
+
+  <reference id="netconfNetworkElementService"
+             availability="mandatory" activation="eager"
+             interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService"  />
+
+  <bean id="provider"
+        class="org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.impl.DeviceManagerOnfImpl"
+        init-method="init" destroy-method="close">
+    <property name="netconfNetworkElementService" ref="netconfNetworkElementService" />
+  </bean>
+</blueprint>
diff --git a/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties
new file mode 100644
index 000000000..80373399e
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/resources/version.properties
@@ -0,0 +1,3 @@
+# Proberties filled in by maven during build process
+version = ${project.version}
+build = ${buildtime}
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/bbf-tr-196-2-0-3-full@2018-04-08.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/bbf-tr-196-2-0-3-full@2018-04-08.yang
index d10c58bd5..d10c58bd5 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/bbf-tr-196-2-0-3-full@2018-04-08.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/bbf-tr-196-2-0-3-full@2018-04-08.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/core-model@2017-03-20.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/core-model@2017-03-20.yang
index 134062817..134062817 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/core-model@2017-03-20.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/core-model@2017-03-20.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/g.874.1-model@2017-03-20.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/g.874.1-model@2017-03-20.yang
index 4a14783a2..4a14783a2 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/g.874.1-model@2017-03-20.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/g.874.1-model@2017-03-20.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/ietf-ptp-dataset@2017-02-08.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/ietf-ptp-dataset@2017-02-08.yang
index d899e5692..d899e5692 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/ietf-ptp-dataset@2017-02-08.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/ietf-ptp-dataset@2017-02-08.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2017-03-24.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2017-03-24.yang
index e6b6bb382..e6b6bb382 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2017-03-24.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2017-03-24.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2018-09-07.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2018-09-07.yang
index db94e09c5..db94e09c5 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2018-09-07.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2018-09-07.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2018-10-10.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2018-10-10.yang
index d13122d28..d13122d28 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/microwave-model@2018-10-10.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/microwave-model@2018-10-10.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/onf-core-model-conditional-packages@2017-04-02.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-core-model-conditional-packages@2017-04-02.yang
index 44c99b10e..44c99b10e 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/onf-core-model-conditional-packages@2017-04-02.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-core-model-conditional-packages@2017-04-02.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/onf-ethernet-conditional-packages@2017-04-02.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-ethernet-conditional-packages@2017-04-02.yang
index 4d6fb7c25..4d6fb7c25 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/onf-ethernet-conditional-packages@2017-04-02.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-ethernet-conditional-packages@2017-04-02.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/onf-otn-odu-conditional-packages@2017-10-20.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-otn-odu-conditional-packages@2017-10-20.yang
index 89d6cbfcf..89d6cbfcf 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/onf-otn-odu-conditional-packages@2017-10-20.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-otn-odu-conditional-packages@2017-10-20.yang
diff --git a/sdnr/wt/devicemodel/model/src/main/yang/onf-ptp-dataset@2017-05-08.yang b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-ptp-dataset@2017-05-08.yang
index 41a1c3935..41a1c3935 100644
--- a/sdnr/wt/devicemodel/model/src/main/yang/onf-ptp-dataset@2017-05-08.yang
+++ b/sdnr/wt/devicemanager-onf/provider/src/main/yang/onf-ptp-dataset@2017-05-08.yang
diff --git a/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..bdc3c1009
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,40 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+# org.slf4j.simpleLogger.log.xxx.yyy=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
+
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+#org.slf4j.simpleLogger.showDateTime=false
+
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+#org.slf4j.simpleLogger.showThreadName=true
+
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+#org.slf4j.simpleLogger.showLogName=true
+
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/sdnr/wt/devicemanager-oran/feature/pom.xml b/sdnr/wt/devicemanager-oran/feature/pom.xml
new file mode 100644
index 000000000..c2f87a0df
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/feature/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.feature
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-oran-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sdnr/wt/devicemanager-oran/installer/pom.xml b/sdnr/wt/devicemanager-oran/installer/pom.xml
new file mode 100755
index 000000000..fbe3b231d
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/installer/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.installer
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-oran-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-devicemanager-oran</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644
index 000000000..c4eb9aa25
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -0,0 +1,49 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : CCSDK
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>repo</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sdnr/wt/devicemanager-oran/model/pom.xml b/sdnr/wt/devicemanager-oran/model/pom.xml
new file mode 100644
index 000000000..d3fbab87e
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/model/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-oran-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-oran/model/src/main/yang/devicemanager-oran.yang b/sdnr/wt/devicemanager-oran/model/src/main/yang/devicemanager-oran.yang
new file mode 100644
index 000000000..231321459
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/model/src/main/yang/devicemanager-oran.yang
@@ -0,0 +1,15 @@
+module devicemanager-oran {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-oran";
+    prefix "devicemanager-oran";
+
+    description
+        "DeviceManager Open RAN Api Module";
+
+    revision "2019-11-15" {
+        description
+            "Initial revision";
+    }
+
+ }
+
diff --git a/sdnr/wt/devicemanager-oran/pom.xml b/sdnr/wt/devicemanager-oran/pom.xml
new file mode 100755
index 000000000..85c192864
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.devicemanager
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-oran-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>sdnr-wt-devicemanager-oran</feature-name>
+    </properties>
+</project>
diff --git a/sdnr/wt/devicemanager-oran/provider/copyright b/sdnr/wt/devicemanager-oran/provider/copyright
new file mode 100644
index 000000000..754b6218f
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/copyright
@@ -0,0 +1,17 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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/sdnr/wt/devicemanager-oran/provider/pom.xml b/sdnr/wt/devicemanager-oran/provider/pom.xml
new file mode 100644
index 000000000..e03295cc8
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/pom.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    ONAP : CCSDK / SDNR / WT / devicemanager
+    ================================================================================
+    Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-oran-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <databaseport>49400</databaseport>
+    </properties>
+
+    <dependencies>
+        <!-- begin for testing -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- end for testing -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-oran-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-devicemanager-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/DeviceManagerORanImpl.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/DeviceManagerORanImpl.java
new file mode 100644
index 000000000..991128d10
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/DeviceManagerORanImpl.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.FactoryRegistration;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeviceManagerORanImpl implements AutoCloseable  {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerORanImpl.class);
+    private static final String APPLICATION_NAME = "DeviceManagerORan";
+    @SuppressWarnings("unused")
+    private static final String CONFIGURATIONFILE = "etc/devicemanager-oran.properties";
+
+
+    private NetconfNetworkElementService netconfNetworkElementService;
+
+    private HtDatabaseClient htDatabaseClient;
+    private Boolean devicemanagerInitializationOk = false;
+    private FactoryRegistration<ORanNetworkElementFactory> resORan;
+
+    // Blueprint begin
+    public DeviceManagerORanImpl() {
+        LOG.info("Creating provider for {}", APPLICATION_NAME);
+        resORan = null;
+    }
+
+    public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
+        this.netconfNetworkElementService = netconfNetworkElementService;
+    }
+
+    public void init() throws Exception {
+
+        LOG.info("Session Initiated start {}", APPLICATION_NAME);
+
+        resORan = netconfNetworkElementService.registerNetworkElementFactory(new ORanNetworkElementFactory());
+
+
+        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
+        this.devicemanagerInitializationOk = true;
+
+        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
+    }
+    // Blueprint end
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("closing ...");
+        close(htDatabaseClient);
+        close(resORan);
+        LOG.info("closing done");
+    }
+
+    /**
+     * Used to close all Services, that should support AutoCloseable Pattern
+     *
+     * @param toClose
+     * @throws Exception
+     */
+    private void close(AutoCloseable... toCloseList) {
+        for (AutoCloseable element : toCloseList) {
+            if (element != null) {
+                try {
+                    element.close();
+                } catch (Exception e) {
+                    LOG.warn("Fail during close: ", e);
+                }
+            }
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/NtsNetworkElement.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/NtsNetworkElement.java
new file mode 100644
index 000000000..c37c45506
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/NtsNetworkElement.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+/**
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author herbert
+ *
+ */
+public class NtsNetworkElement implements NetworkElement {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NtsNetworkElement.class);
+
+    private final INetconfAcessor netconfAccessor;
+
+    @SuppressWarnings("unused")
+    private final DataProvider databaseService;
+
+    NtsNetworkElement(INetconfAcessor netconfAccess, DataProvider databaseService) {
+        LOG.info("Create {}",NtsNetworkElement.class.getSimpleName());
+        this.netconfAccessor = netconfAccess;
+        this.databaseService = databaseService;
+    }
+
+    @Override
+    public void deregister() {
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return netconfAccessor.getNodeId();
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void warmstart() {
+    }
+
+    @Override
+    public void register() {
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.NtsManager;
+    }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanChangeNotificationListener.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanChangeNotificationListener.java
new file mode 100644
index 000000000..118c2d62e
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanChangeNotificationListener.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import java.util.List;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.IetfNetconfNotificationsListener;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfirmedCommit;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionEnd;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Listener for change notifications
+ */
+public class ORanChangeNotificationListener  implements IetfNetconfNotificationsListener {
+
+    private static final Logger log = LoggerFactory.getLogger(ORanChangeNotificationListener.class);
+
+    private final INetconfAcessor netconfAccessor;
+    private final DataProvider databaseService;
+
+    ORanChangeNotificationListener(INetconfAcessor netconfAccessor, DataProvider databaseService) {
+        this.netconfAccessor = netconfAccessor;
+        this.databaseService = databaseService;
+    }
+
+    @Override
+    public void onNetconfConfirmedCommit(NetconfConfirmedCommit notification) {
+        log.info("onNetconfConfirmedCommit ", notification);
+    }
+
+    @Override
+    public void onNetconfSessionStart(NetconfSessionStart notification) {
+        log.info("onNetconfSessionStart ", notification);
+    }
+
+    @Override
+    public void onNetconfSessionEnd(NetconfSessionEnd notification) {
+        log.info("onNetconfSessionEnd ", notification);
+    }
+
+    @Override
+    public void onNetconfCapabilityChange(NetconfCapabilityChange notification) {
+        log.info("onNetconfCapabilityChange ", notification);
+    }
+
+    @Override
+    public void onNetconfConfigChange(NetconfConfigChange notification) {
+        log.info("onNetconfConfigChange (1) {}", notification);
+        StringBuffer sb = new StringBuffer();
+        List<Edit> editList = notification.nonnullEdit();
+        for (Edit edit : editList) {
+            if (sb.length() > 0) {
+                sb.append(", ");
+            }
+            sb.append(edit);
+
+            EventlogBuilder eventlogBuilder = new EventlogBuilder();
+
+            InstanceIdentifier<?> target = edit.getTarget();
+            if (target != null) {
+                eventlogBuilder.setObjectId(target.toString());
+                log.info("TARGET: {} {} {}", target.getClass(), target.getTargetType());
+                for (PathArgument pa : target.getPathArguments()) {
+                    log.info("PathArgument {}", pa);
+                }
+            }
+            eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue());
+            eventlogBuilder.setNewValue(String.valueOf(edit.getOperation()));
+            databaseService.writeEventLog(eventlogBuilder.build());
+        }
+        log.info("onNetconfConfigChange (2) {}", sb);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultNotificationListener.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultNotificationListener.java
new file mode 100644
index 000000000..a0fe6692c
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultNotificationListener.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.AlarmNotif;
+import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.ORanFmListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author herbert
+ *
+ */
+public class ORanFaultNotificationListener implements ORanFmListener {
+
+    private static final Logger log = LoggerFactory.getLogger(ORanFaultNotificationListener.class);
+
+    @Override
+    public void onAlarmNotif(AlarmNotif notification) {
+
+        log.info("onAlarmNotif {}", notification);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java
new file mode 100644
index 000000000..f4cb8024d
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import java.util.List;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.Hardware;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ */
+public class ORanNetworkElement implements NetworkElement {
+
+    private static final Logger log = LoggerFactory.getLogger(ORanNetworkElement.class);
+
+    private final INetconfAcessor netconfAccessor;
+
+    private final DataProvider databaseService;
+
+    private final ORanToInternalDataModel oRanMapper;
+
+    private ListenerRegistration<NotificationListener> oRanListenerRegistrationResult;
+    private @NonNull final ORanChangeNotificationListener oRanListener;
+    private ListenerRegistration<NotificationListener> oRanFaultListenerRegistrationResult;
+    private @NonNull final ORanFaultNotificationListener oRanFaultListener;
+
+    ORanNetworkElement(INetconfAcessor netconfAccess, DataProvider databaseService) {
+        log.info("Create {}",ORanNetworkElement.class.getSimpleName());
+        this.netconfAccessor = netconfAccess;
+        this.databaseService = databaseService;
+
+        this.oRanListenerRegistrationResult = null;
+        this.oRanListener = new ORanChangeNotificationListener(netconfAccessor, databaseService);
+
+        this.oRanFaultListenerRegistrationResult = null;
+        this.oRanFaultListener = new ORanFaultNotificationListener();
+
+        this.oRanMapper = new ORanToInternalDataModel();
+
+    }
+
+    public void initialReadFromNetworkElement() {
+        Hardware hardware = readHardware(netconfAccessor);
+        if (hardware != null) {
+            List<Component> componentList = hardware.getComponent();
+            if (componentList != null) {
+                for (Component component : componentList) {
+                    databaseService.writeInventory( oRanMapper.getInternalEquipment(netconfAccessor.getNodeId(), component));
+                }
+            }
+        }
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.ORAN;
+    }
+
+    private Hardware readHardware(INetconfAcessor accessData) {
+
+        final Class<Hardware> clazzPac = Hardware.class;
+
+        log.info("DBRead Get equipment for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+                accessData.getNodeId().getValue());
+
+        InstanceIdentifier<Hardware> hardwareIID =
+                InstanceIdentifier.builder(clazzPac).build();
+
+        Hardware res = accessData.getTransactionUtils().readData(accessData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+                hardwareIID);
+
+        return res;
+    }
+
+    @Override
+    public void register() {
+        this.oRanListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanListener);
+        this.oRanFaultListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanFaultListener);
+
+    }
+
+    @Override
+    public void deregister() {
+        if (oRanListenerRegistrationResult != null) {
+            this.oRanListenerRegistrationResult.close();
+        }
+        if (oRanFaultListenerRegistrationResult != null) {
+            this.oRanFaultListenerRegistrationResult.close();
+        };
+    }
+
+
+    @Override
+    public NodeId getNodeId() {
+        return netconfAccessor.getNodeId();
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void warmstart() {
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElementFactory.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElementFactory.java
new file mode 100644
index 000000000..b1914cc16
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElementFactory.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.network.topology.simulator.rev191025.SimulatorStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanNetworkElementFactory implements NetworkElementFactory {
+
+    private static final Logger log = LoggerFactory.getLogger(ORanNetworkElementFactory.class);
+
+    @Override
+    public Optional<NetworkElement> create(INetconfAcessor acessor, DeviceManagerServiceProvider serviceProvider) {
+        if (acessor.getCapabilites().isSupportingNamespace(ORANHWCOMPONENT.QNAME)) {
+            log.info("Create device {} ",ORanNetworkElement.class.getName());
+            return Optional.of(new ORanNetworkElement(acessor, serviceProvider.getDataProvider()));
+        } else if (acessor.getCapabilites().isSupportingNamespace(SimulatorStatus.QNAME)) {
+            log.info("Create device {} ",NtsNetworkElement.class.getName());
+            return Optional.of(new NtsNetworkElement(acessor, serviceProvider.getDataProvider()));
+        } else {
+            return Optional.empty();
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanToInternalDataModel.java b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanToInternalDataModel.java
new file mode 100644
index 000000000..a2997c0e5
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanToInternalDataModel.java
@@ -0,0 +1,70 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+/**
+ * @author herbert
+ *
+ */
+public class ORanToInternalDataModel {
+
+
+    public Inventory getInternalEquipment(NodeId nodeId, Component component) {
+
+        InventoryBuilder inventoryBuilder = new InventoryBuilder();
+
+        // General
+        inventoryBuilder.setNodeId(nodeId.getValue());
+        inventoryBuilder.setParentUuid(component.getParent());
+        inventoryBuilder.setTreeLevel(new Long(component.getParentRelPos()));
+
+        inventoryBuilder.setUuid(component.getUuid().getValue());
+        // -- String list with ids of holders
+        List<String> containerHolderKeyList = new ArrayList<>();
+        List<String> containerHolderList = component.getContainsChild();
+        if (containerHolderList != null) {
+            for (String containerHolder : containerHolderList) {
+                containerHolderKeyList.add(containerHolder);
+            }
+        }
+        inventoryBuilder.setContainedHolder(containerHolderKeyList);
+        // -- Manufacturer related things
+        inventoryBuilder.setManufacturerName(component.getName());
+
+        // Equipment type
+        inventoryBuilder.setDescription(component.getDescription());
+        inventoryBuilder.setModelIdentifier(component.getModelName());
+        inventoryBuilder.setPartTypeId(component.getXmlClass().getName());
+        inventoryBuilder.setTypeName(component.getName());
+        inventoryBuilder.setVersion(component.getHardwareRev());
+
+        // Equipment instance
+        inventoryBuilder.setDate(component.getMfgDate().getValue());
+        inventoryBuilder.setSerial(component.getSerialNum());
+
+        return inventoryBuilder.build();
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..572cb185e
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : ccsdk feature sdnr wt devicemanager
+ ================================================================================
+Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
+
+  <reference id="netconfNetworkElementService"
+             availability="mandatory" activation="eager"
+             interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService"  />
+
+  <bean id="provider"
+        class="org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.DeviceManagerORanImpl"
+        init-method="init" destroy-method="close">
+    <property name="netconfNetworkElementService" ref="netconfNetworkElementService" />
+  </bean>
+</blueprint>
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties
new file mode 100644
index 000000000..80373399e
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties
@@ -0,0 +1,3 @@
+# Proberties filled in by maven during build process
+version = ${project.version}
+build = ${buildtime}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/iana-hardware.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/iana-hardware.yang
new file mode 100755
index 000000000..52bcaf3a0
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/iana-hardware.yang
@@ -0,0 +1,180 @@
+module iana-hardware {
+yang-version 1.1;
+namespace "urn:ietf:params:xml:ns:yang:iana-hardware";
+prefix ianahw;
+
+organization "IANA";
+contact
+  "        Internet Assigned Numbers Authority
+   Postal: ICANN
+           12025 Waterfront Drive, Suite 300
+           Los Angeles, CA  90094-2536
+           United States of America
+   Tel:    +1 310 301 5800
+   E-Mail: iana@iana.org>";
+
+description
+  "IANA-defined identities for hardware class.
+   The latest revision of this YANG module can be obtained from
+   the IANA website.
+   Requests for new values should be made to IANA via
+   email (iana@iana.org).
+   Copyright (c) 2018 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+   Redistribution and use in source and binary forms, with or
+   without modification, is permitted pursuant to, and subject
+   to the license terms contained in, the Simplified BSD License
+   set forth in Section 4.c of the IETF Trust's Legal Provisions
+   Relating to IETF Documents
+   (https://trustee.ietf.org/license-info).
+   The initial version of this YANG module is part of RFC 8348;
+   see the RFC itself for full legal notices.";
+reference
+  "https://www.iana.org/assignments/yang-parameters";
+
+revision 2018-03-13 {
+  description
+    "Initial revision.";
+  reference
+    "RFC 8348: A YANG Data Model for Hardware Management";
+}
+
+/*
+ * Identities
+ */
+
+identity hardware-class {
+  description
+    "This identity is the base for all hardware class
+     identifiers.";
+}
+
+identity unknown {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is unknown
+     to the server.";
+}
+
+identity chassis {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is an
+     overall container for networking equipment.  Any class of
+     physical component, except a stack, may be contained within a
+     chassis; a chassis may only be contained within a stack.";
+}
+
+identity backplane {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of device for aggregating and forwarding networking traffic,
+     such as a shared backplane in a modular ethernet switch.  Note
+     that an implementation may model a backplane as a single
+     physical component, which is actually implemented as multiple
+     discrete physical components (within a chassis or stack).";
+}
+
+identity container {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is capable
+     of containing one or more removable physical entities,
+     possibly of different types.  For example, each (empty or
+     full) slot in a chassis will be modeled as a container.  Note
+     that all removable physical components should be modeled
+     within a container component, such as field-replaceable
+     modules, fans, or power supplies.  Note that all known
+     containers should be modeled by the agent, including empty
+     containers.";
+}
+
+identity power-supply {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is a
+     power-supplying component.";
+}
+
+identity fan {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is a fan or
+     other heat-reduction component.";
+}
+
+identity sensor {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of sensor, such as a temperature sensor within a router
+     chassis.";
+}
+
+identity module {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of self-contained sub-system.  If a module component is
+     removable, then it should be modeled within a container
+     component; otherwise, it should be modeled directly within
+     another physical component (e.g., a chassis or another
+     module).";
+}
+
+identity port {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of networking port capable of receiving and/or transmitting
+     networking traffic.";
+}
+
+identity stack {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of super-container (possibly virtual) intended to group
+     together multiple chassis entities.  A stack may be realized
+     by a virtual cable, a real interconnect cable attached to
+     multiple chassis, or multiple interconnect cables.  A stack
+     should not be modeled within any other physical components,
+     but a stack may be contained within another stack.  Only
+     chassis components should be contained within a stack.";
+}
+
+identity cpu {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of central processing unit.";
+}
+
+identity energy-object {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of energy object, i.e., it is a piece of equipment that is
+     part of or attached to a communications network that is
+     monitored, it is controlled, or it aids in the management of
+     another device for Energy Management.";
+}
+
+identity battery {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of battery.";
+}
+
+identity storage-drive {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of component with data storage capability as its main
+     functionality, e.g., hard disk drive (HDD), solid-state device
+     (SSD), solid-state hybrid drive (SSHD), object storage device
+     (OSD), or other.";
+}
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-hardware.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-hardware.yang
new file mode 100755
index 000000000..f444e26ee
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-hardware.yang
@@ -0,0 +1,1141 @@
+module ietf-hardware {
+yang-version 1.1;
+namespace "urn:ietf:params:xml:ns:yang:ietf-hardware";
+prefix hw;
+
+import ietf-inet-types {
+  prefix inet;
+}
+import ietf-yang-types {
+  prefix yang;
+}
+import iana-hardware {
+  prefix ianahw;
+}
+
+organization
+  "IETF NETMOD (Network Modeling) Working Group";
+
+contact
+  "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+   WG List:  <mailto:netmod@ietf.org>
+   Editor:   Andy Bierman
+             <mailto:andy@yumaworks.com>
+   Editor:   Martin Bjorklund
+             <mailto:mbj@tail-f.com>
+   Editor:   Jie Dong
+             <mailto:jie.dong@huawei.com>
+   Editor:   Dan Romascanu
+             <mailto:dromasca@gmail.com>";
+
+description
+  "This module contains a collection of YANG definitions for
+   managing hardware.
+   This data model is designed for the Network Management Datastore
+   Architecture (NMDA) defined in RFC 8342.
+   Copyright (c) 2018 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+   Redistribution and use in source and binary forms, with or
+   without modification, is permitted pursuant to, and subject
+   to the license terms contained in, the Simplified BSD License
+   set forth in Section 4.c of the IETF Trust's Legal Provisions
+   Relating to IETF Documents
+   (https://trustee.ietf.org/license-info).
+   This version of this YANG module is part of RFC 8348; see
+   the RFC itself for full legal notices.";
+
+revision 2018-03-13 {
+  description
+    "Initial revision.";
+  reference
+    "RFC 8348: A YANG Data Model for Hardware Management";
+}
+
+/*
+ * Features
+ */
+
+feature entity-mib {
+  description
+    "This feature indicates that the device implements
+     the ENTITY-MIB.";
+  reference
+    "RFC 6933: Entity MIB (Version 4)";
+}
+
+feature hardware-state {
+  description
+    "Indicates that ENTITY-STATE-MIB objects are supported";
+  reference
+    "RFC 4268: Entity State MIB";
+}
+
+feature hardware-sensor {
+  description
+    "Indicates that ENTITY-SENSOR-MIB objects are supported";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base";
+}
+
+/*
+ * Typedefs
+ */
+
+typedef admin-state {
+  type enumeration {
+    enum unknown {
+      value 1;
+      description
+        "The resource is unable to report administrative state.";
+    }
+    enum locked {
+      value 2;
+      description
+        "The resource is administratively prohibited from use.";
+    }
+    enum shutting-down {
+      value 3;
+      description
+        "The resource usage is administratively limited to current
+         instances of use.";
+    }
+    enum unlocked {
+      value 4;
+      description
+        "The resource is not administratively prohibited from
+         use.";
+    }
+  }
+  description
+    "Represents the various possible administrative states.";
+  reference
+    "RFC 4268: Entity State MIB - EntityAdminState";
+}
+
+typedef oper-state {
+  type enumeration {
+    enum unknown {
+      value 1;
+      description
+        "The resource is unable to report its operational state.";
+    }
+    enum disabled {
+      value 2;
+      description
+        "The resource is totally inoperable.";
+    }
+    enum enabled {
+      value 3;
+
+      description
+        "The resource is partially or fully operable.";
+    }
+    enum testing {
+      value 4;
+      description
+        "The resource is currently being tested and cannot
+         therefore report whether or not it is operational.";
+    }
+  }
+  description
+    "Represents the possible values of operational states.";
+  reference
+    "RFC 4268: Entity State MIB - EntityOperState";
+}
+
+typedef usage-state {
+  type enumeration {
+    enum unknown {
+      value 1;
+      description
+        "The resource is unable to report usage state.";
+    }
+    enum idle {
+      value 2;
+      description
+        "The resource is servicing no users.";
+    }
+    enum active {
+      value 3;
+      description
+        "The resource is currently in use, and it has sufficient
+         spare capacity to provide for additional users.";
+    }
+    enum busy {
+      value 4;
+      description
+        "The resource is currently in use, but it currently has no
+         spare capacity to provide for additional users.";
+    }
+  }
+  description
+    "Represents the possible values of usage states.";
+  reference
+    "RFC 4268: Entity State MIB -  EntityUsageState";
+}
+
+typedef alarm-state {
+  type bits {
+    bit unknown {
+      position 0;
+      description
+        "The resource is unable to report alarm state.";
+    }
+    bit under-repair {
+      position 1;
+      description
+        "The resource is currently being repaired, which, depending
+         on the implementation, may make the other values in this
+         bit string not meaningful.";
+    }
+    bit critical {
+      position 2;
+      description
+        "One or more critical alarms are active against the
+         resource.";
+    }
+    bit major {
+      position 3;
+      description
+        "One or more major alarms are active against the
+         resource.";
+    }
+    bit minor {
+      position 4;
+      description
+        "One or more minor alarms are active against the
+         resource.";
+    }
+    bit warning {
+      position 5;
+      description
+        "One or more warning alarms are active against the
+         resource.";
+    }
+    bit indeterminate {
+      position 6;
+      description
+        "One or more alarms of whose perceived severity cannot be
+         determined are active against this resource.";
+    }
+  }
+  description
+    "Represents the possible values of alarm states.  An alarm is a
+     persistent indication of an error or warning condition.
+     When no bits of this attribute are set, then no active alarms
+     are known against this component and it is not under repair.";
+  reference
+    "RFC 4268: Entity State MIB - EntityAlarmStatus";
+}
+
+typedef standby-state {
+  type enumeration {
+    enum unknown {
+      value 1;
+      description
+        "The resource is unable to report standby state.";
+    }
+    enum hot-standby {
+      value 2;
+      description
+        "The resource is not providing service, but it will be
+         immediately able to take over the role of the resource to
+         be backed up, without the need for initialization
+         activity, and will contain the same information as the
+         resource to be backed up.";
+    }
+    enum cold-standby {
+      value 3;
+      description
+        "The resource is to back up another resource, but it will
+         not be immediately able to take over the role of a
+         resource to be backed up and will require some
+         initialization activity.";
+    }
+    enum providing-service {
+      value 4;
+      description
+        "The resource is providing service.";
+    }
+  }
+  description
+    "Represents the possible values of standby states.";
+  reference
+    "RFC 4268: Entity State MIB - EntityStandbyStatus";
+}
+
+typedef sensor-value-type {
+  type enumeration {
+    enum other {
+      value 1;
+      description
+        "A measure other than those listed below.";
+    }
+    enum unknown {
+      value 2;
+      description
+        "An unknown measurement or arbitrary, relative numbers";
+    }
+    enum volts-AC {
+      value 3;
+      description
+        "A measure of electric potential (alternating current).";
+    }
+    enum volts-DC {
+      value 4;
+      description
+        "A measure of electric potential (direct current).";
+    }
+    enum amperes {
+      value 5;
+      description
+        "A measure of electric current.";
+    }
+    enum watts {
+      value 6;
+      description
+        "A measure of power.";
+    }
+    enum hertz {
+      value 7;
+      description
+        "A measure of frequency.";
+    }
+    enum celsius {
+      value 8;
+      description
+        "A measure of temperature.";
+    }
+    enum percent-RH {
+      value 9;
+      description
+        "A measure of percent relative humidity.";
+    }
+    enum rpm {
+      value 10;
+      description
+        "A measure of shaft revolutions per minute.";
+    }
+    enum cmm {
+      value 11;
+      description
+        "A measure of cubic meters per minute (airflow).";
+    }
+    enum truth-value {
+      value 12;
+      description
+        "Value is one of 1 (true) or 2 (false)";
+    }
+  }
+  description
+    "A node using this data type represents the sensor measurement
+     data type associated with a physical sensor value.  The actual
+     data units are determined by examining a node of this type
+     together with the associated sensor-value-scale node.
+     A node of this type SHOULD be defined together with nodes of
+     type sensor-value-scale and type sensor-value-precision.
+     These three types are used to identify the semantics of a node
+     of type sensor-value.";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base -
+               EntitySensorDataType";
+}
+
+typedef sensor-value-scale {
+  type enumeration {
+    enum yocto {
+      value 1;
+      description
+        "Data scaling factor of 10^-24.";
+    }
+    enum zepto {
+      value 2;
+      description
+        "Data scaling factor of 10^-21.";
+    }
+    enum atto {
+      value 3;
+      description
+        "Data scaling factor of 10^-18.";
+    }
+    enum femto {
+      value 4;
+      description
+        "Data scaling factor of 10^-15.";
+    }
+    enum pico {
+      value 5;
+      description
+        "Data scaling factor of 10^-12.";
+    }
+    enum nano {
+      value 6;
+      description
+        "Data scaling factor of 10^-9.";
+    }
+    enum micro {
+      value 7;
+      description
+        "Data scaling factor of 10^-6.";
+    }
+    enum milli {
+      value 8;
+      description
+        "Data scaling factor of 10^-3.";
+    }
+    enum units {
+      value 9;
+      description
+        "Data scaling factor of 10^0.";
+    }
+    enum kilo {
+      value 10;
+      description
+        "Data scaling factor of 10^3.";
+    }
+    enum mega {
+      value 11;
+      description
+        "Data scaling factor of 10^6.";
+    }
+    enum giga {
+      value 12;
+      description
+        "Data scaling factor of 10^9.";
+    }
+    enum tera {
+      value 13;
+      description
+        "Data scaling factor of 10^12.";
+    }
+    enum peta {
+      value 14;
+      description
+        "Data scaling factor of 10^15.";
+    }
+    enum exa {
+      value 15;
+      description
+        "Data scaling factor of 10^18.";
+    }
+    enum zetta {
+      value 16;
+      description
+        "Data scaling factor of 10^21.";
+    }
+    enum yotta {
+      value 17;
+      description
+        "Data scaling factor of 10^24.";
+    }
+  }
+  description
+    "A node using this data type represents a data scaling factor,
+     represented with an International System of Units (SI) prefix.
+     The actual data units are determined by examining a node of
+     this type together with the associated sensor-value-type.
+     A node of this type SHOULD be defined together with nodes of
+     type sensor-value-type and type sensor-value-precision.
+     Together, associated nodes of these three types are used to
+     identify the semantics of a node of type sensor-value.";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base -
+               EntitySensorDataScale";
+}
+
+typedef sensor-value-precision {
+  type int8 {
+    range "-8 .. 9";
+  }
+  description
+    "A node using this data type represents a sensor value
+     precision range.
+     A node of this type SHOULD be defined together with nodes of
+     type sensor-value-type and type sensor-value-scale.  Together,
+     associated nodes of these three types are used to identify the
+     semantics of a node of type sensor-value.
+     If a node of this type contains a value in the range 1 to 9,
+     it represents the number of decimal places in the fractional
+     part of an associated sensor-value fixed-point number.
+     If a node of this type contains a value in the range -8 to -1,
+     it represents the number of accurate digits in the associated
+     sensor-value fixed-point number.
+     The value zero indicates the associated sensor-value node is
+     not a fixed-point number.
+     Server implementers must choose a value for the associated
+     sensor-value-precision node so that the precision and accuracy
+     of the associated sensor-value node is correctly indicated.
+     For example, a component representing a temperature sensor
+     that can measure 0 to 100 degrees C in 0.1 degree
+     increments, +/- 0.05 degrees, would have a
+     sensor-value-precision value of '1', a sensor-value-scale
+     value of 'units', and a sensor-value ranging from '0' to
+     '1000'.  The sensor-value would be interpreted as
+     'degrees C * 10'.";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base -
+               EntitySensorPrecision";
+}
+
+typedef sensor-value {
+  type int32 {
+    range "-1000000000 .. 1000000000";
+  }
+  description
+   "A node using this data type represents a sensor value.
+    A node of this type SHOULD be defined together with nodes of
+    type sensor-value-type, type sensor-value-scale, and
+    type sensor-value-precision.  Together, associated nodes of
+    those three types are used to identify the semantics of a node
+    of this data type.
+    The semantics of a node using this data type are determined by
+    the value of the associated sensor-value-type node.
+    If the associated sensor-value-type node is equal to 'voltsAC',
+    'voltsDC', 'amperes', 'watts', 'hertz', 'celsius', or 'cmm',
+    then a node of this type MUST contain a fixed-point number
+    ranging from -999,999,999 to +999,999,999.  The value
+    -1000000000 indicates an underflow error.  The value
+    +1000000000 indicates an overflow error.  The
+    sensor-value-precision indicates how many fractional digits
+    are represented in the associated sensor-value node.
+    If the associated sensor-value-type node is equal to
+    'percentRH', then a node of this type MUST contain a number
+    ranging from 0 to 100.
+    If the associated sensor-value-type node is equal to 'rpm',
+    then a node of this type MUST contain a number ranging from
+    -999,999,999 to +999,999,999.
+    If the associated sensor-value-type node is equal to
+    'truth-value', then a node of this type MUST contain either the
+    value 1 (true) or the value 2 (false).
+    If the associated sensor-value-type node is equal to 'other' or
+    'unknown', then a node of this type MUST contain a number
+    ranging from -1000000000 to 1000000000.";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base -
+               EntitySensorValue";
+}
+
+typedef sensor-status {
+  type enumeration {
+    enum ok {
+      value 1;
+      description
+        "Indicates that the server can obtain the sensor value.";
+    }
+    enum unavailable {
+      value 2;
+      description
+        "Indicates that the server presently cannot obtain the
+         sensor value.";
+    }
+    enum nonoperational {
+      value 3;
+      description
+        "Indicates that the server believes the sensor is broken.
+         The sensor could have a hard failure (disconnected wire)
+         or a soft failure such as out-of-range, jittery, or wildly
+         fluctuating readings.";
+    }
+  }
+  description
+    "A node using this data type represents the operational status
+     of a physical sensor.";
+  reference
+    "RFC 3433: Entity Sensor Management Information Base -
+               EntitySensorStatus";
+}
+
+/*
+ * Data nodes
+ */
+
+container hardware {
+  description
+    "Data nodes representing components.
+     If the server supports configuration of hardware components,
+     then this data model is instantiated in the configuration
+     datastores supported by the server.  The leaf-list 'datastore'
+     for the module 'ietf-hardware' in the YANG library provides
+     this information.";
+
+  leaf last-change {
+    type yang:date-and-time;
+    config false;
+    description
+      "The time the '/hardware/component' list changed in the
+       operational state.";
+  }
+
+  list component {
+    key name;
+    description
+      "List of components.
+       When the server detects a new hardware component, it
+       initializes a list entry in the operational state.
+       If the server does not support configuration of hardware
+       components, list entries in the operational state are
+       initialized with values for all nodes as detected by the
+       implementation.
+       Otherwise, this procedure is followed:
+         1. If there is an entry in the '/hardware/component' list
+            in the intended configuration with values for the nodes
+            'class', 'parent', and 'parent-rel-pos' that are equal
+            to the detected values, then the list entry in the
+            operational state is initialized with the configured
+            values, including the 'name'.
+         2. Otherwise (i.e., there is no matching configuration
+            entry), the list entry in the operational state is
+            initialized with values for all nodes as detected by
+            the implementation.
+       If the '/hardware/component' list in the intended
+       configuration is modified, then the system MUST behave as if
+       it re-initializes itself and follow the procedure in (1).";
+    reference
+      "RFC 6933: Entity MIB (Version 4) - entPhysicalEntry";
+
+    leaf name {
+      type string;
+      description
+        "The name assigned to this component.
+         This name is not required to be the same as
+         entPhysicalName.";
+    }
+
+    leaf class {
+      type identityref {
+        base ianahw:hardware-class;
+      }
+      mandatory true;
+      description
+        "An indication of the general hardware type of the
+         component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalClass";
+    }
+
+    leaf physical-index {
+      if-feature entity-mib;
+      type int32 {
+        range "1..2147483647";
+      }
+      config false;
+      description
+        "The entPhysicalIndex for the entPhysicalEntry represented
+         by this list entry.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalIndex";
+    }
+
+    leaf description {
+      type string;
+      config false;
+      description
+        "A textual description of the component.  This node should
+         contain a string that identifies the manufacturer's name
+         for the component and should be set to a distinct value
+         for each version or model of the component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalDescr";
+    }
+
+    leaf parent {
+      type leafref {
+        path "../../component/name";
+        require-instance false;
+      }
+      description
+        "The name of the component that physically contains this
+         component.
+         If this leaf is not instantiated, it indicates that this
+         component is not contained in any other component.
+         In the event that a physical component is contained by
+         more than one physical component (e.g., double-wide
+         modules), this node contains the name of one of these
+         components.  An implementation MUST use the same name
+         every time this node is instantiated.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalContainedIn";
+    }
+
+    leaf parent-rel-pos {
+      type int32 {
+        range "0 .. 2147483647";
+      }
+      description
+        "An indication of the relative position of this child
+         component among all its sibling components.  Sibling
+         components are defined as components that:
+           o share the same value of the 'parent' node and
+           o share a common base identity for the 'class' node.
+         Note that the last rule gives implementations flexibility
+         in how components are numbered.  For example, some
+         implementations might have a single number series for all
+         components derived from 'ianahw:port', while some others
+         might have different number series for different
+         components with identities derived from 'ianahw:port' (for
+         example, one for registered jack 45 (RJ45) and one for
+         small form-factor pluggable (SFP)).";
+
+      reference
+        "RFC 6933: Entity MIB (Version 4) -
+                   entPhysicalParentRelPos";
+    }
+
+    leaf-list contains-child {
+      type leafref {
+        path "../../component/name";
+      }
+      config false;
+      description
+        "The name of the contained component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalChildIndex";
+    }
+
+    leaf hardware-rev {
+      type string;
+      config false;
+      description
+        "The vendor-specific hardware revision string for the
+         component.  The preferred value is the hardware revision
+         identifier actually printed on the component itself (if
+         present).";
+      reference
+        "RFC 6933: Entity MIB (Version 4) -
+                   entPhysicalHardwareRev";
+    }
+
+    leaf firmware-rev {
+      type string;
+      config false;
+      description
+        "The vendor-specific firmware revision string for the
+         component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) -
+                   entPhysicalFirmwareRev";
+    }
+
+    leaf software-rev {
+      type string;
+      config false;
+
+      description
+        "The vendor-specific software revision string for the
+         component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) -
+                   entPhysicalSoftwareRev";
+    }
+
+    leaf serial-num {
+      type string;
+      config false;
+      description
+        "The vendor-specific serial number string for the
+         component.  The preferred value is the serial number
+         string actually printed on the component itself (if
+         present).";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalSerialNum";
+    }
+
+    leaf mfg-name {
+      type string;
+      config false;
+      description
+        "The name of the manufacturer of this physical component.
+         The preferred value is the manufacturer name string
+         actually printed on the component itself (if present).
+         Note that comparisons between instances of the
+         'model-name', 'firmware-rev', 'software-rev', and
+         'serial-num' nodes are only meaningful amongst components
+         with the same value of 'mfg-name'.
+         If the manufacturer name string associated with the
+         physical component is unknown to the server, then this
+         node is not instantiated.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalMfgName";
+    }
+
+    leaf model-name {
+      type string;
+      config false;
+      description
+        "The vendor-specific model name identifier string
+         associated with this physical component.  The preferred
+         value is the customer-visible part number, which may be
+         printed on the component itself.
+         If the model name string associated with the physical
+         component is unknown to the server, then this node is not
+         instantiated.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalModelName";
+    }
+
+    leaf alias {
+      type string;
+      description
+        "An 'alias' name for the component, as specified by a
+         network manager, that provides a non-volatile 'handle' for
+         the component.
+         If no configured value exists, the server MAY set the
+         value of this node to a locally unique value in the
+         operational state.
+         A server implementation MAY map this leaf to the
+         entPhysicalAlias MIB object.  Such an implementation needs
+         to use some mechanism to handle the differences in size
+         and characters allowed between this leaf and
+         entPhysicalAlias.  The definition of such a mechanism is
+         outside the scope of this document.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalAlias";
+    }
+
+    leaf asset-id {
+      type string;
+      description
+        "This node is a user-assigned asset tracking identifier for
+         the component.
+         A server implementation MAY map this leaf to the
+         entPhysicalAssetID MIB object.  Such an implementation
+         needs to use some mechanism to handle the differences in
+         size and characters allowed between this leaf and
+         entPhysicalAssetID.  The definition of such a mechanism is
+         outside the scope of this document.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalAssetID";
+    }
+
+    leaf is-fru {
+      type boolean;
+      config false;
+
+      description
+        "This node indicates whether or not this component is
+         considered a 'field-replaceable unit' by the vendor.  If
+         this node contains the value 'true', then this component
+         identifies a field-replaceable unit.  For all components
+         that are permanently contained within a field-replaceable
+         unit, the value 'false' should be returned for this
+         node.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalIsFRU";
+    }
+
+    leaf mfg-date {
+      type yang:date-and-time;
+      config false;
+      description
+        "The date of manufacturing of the managed component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalMfgDate";
+    }
+
+    leaf-list uri {
+      type inet:uri;
+      description
+        "This node contains identification information about the
+         component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalUris";
+    }
+
+    leaf uuid {
+      type yang:uuid;
+      config false;
+      description
+        "A Universally Unique Identifier of the component.";
+      reference
+        "RFC 6933: Entity MIB (Version 4) - entPhysicalUUID";
+    }
+
+    container state {
+      if-feature hardware-state;
+      description
+        "State-related nodes";
+      reference
+        "RFC 4268: Entity State MIB";
+
+      leaf state-last-changed {
+        type yang:date-and-time;
+        config false;
+        description
+          "The date and time when the value of any of the
+           admin-state, oper-state, usage-state, alarm-state, or
+           standby-state changed for this component.
+           If there has been no change since the last
+           re-initialization of the local system, this node
+           contains the date and time of local system
+           initialization.  If there has been no change since the
+           component was added to the local system, this node
+           contains the date and time of the insertion.";
+        reference
+          "RFC 4268: Entity State MIB - entStateLastChanged";
+      }
+
+      leaf admin-state {
+        type admin-state;
+        description
+          "The administrative state for this component.
+           This node refers to a component's administrative
+           permission to service both other components within its
+           containment hierarchy as well other users of its
+           services defined by means outside the scope of this
+           module.
+           Some components exhibit only a subset of the remaining
+           administrative state values.  Some components cannot be
+           locked; hence, this node exhibits only the 'unlocked'
+           state.  Other components cannot be shut down gracefully;
+           hence, this node does not exhibit the 'shutting-down'
+           state.";
+        reference
+          "RFC 4268: Entity State MIB - entStateAdmin";
+      }
+
+      leaf oper-state {
+        type oper-state;
+        config false;
+        description
+          "The operational state for this component.
+           Note that this node does not follow the administrative
+           state.  An administrative state of 'down' does not
+           predict an operational state of 'disabled'.
+           Note that some implementations may not be able to
+           accurately report oper-state while the admin-state node
+           has a value other than 'unlocked'.  In these cases, this
+           node MUST have a value of 'unknown'.";
+        reference
+          "RFC 4268: Entity State MIB - entStateOper";
+      }
+
+      leaf usage-state {
+        type usage-state;
+        config false;
+        description
+          "The usage state for this component.
+           This node refers to a component's ability to service
+           more components in a containment hierarchy.
+           Some components will exhibit only a subset of the usage
+           state values.  Components that are unable to ever
+           service any components within a containment hierarchy
+           will always have a usage state of 'busy'.  In some
+           cases, a component will be able to support only one
+           other component within its containment hierarchy and
+           will therefore only exhibit values of 'idle' and
+           'busy'.";
+        reference
+          "RFC 4268: Entity State MIB - entStateUsage";
+      }
+
+      leaf alarm-state {
+        type alarm-state;
+        config false;
+        description
+          "The alarm state for this component.  It does not
+           include the alarms raised on child components within its
+           containment hierarchy.";
+        reference
+          "RFC 4268: Entity State MIB - entStateAlarm";
+      }
+
+      leaf standby-state {
+        type standby-state;
+        config false;
+        description
+          "The standby state for this component.
+           Some components will exhibit only a subset of the
+           remaining standby state values.  If this component
+           cannot operate in a standby role, the value of this node
+           will always be 'providing-service'.";
+        reference
+          "RFC 4268: Entity State MIB - entStateStandby";
+      }
+    }
+
+    container sensor-data {
+      when 'derived-from-or-self(../class,
+                                 "ianahw:sensor")' {
+        description
+          "Sensor data nodes present for any component of type
+           'sensor'";
+      }
+      if-feature hardware-sensor;
+      config false;
+
+      description
+        "Sensor-related nodes.";
+      reference
+        "RFC 3433: Entity Sensor Management Information Base";
+
+      leaf value {
+        type sensor-value;
+        description
+          "The most recent measurement obtained by the server
+           for this sensor.
+           A client that periodically fetches this node should also
+           fetch the nodes 'value-type', 'value-scale', and
+           'value-precision', since they may change when the value
+           is changed.";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorValue";
+      }
+
+      leaf value-type {
+        type sensor-value-type;
+        description
+          "The type of data units associated with the
+           sensor value";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorType";
+      }
+      leaf value-scale {
+        type sensor-value-scale;
+        description
+          "The (power of 10) scaling factor associated
+           with the sensor value";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorScale";
+      }
+
+      leaf value-precision {
+        type sensor-value-precision;
+        description
+          "The number of decimal places of precision
+           associated with the sensor value";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorPrecision";
+      }
+
+      leaf oper-status {
+        type sensor-status;
+        description
+          "The operational status of the sensor.";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorOperStatus";
+      }
+
+      leaf units-display {
+        type string;
+        description
+          "A textual description of the data units that should be
+           used in the display of the sensor value.";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorUnitsDisplay";
+      }
+
+      leaf value-timestamp {
+        type yang:date-and-time;
+        description
+          "The time the status and/or value of this sensor was last
+           obtained by the server.";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorValueTimeStamp";
+      }
+      leaf value-update-rate {
+        type uint32;
+        units "milliseconds";
+        description
+          "An indication of the frequency that the server updates
+           the associated 'value' node, represented in
+           milliseconds.  The value zero indicates:
+            - the sensor value is updated on demand (e.g.,
+              when polled by the server for a get-request),
+            - the sensor value is updated when the sensor
+              value changes (event-driven), or
+            - the server does not know the update rate.";
+        reference
+          "RFC 3433: Entity Sensor Management Information Base -
+                     entPhySensorValueUpdateRate";
+      }
+    }
+  }
+}
+
+/*
+ * Notifications
+ */
+
+notification hardware-state-change {
+  description
+    "A hardware-state-change notification is generated when the
+     value of /hardware/last-change changes in the operational
+     state.";
+  reference
+    "RFC 6933: Entity MIB (Version 4) - entConfigChange";
+}
+
+notification hardware-state-oper-enabled {
+  if-feature hardware-state;
+  description
+    "A hardware-state-oper-enabled notification signifies that a
+     component has transitioned into the 'enabled' state.";
+
+  leaf name {
+    type leafref {
+      path "/hardware/component/name";
+    }
+
+    description
+      "The name of the component that has transitioned into the
+       'enabled' state.";
+  }
+  leaf admin-state {
+    type leafref {
+      path "/hardware/component/state/admin-state";
+    }
+    description
+      "The administrative state for the component.";
+  }
+  leaf alarm-state {
+    type leafref {
+      path "/hardware/component/state/alarm-state";
+    }
+    description
+      "The alarm state for the component.";
+  }
+  reference
+    "RFC 4268: Entity State MIB - entStateOperEnabled";
+}
+
+notification hardware-state-oper-disabled {
+  if-feature hardware-state;
+  description
+    "A hardware-state-oper-disabled notification signifies that a
+     component has transitioned into the 'disabled' state.";
+
+  leaf name {
+    type leafref {
+      path "/hardware/component/name";
+    }
+    description
+      "The name of the component that has transitioned into the
+       'disabled' state.";
+  }
+  leaf admin-state {
+    type leafref {
+      path "/hardware/component/state/admin-state";
+    }
+    description
+      "The administrative state for the component.";
+  }
+  leaf alarm-state {
+    type leafref {
+      path "/hardware/component/state/alarm-state";
+    }
+
+    description
+      "The alarm state for the component.";
+  }
+  reference
+    "RFC 4268: Entity State MIB - entStateOperDisabled";
+}
+
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-interfaces.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-interfaces.yang
new file mode 100644
index 000000000..8dae9d3e2
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/ietf-interfaces.yang
@@ -0,0 +1,1073 @@
+module ietf-interfaces {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
+  prefix if;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization
+    "IETF NETMOD (Network Modeling) Working Group";
+
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     Editor:   Martin Bjorklund
+               <mailto:mbj@tail-f.com>";
+
+  description
+    "This module contains a collection of YANG definitions for
+     managing network interfaces.
+     Copyright (c) 2018 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (https://trustee.ietf.org/license-info).
+     This version of this YANG module is part of RFC 8343; see
+     the RFC itself for full legal notices.";
+
+  revision 2018-02-20 {
+    description
+      "Updated to support NMDA.";
+    reference
+      "RFC 8343: A YANG Data Model for Interface Management";
+  }
+
+  revision 2014-05-08 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7223: A YANG Data Model for Interface Management";
+  }
+
+  /*
+   * Typedefs
+   */
+
+  typedef interface-ref {
+    type leafref {
+      path "/if:interfaces/if:interface/if:name";
+    }
+    description
+      "This type is used by data models that need to reference
+       interfaces.";
+  }
+
+  /*
+   * Identities
+   */
+
+  identity interface-type {
+    description
+      "Base identity from which specific interface types are
+       derived.";
+  }
+
+  /*
+   * Features
+   */
+
+  feature arbitrary-names {
+    description
+      "This feature indicates that the device allows user-controlled
+       interfaces to be named arbitrarily.";
+  }
+  feature pre-provisioning {
+    description
+      "This feature indicates that the device supports
+       pre-provisioning of interface configuration, i.e., it is
+       possible to configure an interface whose physical interface
+       hardware is not present on the device.";
+  }
+  feature if-mib {
+    description
+      "This feature indicates that the device implements
+       the IF-MIB.";
+    reference
+      "RFC 2863: The Interfaces Group MIB";
+  }
+
+  /*
+   * Data nodes
+   */
+
+  container interfaces {
+    description
+      "Interface parameters.";
+
+    list interface {
+      key "name";
+
+      description
+        "The list of interfaces on the device.
+         The status of an interface is available in this list in the
+         operational state.  If the configuration of a
+         system-controlled interface cannot be used by the system
+         (e.g., the interface hardware present does not match the
+         interface type), then the configuration is not applied to
+         the system-controlled interface shown in the operational
+         state.  If the configuration of a user-controlled interface
+         cannot be used by the system, the configured interface is
+         not instantiated in the operational state.
+         System-controlled interfaces created by the system are
+         always present in this list in the operational state,
+         whether or not they are configured.";
+
+     leaf name {
+        type string;
+        description
+          "The name of the interface.
+           A device MAY restrict the allowed values for this leaf,
+           possibly depending on the type of the interface.
+           For system-controlled interfaces, this leaf is the
+           device-specific name of the interface.
+           If a client tries to create configuration for a
+           system-controlled interface that is not present in the
+           operational state, the server MAY reject the request if
+           the implementation does not support pre-provisioning of
+           interfaces or if the name refers to an interface that can
+           never exist in the system.  A Network Configuration
+           Protocol (NETCONF) server MUST reply with an rpc-error
+           with the error-tag 'invalid-value' in this case.
+           If the device supports pre-provisioning of interface
+           configuration, the 'pre-provisioning' feature is
+           advertised.
+           If the device allows arbitrarily named user-controlled
+           interfaces, the 'arbitrary-names' feature is advertised.
+           When a configured user-controlled interface is created by
+           the system, it is instantiated with the same name in the
+           operational state.
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf description {
+        type string;
+        description
+          "A textual description of the interface.
+           A server implementation MAY map this leaf to the ifAlias
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifAlias.  The definition of
+           such a mechanism is outside the scope of this document.
+           Since ifAlias is defined to be stored in non-volatile
+           storage, the MIB implementation MUST map ifAlias to the
+           value of 'description' in the persistently stored
+           configuration.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAlias";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        description
+          "The type of the interface.
+           When an interface entry is created, a server MAY
+           initialize the type leaf with a valid value, e.g., if it
+           is possible to derive the type from the name of the
+           interface.
+           If a client tries to set the type of an interface to a
+           value that can never be used by the system, e.g., if the
+           type is not supported or if the type does not match the
+           name of the interface, the server MUST reject the request.
+           A NETCONF server MUST reply with an rpc-error with the
+           error-tag 'invalid-value' in this case.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf enabled {
+        type boolean;
+        default "true";
+        description
+          "This leaf contains the configured, desired state of the
+           interface.
+           Systems that implement the IF-MIB use the value of this
+           leaf in the intended configuration to set
+           IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
+           has been initialized, as described in RFC 2863.
+           Changes in this leaf in the intended configuration are
+           reflected in ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf link-up-down-trap-enable {
+        if-feature if-mib;
+        type enumeration {
+          enum enabled {
+            value 1;
+            description
+              "The device will generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+          enum disabled {
+            value 2;
+            description
+              "The device will not generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+        }
+        description
+          "Controls whether linkUp/linkDown SNMP notifications
+           should be generated for this interface.
+           If this node is not configured, the value 'enabled' is
+           operationally used by the server for interfaces that do
+           not operate on top of any other interface (i.e., there are
+           no 'lower-layer-if' entries), and 'disabled' otherwise.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifLinkUpDownTrapEnable";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The desired state of the interface.
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The current operational state of the interface.
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        config false;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        config false;
+        mandatory true;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        config false;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-ref;
+        config false;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-ref;
+        config false;
+
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        config false;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        config false;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+
+    }
+  }
+
+  /*
+   * Legacy typedefs
+   */
+
+  typedef interface-state-ref {
+    type leafref {
+      path "/if:interfaces-state/if:interface/if:name";
+    }
+    status deprecated;
+    description
+      "This type is used by data models that need to reference
+       the operationally present interfaces.";
+  }
+
+  /*
+   * Legacy operational state data nodes
+   */
+
+  container interfaces-state {
+    config false;
+    status deprecated;
+    description
+      "Data nodes for the operational state of interfaces.";
+
+    list interface {
+      key "name";
+      status deprecated;
+
+      description
+        "The list of interfaces on the device.
+         System-controlled interfaces created by the system are
+         always present in this list, whether or not they are
+         configured.";
+
+      leaf name {
+        type string;
+        status deprecated;
+        description
+          "The name of the interface.
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The type of the interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The desired state of the interface.
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The current operational state of the interface.
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        status deprecated;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        status deprecated;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        status deprecated;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        status deprecated;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          status deprecated;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          status deprecated;
+
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          status deprecated;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+    }
+  }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/network-topology-simulator.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/network-topology-simulator.yang
new file mode 100644
index 000000000..ac2cf8dd3
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/network-topology-simulator.yang
@@ -0,0 +1,297 @@
+module network-topology-simulator {
+  yang-version 1.1;
+  namespace "urn:onf:params:xml:ns:yang:network-topology-simulator";
+  prefix network-topology-simulator;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  organization
+    "Melacon";
+  contact
+    "Web: <https://github.com/Melacon>
+     Editors:  Alex Stancu
+               <mailto:stancu.liviualex@gmail.com>";
+  description
+    "This module contains a collection of YANG definitions for managing the Network Topology Simulator.";
+
+  revision 2019-10-25 {
+    description
+      "Modify notifications. Add VES message configuration options.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2019-06-07 {
+    description
+      "Modify controller details.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2019-03-07 {
+    description
+      "Initial version";
+    reference
+      "O-RAN SC SIM project";
+  }
+
+  typedef operational-state-type {
+    type enumeration {
+      enum not-specified {
+        description
+          "none";
+      }
+      enum running {
+        description
+          "none";
+      }
+      enum created {
+        description
+          "none";
+      }
+      enum exited {
+        description
+          "none";
+      }
+    }
+    description
+      "The operation state of the simulated device.";
+  }
+
+  typedef authentication-method-type {
+    type enumeration {
+      enum no-auth {
+        description
+          "no security (http)";
+      }
+      enum cert-only {
+        description
+          "auth by certificate (https)";
+      }
+      enum basic-auth {
+        description
+          "auth by basic auth username and password (https)";
+      }
+      enum cert-basic-auth {
+        description
+          "auth by certificate and basic auth username / password (https)";
+      }
+    }
+    description
+      "The authentication method for VES messaging.";
+  }
+
+  typedef percent {
+    type decimal64 {
+      fraction-digits 2;
+      range "0 .. 100";
+    }
+    description
+      "Percentage";
+  }
+
+  grouping controller-details-type-g {
+    leaf controller-ip {
+      type inet:ip-address;
+      description
+        "The IP Address of the SDN Controller.";
+    }
+    leaf controller-port {
+      type inet:port-number;
+      description
+        "The Port of the SDN Controller.";
+    }
+    leaf controller-username {
+      type string;
+      description
+        "The Username of the SDN Controller.";
+    }
+    leaf controller-password {
+      type string;
+      description
+        "The Password of the SDN Controller.";
+    }
+    description
+      "none";
+  }
+
+  grouping simulated-devices-type-g {
+    leaf uuid {
+      type string;
+      description
+        "The UUID of the simulated device.";
+    }
+    leaf device-ip {
+      type string;
+      description
+        "The IP Address of the simulated device.";
+    }
+    leaf-list device-port {
+      type uint32;
+      description
+        "A NETCONF endpoint (port) of the simulated device.";
+    }
+    leaf is-mounted {
+      type boolean;
+      description
+        "Specifies if the simulated device is mounted in the SDN Controller.";
+    }
+    leaf operational-state {
+      type operational-state-type;
+      description
+        "Specifies the operational state of the simulated device.";
+    }
+    description
+      "none";
+  }
+
+  container simulator-config {
+    description
+      "Configuration container of the simulator.";
+    leaf simulated-devices {
+      type uint32;
+      default "0";
+      description
+        "The number of devices to be simulated.";
+    }
+    leaf mounted-devices {
+      type uint32;
+      default "0";
+      description
+        "The number of devices to be mounted in ODL. The configured number should not exceed the number of mounted devices.";
+    }
+    container notification-config {
+      leaf fault-notification-delay-period {
+        type uint32;
+        default "0";
+        description
+          "Interval in seconds between two consecutive notifications. If the attribute is set to 0, nofitications are not generated.";
+      }
+      leaf ves-heartbeat-period {
+        type uint32;
+        default "0";
+        description
+          "Interval in seconds between two VES heartbeat messages. If the attribute is set to 0, heartbeat messages are not generated.";
+      }
+      leaf is-netconf-available {
+        type boolean;
+        default "true";
+        description
+          "If set to 'true', NETCONF notifications will be generated.";
+      }
+      leaf is-ves-available {
+        type boolean;
+        default "true";
+        description
+          "If set to 'true', VES messages will be generated.";
+      }
+      description
+        "none";
+    }
+    container controller-details {
+      uses controller-details-type-g;
+      description
+        "The connectivity details of the SDN Controller where we want to mount our simulated devices.";
+    }
+    container ves-endpoint-details {
+      must 'ves-registration = "false" or ../mounted-devices = 0' {
+        error-message "VES registration cannot be active while devices are still mounted to ODL not via VES.";
+      }
+      leaf ves-endpoint-ip {
+        type inet:ip-address;
+        description
+          "The IP Address of the VES Endpoint.";
+      }
+      leaf ves-endpoint-port {
+        type inet:port-number;
+        description
+          "The Port of the VES Endpoint.";
+      }
+      leaf ves-endpoint-auth-method {
+        type authentication-method-type;
+        default "no-auth";
+        description
+          "The type of the authentication to be used with the VES Endpoint.";
+      }
+      leaf ves-endpoint-username {
+        when "../ves-endpoint-auth-method = 'basic-auth' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Username to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-endpoint-password {
+        when "../ves-endpoint-auth-method = 'basic-auth' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Password to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-endpoint-certificate {
+        when "../ves-endpoint-auth-method = 'cert-only' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Certificate to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-registration {
+        type boolean;
+        default "false";
+        description
+          "If this is set to 'True', the simulated devices will automatically send a pnfRegistration VES message when they start. This cannot be set to 'True' if we already have 'mounted-devices' greater that 0, because we already mounted the devices directly to ODL.";
+      }
+      description
+        "none";
+    }
+  }
+  container simulator-status {
+    config false;
+    container simulation-usage-details {
+      config false;
+      leaf running-simulated-devices {
+        type uint32;
+        description
+          "The current number of running simulated devices.";
+      }
+      leaf running-mounted-devices {
+        type uint32;
+        description
+          "The current number of running simulated devices that are mounted in ODL.";
+      }
+      leaf base-netconf-port {
+        type uint32;
+        default "30000";
+        description
+          "The starting port number for the NETCONF connections exposed.";
+      }
+      leaf cpu-usage {
+        type percent;
+        description
+          "Specifies the CPU load generated by this simulated device.";
+      }
+      leaf mem-usage {
+        type uint32;
+        description
+          "Specifies the RAM in MB used by this simulated device.";
+      }
+      description
+        "The details about the simulation, including resources consumed.";
+    }
+    list simulated-devices-list {
+      key "uuid";
+      config false;
+      uses simulated-devices-type-g;
+      description
+        "The list of the devices that are currently simulated.";
+    }
+    description
+      "State data container of the simulator.";
+  }
+
+  rpc restart-simulation {
+    description
+      "Operation to restart all the simulated devices with the new configuration of the simulator.";
+  }
+
+  rpc add-key-pair-to-odl {
+    description
+      "Operation to add a key pair signed by the NTS to OpenDaylight, such that it can connect to devices using TLS.";
+  }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-fm.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-fm.yang
new file mode 100644
index 000000000..92238aade
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-fm.yang
@@ -0,0 +1,168 @@
+module o-ran-fm {
+  yang-version 1.1;
+  namespace "urn:o-ran:fm:1.0";
+  prefix "o-ran-fm";
+
+  import ietf-yang-types {
+    prefix yang;
+    revision-date 2013-07-15;
+  }
+
+  organization "O-RAN Alliance";
+
+  contact
+    "www.o-ran.org";
+
+  description
+    "This module defines alarm reporting mechanism.
+
+    Copyright 2019 the O-RAN Alliance.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the above disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the above disclaimer in the documentation
+    and/or other materials provided with the distribution.
+    * Neither the Members of the O-RAN Alliance nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.";
+
+  revision "2019-02-04" {
+    description
+      "version 1.0.0
+
+      1) imported model from xRAN
+      2) changed namespace and reference from xran to o-ran";
+
+    reference "ORAN-WG4.M.0-v01.00";
+  }
+
+  grouping alarm {
+    description
+      "Gropuping which can uniquely identify alarm";
+
+    leaf fault-id {
+      type uint16;
+      mandatory true;
+
+      description
+        "Fault specific Id that identifies the fault.";
+    }
+
+    leaf fault-source {
+      type string {
+        length "1..255";
+      }
+      mandatory true;
+
+      description
+        "Represents the Object or source that is suspected to be faulty.";
+    }
+
+    list affected-objects {
+      key name;
+      leaf name {
+        type string {
+          length "1..255";
+        }
+        mandatory true;
+
+        description
+          "Represents the Object or source that is suspected to be affected by this fault";
+      }
+      min-elements 1;
+      max-elements 100;
+
+      description
+        "List of affected-objects";
+    }
+
+    leaf fault-severity {
+      type enumeration {
+        enum CRITICAL {
+          description
+            "Critical alarm means that this device is not able to perform any further service";
+        }
+        enum MAJOR {
+          description
+            "Major alarm appeared on the device";
+        }
+        enum MINOR {
+          description
+            "Minor alarm appeared on the device";
+        }
+        enum WARNING {
+          description
+            "Warning is being reported by the device";
+        }
+      }
+      mandatory true;
+
+      description
+        "Fault severity defines the severity level of the fault. A notification, whose fault severity has the value 'warning',
+        is a special type of an alarm notification. For these alarm notifications,
+        the Master Agent does not expect to receive a clear alarm notification.";
+    }
+
+    leaf is-cleared {
+      type boolean;
+      mandatory true;
+
+      description
+        "Fault state determines the type of the event. Not used if faultSeverity is WARNING.";
+    }
+
+    leaf fault-text {
+      type string {
+        length "0..255";
+      }
+
+      description
+        "Textual description of the fault.";
+    }
+
+    leaf event-time {
+      type yang:date-and-time;
+      mandatory true;
+
+      description
+        "Timestamp to indicate the time when the fault is detected/cleared.";
+    }
+  }
+
+  container active-alarm-list {
+    list active-alarms {
+      key fault-id;
+      uses alarm;
+
+      description
+        "List of currenty active alarms";
+    }
+    config false;
+
+    description
+      "List of currently active alarms. An alarm is removed from this table when the state transitions to clear.";
+  }
+
+  notification alarm-notif {
+    uses alarm;
+
+    description
+      "Notification sent on initial alarm creation, as well as any time the alarm changes state, including clear";
+  }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-hardware.yang b/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-hardware.yang
new file mode 100644
index 000000000..34cdadaca
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/main/yang/o-ran-hardware.yang
@@ -0,0 +1,271 @@
+module o-ran-hardware {
+  yang-version 1.1;
+  namespace "urn:o-ran:hardware:1.0";
+  prefix "o-ran-hw";
+
+  import ietf-hardware {
+    prefix hw;
+  }
+  import iana-hardware {
+    prefix ianahw;
+  }
+
+  organization "O-RAN Alliance";
+
+  contact
+    "www.o-ran.org";
+
+  description
+    "This module defines the YANG definitions for managng the O-RAN hardware.
+
+     Copyright 2019 the O-RAN Alliance.
+
+     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the above disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the above disclaimer in the documentation
+     and/or other materials provided with the distribution.
+     * Neither the Members of the O-RAN Alliance nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.";
+
+   revision "2019-03-28" {
+    description
+      "version 1.0.1
+
+      1) added new identities to accommodate cross working group use of
+      o-ran-hardware and assoicated set of augmentations that are backwards
+      compatible to version 1.0.0";
+
+    reference "ORAN-WG4.M.0-v01.00";
+   }
+
+  revision "2019-02-04" {
+   description
+     "version 1.0.0
+
+     1) imported model from xRAN
+     2) changed namespace and reference from xran to o-ran";
+
+   reference "ORAN-WG4.M.0-v01.00";
+  }
+
+  feature ENERGYSAVING {
+    description
+      "Indicates that the Radio Unit supports energy saving state.";
+  }
+
+  // identity statements
+  identity O-RAN-RADIO {
+    base ianahw:module;
+    description
+      "Module used as it represents a self-contained sub-system
+      used in /hw:/hardware/hw:component/hw:class to represent
+      an O-RAN RU";
+  }
+
+  identity O-RAN-HW-COMPONENT {
+    base ianahw:module;
+    description
+      "Module used as it represents a self-contained sub-system
+      used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN hardware component";
+  }
+
+  identity O-DU-COMPONENT {
+    base O-RAN-HW-COMPONENT;
+    description
+      "Used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN defined O-DU hardware component";
+  }
+
+  identity O-RU-COMPONENT {
+    base O-RAN-HW-COMPONENT;
+    description
+      "Used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN defined O-RU hardware component, including a stand-alone
+      O-RU or an O-RU component integrated into a multi-module system.";
+  }
+
+  // typedef statements
+  typedef energysaving-state {
+    type enumeration {
+      enum UNKNOWN {
+        description "The Radio Unit is unable to report energy saving state.";
+      }
+      enum SLEEPING {
+        description
+          "The Radio Unit is in a sleep state. The NETCONF management plane
+           connection is functioning. Other functions and hardware which are
+           not needed for management plane may be in energy saving mode.";
+      }
+      enum AWAKE {
+        description
+          "The Radio Unit is not in an energy saving state.";
+      }
+    }
+    description
+      "new typedef since ietf-hardware only covers pwer-state
+      for redundancy purposes and not power saving operations.";
+  }
+
+  typedef availability-type {
+    type enumeration {
+      enum UNKNOWN {
+        description "The Radio Unit is unable to report its availability state.";
+      }
+      enum NORMAL {
+        description
+          "The equipment is functioning correctly.";
+      }
+      enum DEGRADED {
+        description
+          "The equipment may be reporting a major alarm or may be reporting a critical
+           alarm that is only impacting one or more subcomponent, but where the
+           equipment's implementation permit it to continue operation (server traffic)
+           in a degraded state.
+
+           Used for example, when the equipment has M identical sub-components and
+           when a critical alarm is imapcting only N subcomponents, where N<M.";
+      }
+      enum FAULTY {
+        description
+          "The (sub-)components impacted by the critical alarm(s) impact the
+          ability of the equipment to continue operation (serve traffic).";
+      }
+    }
+    description
+      "Equipment's availability-state is derived by matching active faults
+       and their impact to module's operation and enables an equipment to indicate
+       that even though it may have one or more critical alarms, it can continue
+       to serve traffic.";
+  }
+
+  // common WG4 and croos-WG augmentations using O-RAN-RADIO identity
+
+  augment "/hw:hardware/hw:component" {
+    when "(derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description "New O-RAN parameters for o-ran hardware";
+
+    container label-content {
+      config false;
+      description
+        "Which set of attributes are printed on the Radio Unit's label";
+      leaf model-name {
+        type boolean;
+        description
+          "indicates whether model-name is included on the equipment's label";
+      }
+      leaf serial-number {
+        type boolean;
+        description
+          "indicates whether serial number is included on the equipment's label";
+      }
+    }
+    leaf product-code {
+      type string;
+      config false;
+      mandatory true;
+      description
+        "O-RAN term that is distinct from model-name in ietf-hardware.";
+    }
+    leaf energy-saving-enabled {
+      if-feature "ENERGYSAVING";
+      type boolean;
+      config true;
+      default false;
+      description
+        "This parameter can enable O-RAN unit to be switched to energy
+         saving mode.
+         TRUE indicates to switch the energy saving mode.
+         FALSE indicates to cancel the energy saving mode.
+         At the energy saving mode, all power of whole O-RAN unit becomes
+         lowest level whereas M-plane is still available";
+    }
+  }
+
+  augment "/hw:hardware/hw:component" {
+    when "(derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(hw:class, 'ianahw:port')) or
+    (derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description "New O-RAN parameters for o-ran naming";
+    leaf o-ran-name {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:name";
+      }
+      must "re-match(current(),'[a-zA-Z0-9][a-zA-Z0-9\\.\\-_]{0,253}[a-zA-Z0-9]')" {
+        error-message "Name must match pattern and length.";
+      }
+      mandatory true;
+      description
+        "O-RAN name needed to bind and match with the name of hw element,
+        to be compliant with O-RAN naming convention.";
+    }
+  }
+
+  augment "/hw:hardware/hw:component/hw:state"  {
+    when "(derived-from-or-self(../hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(../hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description
+      "new O-RAN defined state";
+    leaf power-state {
+      if-feature "ENERGYSAVING";
+      type energysaving-state;
+      config false;
+      description
+        "The current power saving state for this component.
+        Note - hw:/hardware/compnent/state/standby-state defined in RFC 4268 is
+        used for redundancy purposes and not power saving operations.";
+    }
+    leaf availability-state {
+      type availability-type;
+      config false;
+      description
+        "Equipment's availability-state is derived by matching active faults
+         and their impact to module's operation and enables an equipment to indicate
+         that even though it may have one or more critical alarms, it can continue
+         to serve traffic.";
+    }
+  }
+
+
+// augmentations to Notifications
+
+  augment "/hw:hardware-state-oper-enabled"  {
+    description "new availability state";
+    leaf availability-state {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:state/o-ran-hw:availability-state";
+      }
+      description
+        "The availability-state of the O-RU.";
+    }
+  }
+
+  augment "/hw:hardware-state-oper-disabled"  {
+    description "new availability state";
+    leaf availability-state {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:state/o-ran-hw:availability-state";
+      }
+      description
+        "The availability-state of the O-RU.";
+    }
+  }
+}
diff --git a/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..bdc3c1009
--- /dev/null
+++ b/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,40 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+# org.slf4j.simpleLogger.log.xxx.yyy=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
+
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+#org.slf4j.simpleLogger.showDateTime=false
+
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+#org.slf4j.simpleLogger.showThreadName=true
+
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+#org.slf4j.simpleLogger.showLogName=true
+
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml
index 84fd019f4..123ab2328 100644
--- a/sdnr/wt/devicemanager/feature/pom.xml
+++ b/sdnr/wt/devicemanager/feature/pom.xml
@@ -22,48 +22,27 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemanager-feature</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemodel-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemanager-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemanager-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml
index ad5cc1ae7..86e586f4b 100755
--- a/sdnr/wt/devicemanager/installer/pom.xml
+++ b/sdnr/wt/devicemanager/installer/pom.xml
@@ -22,116 +22,129 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemanager-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-devicemanager</application.name>
-    <include.transitive.dependencies>false</include.transitive.dependencies>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-schemas</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>validate</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/assembly/cache/schema</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../provider/src/main/resources/preload.cache.schema</directory>
-                  <includes>
-                    <include>*.yang</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <properties>
+        <application.name>sdnr-wt-devicemanager</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-schemas</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly/cache/schema</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/../provider/src/main/resources/preload.cache.schema</directory>
+                                    <includes>
+                                        <include>*.yang</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml
index ef823d680..7a1ef0d4b 100644
--- a/sdnr/wt/devicemanager/model/pom.xml
+++ b/sdnr/wt/devicemanager/model/pom.xml
@@ -22,47 +22,66 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemanager-model</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <properties>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
-  </properties>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-  <dependencies>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/gen/**</exclude>
-            <exclude>**/generated-sources/**</exclude>
-            <exclude>**/yang-gen-sal/**</exclude>
-            <exclude>**/pax/**</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-data-provider-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/IConfigChangedListener.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DcaeForwarder.java
index 704841ce7..9dae4f354 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/IConfigChangedListener.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DcaeForwarder.java
@@ -15,8 +15,12 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+/**
+ * @author herbert
+ *
+ */
+public interface DcaeForwarder extends DeviceManagerService {
 
-public interface IConfigChangedListener {
-    void onConfigChanged();
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerService.java
new file mode 100644
index 000000000..c6dde426a
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerService.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+/**
+ * Marker Interface for common devicemanager services
+ */
+public interface DeviceManagerService {
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerServiceProvider.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerServiceProvider.java
new file mode 100644
index 000000000..dbb31ec02
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceManagerServiceProvider.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+
+public interface DeviceManagerServiceProvider {
+
+    /** Generic interface to provide services for smooth migration **/
+    @NonNull <L extends DeviceManagerService> L getService(Class<L> clazz) throws UnkownDevicemanagerServiceException;
+
+    /** Get a dataprovider**/
+    @NonNull DataProvider getDataProvider();
+    //@NonNull WebSocketServiceClient getWebSocketServiceClient();
+    //@NonNull DcaeForwarder getDcaeForwarder();
+    //@NonNull DevicemanagerNotificationDelayService getDevicemanagerNotificationDelayService();
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitoredNe.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceMonitoredNe.java
index ec19f17b9..aab90aeab 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitoredNe.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/DeviceMonitoredNe.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -18,13 +18,13 @@
 /**
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
 
 /**
  * @author herbert
  *
  */
-public interface DeviceMonitoredNe {
+public interface DeviceMonitoredNe extends NetworkElementService {
 
     /**
      * Prepare subsequent check calls
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/FactoryRegistration.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/FactoryRegistration.java
new file mode 100644
index 000000000..ed51c8de1
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/FactoryRegistration.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
+
+public interface FactoryRegistration<T> extends ObjectRegistration<T> {
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/InventoryProvider.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/InventoryProvider.java
new file mode 100644
index 000000000..d68037b81
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/InventoryProvider.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+
+/**
+ * Provide Inventory information
+ * @author herbert
+ *
+ */
+public interface InventoryProvider extends NetworkElementService {
+
+    public InventoryInformation getInventoryInformation();
+
+    public InventoryInformation getInventoryInformation(String layerProtocolFilter);
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetconfNetworkElementService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetconfNetworkElementService.java
new file mode 100644
index 000000000..df9d34745
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetconfNetworkElementService.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.concepts.Registration;
+
+public interface NetconfNetworkElementService extends Registration {
+
+    /** Register factory class for network-element handler **/
+    @NonNull <L extends NetworkElementFactory> FactoryRegistration<L> registerNetworkElementFactory(@NonNull L factory);
+
+    /** Get Devicemanager service **/
+    DeviceManagerServiceProvider getServiceProvider();
+
+    /** Write to centrla devicemanager eventlog **/
+    void writeToEventLog(String objectId, String msg, String value);
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElement.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElement.java
new file mode 100644
index 000000000..e0fafb3e0
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElement.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import java.util.Optional;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+public interface NetworkElement {
+
+    /** Register networkelement at all services **/
+    void register();
+
+    /** Deregister networkelement at all services **/
+    void deregister();
+
+    /** Do a warmstart of the handler e.g.clean up database and refresh alarm status **/
+    void warmstart();
+
+    /** node-id also nodeName, mountpointName. Uuid. **/
+    NodeId getNodeId();
+
+    /** self selected device type **/
+    NetworkElementDeviceType getDeviceType();
+
+    /** Provide optional service interface.
+     * Services:
+     *     InventoryProvider.class
+     *     DeviceMonitoredNe.class
+     **/
+    <L extends NetworkElementService> Optional<L> getService(Class<L> clazz);
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementFactory.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementFactory.java
new file mode 100644
index 000000000..3ce932846
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementFactory.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+
+public interface NetworkElementFactory {
+
+    Optional<NetworkElement> create(INetconfAcessor acessor, DeviceManagerServiceProvider serviceProvider);
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementService.java
new file mode 100644
index 000000000..eb9db97be
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/NetworkElementService.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+/**
+ * Marker interface for service interface of a network element
+ */
+public interface NetworkElementService {
+
+}
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/UnkownDevicemanagerServiceException.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/UnkownDevicemanagerServiceException.java
new file mode 100644
index 000000000..034b0fc4c
--- /dev/null
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/UnkownDevicemanagerServiceException.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
+
+public class UnkownDevicemanagerServiceException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public UnkownDevicemanagerServiceException(String string, Class<?> serviceInterface) {
+        super(string+" "+serviceInterface.getName());
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClient.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/WebSocketServiceClient.java
index 8cfd63d39..480dd04f2 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClient.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/WebSocketServiceClient.java
@@ -6,26 +6,20 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-/**
- *
- */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager;
 
 /**
- * Wrapper for forwarding websocket notifications to the websocket service, that is running as container.
- * @author herbert
+ * Handle status changes and notifications
  */
-public interface WebSocketServiceClient {
-
-    public <T extends MwtNotificationBase & GetEventType> void sendViaWebsockets(String nodeName, T notificationXml);
+public interface WebSocketServiceClient extends DeviceManagerService {
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InventoryInformation.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/legacy/InventoryInformation.java
index e4ce4afa7..a3281f873 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InventoryInformation.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/legacy/InventoryInformation.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang b/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
index 97eb099aa..b1dea1357 100644
--- a/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
+++ b/sdnr/wt/devicemanager/model/src/main/yang/devicemanager.yang
@@ -4,6 +4,8 @@ module devicemanager {
     namespace "urn:opendaylight:params:xml:ns:yang:devicemanager";
     prefix "devicemanager";
 
+    import data-provider { prefix "data-provider"; }
+
     description
         "DeviceManager Api Module";
 
@@ -12,63 +14,14 @@ module devicemanager {
             "Initial revision";
     }
 
-    grouping maintenance-mode-g {
-        leaf mountpoint-name{
-            mandatory true;
-            type string;
-            description
-                "Mountpoint-name as key of node";
-        }
-        leaf node-name {
-            mandatory true;
-            type string;
-            description
-                "Node-name as node";
-        }
-        list filter {
-            container definition {
-                leaf object-id-ref {
-                    mandatory true;
-                    type string;
-                    description
-                        "object id to filter on";
-                }
-                leaf problem {
-                    mandatory true;
-                    type string;
-                    description
-                        "name of the problem to filter";
-                }
-            }
-            leaf description {
-                mandatory true;
-                type string;
-                description
-                    "Node-name as node";
-            }
-            leaf start-date {
-                mandatory true;
-                type string;
-                description
-                    "begin of maintenance-mode";
-            }
-            leaf end-date {
-                mandatory true;
-                type string;
-                description
-                    "end of maintenance-mode";
-            }
-        }
-    }
-
     rpc set-maintenance-mode{
         description
             "Set maintenance mode for network element";
         input{
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
         output {
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc get-maintenance-mode{
@@ -83,7 +36,7 @@ module devicemanager {
             }
         }
         output {
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc test-maintenance-mode{
@@ -118,7 +71,7 @@ module devicemanager {
                 type string;
                 description    "Describin if mountpoint was found and result of maintenance mode testing";
             }
-            uses maintenance-mode-g;
+            uses data-provider:maintenance-entity;
         }
     }
     rpc show-required-network-element {
@@ -184,6 +137,21 @@ module devicemanager {
             }
         }
     }
-
+    rpc push-fault-notification {
+        description
+            "Forward fault problem notification of a network-element";
+        input {
+        	uses data-provider:object-change-reference;
+        	uses data-provider:fault;
+        }
+    }
+    rpc push-attribute-change-notification {
+        description
+            "Forward attribute change notification of a network-element";
+        input {
+	    	uses data-provider:object-change-reference;
+    		uses data-provider:attribute-change;
+        }
+    }
 }
 
diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml
index 5a37d8521..6b4848ef2 100755
--- a/sdnr/wt/devicemanager/pom.xml
+++ b/sdnr/wt/devicemanager/pom.xml
@@ -24,12 +24,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-top</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
@@ -37,9 +31,12 @@
         <relativePath/>
     </parent>
 
-    <properties>
-        <feature-name>sdnr-wt-devicemanager</feature-name>
-    </properties>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
     <modules>
         <module>model</module>
@@ -48,4 +45,7 @@
         <module>installer</module>
     </modules>
 
+    <properties>
+        <feature-name>sdnr-wt-devicemanager</feature-name>
+    </properties>
 </project>
diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml
index b08c5b51e..1e7b1caa6 100644
--- a/sdnr/wt/devicemanager/provider/pom.xml
+++ b/sdnr/wt/devicemanager/provider/pom.xml
@@ -16,459 +16,237 @@
     ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemanager-provider</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-devicemanager-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-  <properties>
-    <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
-    <maven.javadoc.skip>true</maven.javadoc.skip>
-    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-    <buildtime>${maven.build.timestamp} UTC</buildtime>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.23.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemanager-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemodel-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-<!--     <dependency> -->
-<!--       <groupId>org.opendaylight.mdsal</groupId> -->
-<!--       <artifactId>mdsal-binding-dom-adapter</artifactId> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.opendaylight.mdsal</groupId> -->
-<!--       <artifactId>mdsal-dom-spi</artifactId> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.opendaylight.controller</groupId> -->
-<!--       <artifactId>sal-binding-api</artifactId> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.opendaylight.netconf</groupId> -->
-<!--       <artifactId>sal-netconf-connector</artifactId> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.opendaylight.mdsal</groupId> -->
-<!--       <artifactId>mdsal-dom-broker</artifactId> -->
-<!--     </dependency> -->
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-	  <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-	  <artifactId>rfc6991-ietf-yang-types</artifactId>
-	 </dependency>
-	 <dependency>
-       <groupId>org.opendaylight.mdsal</groupId>
-       <artifactId>yang-binding</artifactId>
-	 </dependency>
-     <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-common-api</artifactId>
-     <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_2.12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_2.12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <databaseport>49400</databaseport>
+    </properties>
 
-        <!-- Elasticsearch dependencies below should be part of this bundle -->
-        <!-- https://mvnrepository.com/artifact/org.elasticsearch/elasticsearch -->
-        <!-- Includes all implicit dependencies -->
+    <dependencies>
+        <!-- begin for testing -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.spatial4j</groupId>
-      <artifactId>spatial4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>securesm</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.carrotsearch</groupId>
-      <artifactId>hppc</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.joda</groupId>
-      <artifactId>joda-convert</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-smile</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-cbor</artifactId>
-      <version>2.6.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <scope>provided</scope>
-    </dependency>
-<!--     <dependency> -->
-<!--       <groupId>io.netty</groupId> -->
-<!--       <artifactId>netty</artifactId> -->
-<!--       <version>3.10.5.Final</version> -->
-<!--       <scope>provided</scope> -->
-<!--     </dependency> -->
-    <dependency>
-      <groupId>com.ning</groupId>
-      <artifactId>compress-lzf</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tdunning</groupId>
-      <artifactId>t-digest</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hdrhistogram</groupId>
-      <artifactId>HdrHistogram</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.twitter</groupId>
-      <artifactId>jsr166e</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-backward-codecs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queries</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-memory</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-sandbox</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-suggest</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-misc</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-join</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-grouping</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-spatial</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-spatial3d</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.elasticsearch.plugin</groupId>
-      <artifactId>delete-by-query</artifactId>
-      <scope>provided</scope>
-    </dependency>
+        <!-- end for testing -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-data-provider-database</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-actor_2.12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-cluster_2.12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-<!--       <resource> -->
-<!--         <directory>${project.build.directory}/plugins</directory> -->
-<!--         <targetPath>elasticsearch/plugins</targetPath> -->
-<!--       </resource> -->
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              org.w3c.dom,
-              org.opendaylight.controller.md.sal.binding.api;version="[1.6,2)",
-              org.opendaylight.controller.md.sal.common.api.data;version="[1.6,2)",
-              org.opendaylight.controller.sal.binding.api;version="[1.6,2)",
-              org.opendaylight.mdsal.singleton.common.api;version="[2.0,3.0.8]",
-              org.opendaylight.yangtools.concepts;version="[2.0,3)",
-              org.opendaylight.yangtools.yang.common;version="[2.0,3)",
-              org.opendaylight.yangtools.yang.binding;version="[1.0.8,2)",
-              org.osgi.framework,
-              org.osgi.service.blueprint.container,
-              org.slf4j;version="[1.7,2)",
-              org.slf4j.spi;version="[1.7,2)",
-              com.typesafe.config;version= "[1.3,2)",
-              org.json,
-              javax.annotation,
-              javax.net.ssl,
-              javax.xml.bind,
-              javax.xml.bind.annotation,
-              org.apache.commons.lang3.exception,
+        <!--     <dependency> -->
+        <!--         <groupId>org.elasticsearch.client</groupId> -->
+        <!--         <artifactId>elasticsearch-rest-client</artifactId> -->
+        <!--         <version>${elasticsearch.version}</version> -->
+        <!--     </dependency> -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-              com.github.mustachejava;resolution:=optional,
-              com.sun.jna;resolution:=optional,
-              com.sun.jna.ptr;resolution:=optional,
-              com.sun.jna.win32;resolution:=optional,
-              com.vividsolutions.jts.algorithm;resolution:=optional,
-              com.vividsolutions.jts.geom;resolution:=optional,
-              com.vividsolutions.jts.geom.impl;resolution:=optional,
-              com.vividsolutions.jts.geom.prep;resolution:=optional,
-              com.vividsolutions.jts.io;resolution:=optional,
-              com.vividsolutions.jts.operation.union;resolution:=optional,
-              com.vividsolutions.jts.operation.valid;resolution:=optional,
-              com.vividsolutions.jts.util;resolution:=optional,
-              org.apache.log;
-              org.apache.log4j.helpers;resolution:=optional;version="[1.2,2)",
-              org.noggit;resolution:=optional,
+    </dependencies>
 
-   			  com.google.common.base;version="[23.6,26)",
-              com.google.common.cache;version="[23.6,26)",
-              com.google.common.collect;version="[23.6,26)",
-              com.google.common.hash;version="[23.6,26)",
-              com.google.common.io;version="[23.6,26)",
-              com.google.common.math;version="[23.6,26)",
-              com.google.common.net;version="[23.6,26)",
-              com.google.common.primitives;version="[23.6,26)",
-              com.google.common.util.concurrent;version="[23.6,26)",
-
-              org.jboss.netty.bootstrap;version="[3.10,4)",
-              org.jboss.netty.buffer;version="[3.10,4)",
-              org.jboss.netty.channel;version="[3.10,4)",
-              org.jboss.netty.channel.socket.nio;version="[3.10,4)",
-              org.jboss.netty.channel.socket.oio;version="[3.10,4)",
-              org.jboss.netty.handler.codec.embedder;version="[3.10,4)",
-              org.jboss.netty.handler.codec.frame;version="[3.10,4)",
-              org.jboss.netty.handler.codec.http;version="[3.10,4)",
-              org.jboss.netty.handler.timeout;version="[3.10,4)",
-              org.jboss.netty.logging;version="[3.10,4)",
-              org.jboss.netty.util;version="[3.10,4)",
-
-              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105,
-              org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714;version="[1.4,2)",
-              org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715;version="[1.2.8,2)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.network.element;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.container.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.diversity.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.ethernet.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.hybrid.mw.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.pure.ethernet.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.tdm.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.air._interface.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.container.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.diversity.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.ethernet.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.hybrid.mw.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.pure.ethernet.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.tdm.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.air._interface.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.container.historical.performance.type.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.diversity.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.ethernet.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.hybrid.mw.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.pure.ethernet.structure.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.tdm.container.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.equipment.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.pac;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114;version="[1.7,2)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status;version="[1.7,2)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types;version="[1.7,2)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.filter;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.show.required.network.element.output;version="[0.3,1)",
-              org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021;version="[2013.10,2014)",
-              org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology;version="[2013.10,2014)",
-              org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology;version="[2013.10,2014)"
-            </Import-Package>
-            <Embed-Dependency>jackson*,ela*,delete-by-query,joda*,Hdr*,lucene*,
-              hppc,jsr166e,t-digest,snakeyaml,securesm,spatial4j,compress-lzf,commons-cli,jakarta-regexp,
-              commons-lang3,commons-collections,commons-logging,commons-beanutils</Embed-Dependency>
-            <Include-Resource>{maven-resources},{maven-dependencies},META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Export-Package>org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.*</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generateDTOs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</argument>
+                                <argument>initfile</argument>
+                                <argument>-f</argument>
+                                <argument>${project.build.directory}/EsInit.script</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.alexcojocaru</groupId>
+                <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
+                <configuration>
+                    <clusterName>testCluster</clusterName>
+                    <transportPort>9500</transportPort>
+                    <httpPort>${databaseport}</httpPort>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
+                    <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+                    <skip>${skipTests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-elasticsearch</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>runforked</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-elasticsearch</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>databaseport</name>
+                            <value>${databaseport}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java
deleted file mode 100644
index 4a6913efe..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.elasticsearch.bootstrap;
-import java.net.URL;
-public class JarHell {
-    private JarHell() {}
-    public static void checkJarHell() throws Exception {}
-    public static void checkJarHell(URL urls[]) throws Exception {}
-    public static void checkVersionFormat(String targetVersion) {}
-    public static void checkJavaVersion(String resource, String targetVersion) {}
-    public static URL[] parseClassPath() {return new URL[]{};}
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiProviderClient.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiProviderClient.java
index d5030c1c7..2cc878c72 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiProviderClient.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiProviderClient.java
@@ -18,62 +18,58 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl;
 
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http.BaseHTTPResponse;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementRepresentation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AaiConfig;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import org.onap.ccsdk.features.sdnr.wt.common.HtAssert;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
+import org.onap.ccsdk.features.sdnr.wt.common.http.BaseHTTPResponseFromDevicemanager;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.InventoryProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.config.AaiConfig;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AaiProviderClient implements AutoCloseable {
+public class AaiProviderClient implements DeviceManagerService, AutoCloseable {
 
     private static Logger LOG = LoggerFactory.getLogger(AaiProviderClient.class);
+    @SuppressWarnings("unused") // @TODO Remove code
     private static boolean reloadConfigFlag;
     private static final IConfigChangedListener configChangedListener = () -> reloadConfigFlag = true;
 
-    private AaiConfig config;
+    private final AaiConfig config;
     private final DeviceManagerImpl deviceManager;
-    private final HtDevicemanagerConfiguration htconfig;
+    private final ConfigurationFileRepresentation htconfig;
 
 
-    public AaiConfig getConfig() {
-        return this.config;
-    }
-
-
-    public AaiProviderClient(HtDevicemanagerConfiguration cfg, DeviceManagerImpl devMgr) {
-        this.config = cfg.getAai();
+    public AaiProviderClient(@Nonnull ConfigurationFileRepresentation cfg, DeviceManagerImpl devMgr) {
+        HtAssert.nonnull(cfg);
+        this.config = new AaiConfig(cfg);
+        LOG.debug("AaiProviderClient configuration setting: {}", this.config);
         this.htconfig = cfg;
         this.htconfig.registerConfigChangedListener(configChangedListener);
         this.deviceManager = devMgr;
 
     }
 
-    private void _reload() {
-        if (reloadConfigFlag) {
-            this.config = AaiConfig.reload();
-            LOG.info("config reloaded: {}", config == null ? "null" : config);
-        }
-        reloadConfigFlag = false;
+    public AaiConfig getConfig() {
+        return this.config;
     }
 
     public void onDeviceRegistered(String mountPointName) {
-        this._reload();
         if (this.config.isOff()) {
             return;
         }
-        ONFCoreNetworkElementRepresentation ne =
-                this.deviceManager != null ? this.deviceManager.getNeByMountpoint(mountPointName) : null;
+        NetworkElement ne = this.deviceManager != null ? this.deviceManager.getNeByMountpoint(mountPointName) : null;
+        Optional<InventoryProvider> oip = ne != null ? ne.getService(InventoryProvider.class) : Optional.empty();
         this.onDeviceRegistered(mountPointName,
-                ne != null ? ne.getInventoryInformation("MWPS") : InventoryInformation.getDefault());
-
+                oip.isPresent() ? oip.get().getInventoryInformation("MWPS") : InventoryInformation.getDefault());
     }
 
     public void onDeviceRegistered(String mountPointName, InventoryInformation i) {
-        this._reload();
         if (this.config.isOff()) {
             return;
         }
@@ -82,7 +78,6 @@ public class AaiProviderClient implements AutoCloseable {
     }
 
     public void onDeviceUnregistered(String mountPointName) {
-        this._reload();
         if (this.config.isOff()) {
             return;
         }
@@ -100,8 +95,8 @@ public class AaiProviderClient implements AutoCloseable {
 
     private class AaiCreateRequestRunnable implements Runnable {
 
-        private static final int RESPCODE_NOTFOUND = BaseHTTPResponse.CODE404;
-        private static final int RESPCODE_FOUND = BaseHTTPResponse.CODE200;
+        private static final int RESPCODE_NOTFOUND = BaseHTTPResponseFromDevicemanager.CODE404;
+        private static final int RESPCODE_FOUND = BaseHTTPResponseFromDevicemanager.CODE200;
         private final AaiWebApiClient mClient;
         private final String pnfId;
         private final String type;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiWebApiClient.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiWebApiClient.java
index 6ce4cff67..db2ba8d23 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiWebApiClient.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/AaiWebApiClient.java
@@ -21,12 +21,12 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http.BaseHTTPClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http.BaseHTTPResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.http.BaseHTTPClientFromDevicemanager;
+import org.onap.ccsdk.features.sdnr.wt.common.http.BaseHTTPResponseFromDevicemanager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AaiWebApiClient extends BaseHTTPClient {
+public class AaiWebApiClient extends BaseHTTPClientFromDevicemanager {
 
     private static Logger LOG = LoggerFactory.getLogger(AaiWebApiClient.class);
     private static final String PNF_JSON_INTERFACE_TEMPLATE = "        {\n"
@@ -66,7 +66,7 @@ public class AaiWebApiClient extends BaseHTTPClient {
 
     public AaiWebApiClient(String baseUrl, Map<String, String> headers, boolean trustAllCerts, String certFilename,
             String passphrase) {
-        super(baseUrl, trustAllCerts, certFilename, passphrase, BaseHTTPClient.getSslCertPcks());
+        super(baseUrl, trustAllCerts, certFilename, passphrase, BaseHTTPClientFromDevicemanager.getSslCertPcks());
 
         this.headerMap = new HashMap<>();
         this.headerMap.putAll(headers);
@@ -116,7 +116,7 @@ public class AaiWebApiClient extends BaseHTTPClient {
      */
 
     private int pnfRequest(String pnfId, String method, String message) {
-        BaseHTTPResponse response;
+        BaseHTTPResponseFromDevicemanager response;
         try {
             String uri = PNF_URI + URLParamEncoder.encode(pnfId);
             response = this.sendRequest(uri, method, message, headerMap);
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoder.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoder.java
index 4decc24d7..2e8b44fd7 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoder.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoder.java
@@ -19,16 +19,13 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl;
 
 class URLParamEncoder {
 
-    private URLParamEncoder() {
-    }
-
-    private static final String UNSAFE_CHARSET = " %$&+,/:;=?@<>#%";
-
     public static String encode(String input) {
         StringBuilder resultStr = new StringBuilder();
         for (char ch : input.toCharArray()) {
             if (isUnsafe(ch)) {
-                resultStr.append(escape(ch));
+                resultStr.append('%');
+                resultStr.append(toHex(ch / 16));
+                resultStr.append(toHex(ch % 16));
             } else {
                 resultStr.append(ch);
             }
@@ -36,18 +33,14 @@ class URLParamEncoder {
         return resultStr.toString();
     }
 
+    private static char toHex(int ch) {
+        return (char) (ch < 10 ? '0' + ch : 'A' + ch - 10);
+    }
+
     private static boolean isUnsafe(char ch) {
-        if (ch > 128) {
+        if (ch > 128 || ch < 0) {
             return true;
         }
-        return UNSAFE_CHARSET.indexOf(ch) >= 0;
-    }
-
-    private static String escape(char ch){
-        return String.format("%c%c%c", '%', toHex(ch / 16), toHex(ch % 16));
-    }
-
-    private static char toHex(int ch) {
-        return (char) (ch < 10 ? '0' + ch : 'A' + ch - 10);
+        return " %$&+,/:;=?@<>#%".indexOf(ch) >= 0;
     }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiClientPropertiesFile.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiClientPropertiesFile.java
new file mode 100644
index 000000000..671aea5c2
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiClientPropertiesFile.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.config;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+public class AaiClientPropertiesFile {
+
+    private final File mFile;
+    private String mPCKS12CertFilename;
+    private String mPCKS12Passphrase;
+    private boolean mTrustInsecureSSL;
+    private String mApplicationIdentifier;
+    private String mRemoteUrl;
+    private int mConnectionTimeout;
+    private int mReadTimeout;
+
+	public String getFilename() {
+		return this.mFile.getAbsolutePath();
+	}
+
+	public String getPCKS12CertFilename() {
+		return this.mPCKS12CertFilename;
+	}
+
+	public String getPCKS12Passphrase() {
+		return this.mPCKS12Passphrase;
+	}
+
+	public boolean trustInsecureSSL() {
+		return this.mTrustInsecureSSL;
+	}
+
+	public String getApplicationIdentifier() {
+		return this.mApplicationIdentifier;
+	}
+
+	public String getRemoteUrl() {
+		return this.mRemoteUrl;
+	}
+
+	public int getConnectionTimeout() {
+		return this.mConnectionTimeout;
+	}
+
+	public int getReadTimeout() {
+		return this.mReadTimeout;
+	}
+
+	public boolean exists() {
+		return this.mFile.exists();
+	}
+
+	public AaiClientPropertiesFile(String filename) {
+		this.mFile = new File(filename);
+	}
+
+	public void load() throws IOException, NumberFormatException {
+		Properties defaultProps = new Properties();
+		FileInputStream in = new FileInputStream(this.mFile);
+		defaultProps.load(in);
+		this.mPCKS12CertFilename = defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.ssl.key", null);
+		this.mPCKS12Passphrase = defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd", null);
+		this.mTrustInsecureSSL = defaultProps
+				.getProperty("org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore", "false").equals("true");
+		this.mApplicationIdentifier = defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.application", null);
+		this.mRemoteUrl = defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.uri", null);
+		this.mConnectionTimeout = Integer.parseInt(defaultProps.getProperty("connection.timeout", "60000"));
+		this.mReadTimeout = Integer.parseInt(defaultProps.getProperty("read.timeout", "60000"));
+		in.close();
+	}
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiConfig.java
new file mode 100644
index 000000000..9991f782c
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/config/AaiConfig.java
@@ -0,0 +1,262 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.config;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Properties;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.onap.ccsdk.features.sdnr.wt.common.HtAssert;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AaiConfig implements Configuration {
+
+    private static Logger LOG = LoggerFactory.getLogger(AaiConfig.class);
+
+    private static final String SECTION_MARKER_AAI = "aai";
+
+    private enum Config {
+        AAIPROP_FILE("aaiPropertiesFile", "null"),
+        BASEURL("aaiUrl", "off", "org.onap.ccsdk.sli.adaptors.aai.uri"),
+        USERCREDENTIALS("aaiUserCredentials",""),
+        HEADERS("aaiHeaders","[\"X-TransactionId: 9999\"]"),
+        DELETEONMOUNTPOINTREMOVED("aaiDeleteOnMountpointRemove",false),
+        TRUSTALLCERTS("aaiTrustAllCerts",false, "org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore"),
+        APIVERSION("aaiApiVersion", "aai/v13"),
+        PCKS12CERTFILENAME("aaiPcks12ClientCertFile","", "org.onap.ccsdk.sli.adaptors.aai.ssl.key"),
+        PCKS12PASSPHRASE("aaiPcks12ClientCertPassphrase","", "org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd"),
+        CONNECTIONTIMEOUT("aaiClientConnectionTimeout",String.valueOf(DEFAULT_VALUE_CONNECTION_TIMEOUT), "connection.timeout"),    //in ms;
+        APPLICATIONID("aaiApplicationId","SDNR", "org.onap.ccsdk.sli.adaptors.aai.application"),
+        HTTPREADTIMEOUT("aaiReadTimeout", "60000", "read.timeout");
+
+        private String propertyKey;
+        private String propertyValue;
+        private Optional<String> propertyKeySecondFile;
+
+        Config(String propertyKey, Object propertyValue) {
+            this.propertyKey = propertyKey;
+            this.propertyValue = propertyValue.toString();
+            this.propertyKeySecondFile = Optional.empty();
+        }
+
+        Config(String propertyKey, Object propertyValue, String propertyKeySecondFile) {
+            this(propertyKey, propertyValue);
+            this.propertyKeySecondFile = Optional.of(propertyKeySecondFile);
+        }
+    }
+
+    private static final long DEFAULT_VALUE_CONNECTION_TIMEOUT = 30000;    //in ms
+    private static final String HEADER_KEY_APPLICATION = "X-FromAppId";
+
+    private final ConfigurationFileRepresentation configuration;
+
+    public AaiConfig(ConfigurationFileRepresentation configuration) {
+        HtAssert.nonnull(configuration);
+        this.configuration = configuration;
+        this.configuration.addSection(SECTION_MARKER_AAI);
+        defaults();
+    }
+
+    /*
+     * Getter
+     */
+
+    public boolean doDeleteOnMountPointRemoved() {
+        return configuration.getPropertyBoolean(SECTION_MARKER_AAI, Config.DELETEONMOUNTPOINTREMOVED.propertyKey);
+    }
+
+    public boolean getTrustAll() {
+        return configuration.getPropertyBoolean(SECTION_MARKER_AAI, Config.TRUSTALLCERTS.propertyKey);
+    }
+
+    public String getPcks12CertificateFilename() {
+        return configuration.getProperty(SECTION_MARKER_AAI, Config.PCKS12CERTFILENAME.propertyKey);
+    }
+
+    public String getPcks12CertificatePassphrase() {
+        return configuration.getProperty(SECTION_MARKER_AAI, Config.PCKS12PASSPHRASE.propertyKey);
+    }
+
+    public int getConnectionTimeout() {
+        long res = configuration.getPropertyLong(SECTION_MARKER_AAI, Config.PCKS12PASSPHRASE.propertyKey).orElse(DEFAULT_VALUE_CONNECTION_TIMEOUT);
+        return (int)res;
+    }
+
+    public boolean isOff() {
+        return configuration.getProperty(SECTION_MARKER_AAI, Config.BASEURL.propertyKey).equalsIgnoreCase("off");
+    }
+
+    public String getBaseUri() {
+        String res = configuration.getProperty(SECTION_MARKER_AAI, Config.APIVERSION.propertyKey);
+        if (!res.startsWith("/")) {
+            res = "/" + res;
+        }
+        return res;
+    }
+
+    public String getBaseUrl() {
+        if (isOff()) {
+            return "";
+        } else {
+            String url = configuration.getProperty(SECTION_MARKER_AAI, Config.BASEURL.propertyKey);
+            if (!url.endsWith("/")) {
+                url += "/";
+            }
+            String apiVersion = configuration.getProperty(SECTION_MARKER_AAI, Config.APIVERSION.propertyKey);
+            if (apiVersion.startsWith("/")) {
+                apiVersion = apiVersion.substring(1);
+            }
+            return url + apiVersion;
+        }
+    }
+
+    public Map<String, String> getHeaders() {
+
+        Map<String,String> headers = _parseHeadersMap(configuration.getProperty(SECTION_MARKER_AAI, Config.HEADERS.propertyKey));
+        headers.put(HEADER_KEY_APPLICATION, configuration.getProperty(SECTION_MARKER_AAI, Config.APPLICATIONID.propertyKey));
+
+        String credentials = configuration.getProperty(SECTION_MARKER_AAI, Config.USERCREDENTIALS.propertyKey);
+        if (!nullorempty(credentials)) {
+            String credentialParts[] = credentials.split(":");
+            if (credentialParts.length == 2) {
+                // 0:username 1:password
+                String s = headers.getOrDefault("Authorization", null);
+                if (nullorempty(s) && !nullorempty(credentialParts[0]) && !nullorempty(credentialParts[1])) {
+                    headers.put("Authorization",
+                            "Basic " + new String(Base64.getEncoder().encode(credentials.getBytes())));
+                }
+            }
+        }
+        return headers;
+    }
+
+    @Override
+    public String getSectionName() {
+        return SECTION_MARKER_AAI;
+    }
+
+    @Override
+    public void defaults() {
+        for (Config conf : Config.values()) {
+            configuration.setPropertyIfNotAvailable(SECTION_MARKER_AAI, conf.propertyKey, conf.propertyValue);
+           }
+        // If file is available, the content is assigned to related parameters.
+        getAaiPropertiesFile();
+    }
+
+    @Override
+    public String toString() {
+        return "AaiConfig [doDeleteOnMountPointRemoved()=" + doDeleteOnMountPointRemoved() + ", getTrustAll()="
+                + getTrustAll() + ", getPcks12CertificateFilename()=" + getPcks12CertificateFilename()
+                + ", getPcks12CertificatePassphrase()=" + getPcks12CertificatePassphrase() + ", getConnectionTimeout()="
+                + getConnectionTimeout() + ", isOff()=" + isOff() + ", getBaseUri()=" + getBaseUri() + ", getBaseUrl()="
+                + getBaseUrl() + ", getHeaders()=" + getHeaders() + ", getSectionName()=" + getSectionName() + "]";
+    }
+
+    /*
+     * Private
+     */
+
+    private boolean nullorempty(String s) {
+        return s == null || s.isEmpty();
+    }
+
+    /**
+     * Convert headers to configuration string.
+     * @param headers
+     * @return
+     */
+    @SuppressWarnings("unused")
+    private static String _printHeadersMap(Map<String, String> headers) {
+        String r = "[";
+        if (headers != null) {
+            int i = 0;
+            for (Entry<String, String> entry : headers.entrySet()) {
+                if (i > 0) {
+                    r += ",";
+                }
+                r += "\"" + entry.getKey() + ":" + entry.getValue() + "\"";
+                i++;
+            }
+        }
+        r += "]";
+        return r;
+    }
+
+    private static Map<String, String> _parseHeadersMap(String s) throws JSONException {
+        Map<String, String> r = new HashMap<>();
+        JSONArray a =null;
+        try {
+            a= new JSONArray(s);
+        }
+        catch(Exception e) {
+            LOG.warn("problem parsing aai headers {}: {}",s,e);
+        }
+        if (a != null && a.length() > 0) {
+            for (int i = 0; i < a.length(); i++) {
+                String item = a.getString(i);
+                String[] hlp = item.split(":");
+                if (hlp.length > 1) {
+                    r.put(hlp[0], hlp[1]);
+                }
+            }
+        }
+        return r;
+    }
+
+    /**
+     * Read file if available and assign to configuration
+     */
+    private void getAaiPropertiesFile() {
+        String aaiPropertiesFileName = configuration.getProperty(SECTION_MARKER_AAI, Config.AAIPROP_FILE.propertyKey);
+        File f = new File(aaiPropertiesFileName);
+        if (f.exists()) {
+            try {
+                FileInputStream in = new FileInputStream(f);
+                Properties defaultProps = new Properties();
+                defaultProps.load(in);
+
+                for (Config conf : Config.values()) {
+                    if (conf.propertyKeySecondFile.isPresent()) {
+                        String config = defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.ssl.key", conf.propertyValue);
+                        LOG.debug("Property file assign  {} = {} ",conf.propertyKey, config );
+                        configuration.setPropertyIfNotAvailable(
+                                SECTION_MARKER_AAI,
+                                conf.propertyKey,
+                                config);
+                    }
+                }
+
+                in.close();
+            } catch (IOException e) {
+                LOG.warn("Problem during file read {} {}", f.getAbsoluteFile(), e);
+            }
+        }
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanService.java
index eb48b87c4..d5e4ea618 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/archiveservice/ArchiveCleanService.java
@@ -22,9 +22,12 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.EsConfig;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.ArchiveCleanProvider;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.slf4j.Logger;
@@ -37,20 +40,20 @@ public class ArchiveCleanService implements AutoCloseable, IConfigChangedListene
 
     private static final Logger LOG = LoggerFactory.getLogger(ArchiveCleanService.class);
     private static final ServiceGroupIdentifier IDENT = ServiceGroupIdentifier.create("ElasticSearchArchiveCleanService");
-    
+
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     private final ArchiveCleanProvider[] indexCleanList;
-    private final HtDevicemanagerConfiguration htconfig;
+    private final ConfigurationFileRepresentation htConfig;
     private final Runnable doClean;
 
-    private EsConfig config;
+    private final EsConfig esConfig;
     private Future<?> taskReference;
-	private boolean isMaster;
+    private boolean isMaster;
 
-    public ArchiveCleanService(HtDevicemanagerConfiguration config, ArchiveCleanProvider... indexCleanList) {
-        this.config = config.getEs();
-        this.htconfig = config;
-        this.htconfig.registerConfigChangedListener(this);
+    public ArchiveCleanService(ConfigurationFileRepresentation config, ArchiveCleanProvider... indexCleanList) {
+        this.htConfig = config;
+        this.htConfig.registerConfigChangedListener(this);
+        this.esConfig = new EsConfig(htConfig);
         this.indexCleanList = indexCleanList;
         this.doClean = this;
         this.taskReference = null;
@@ -64,22 +67,22 @@ public class ArchiveCleanService implements AutoCloseable, IConfigChangedListene
             taskReference.cancel(false);
         }
         if(this.isMaster) {
-        if (this.config.getArchiveCheckIntervalSeconds() > 0) {
+        if (this.esConfig.getArchiveCheckIntervalSeconds() > 0) {
             LOG.info("DBCleanService is turned on for entries older than {} seconds",
-                    this.config.getArchiveLifetimeSeconds());
+                    this.esConfig.getArchiveLifetimeSeconds());
             taskReference = this.scheduler.scheduleAtFixedRate(doClean, 0,
-                    this.config.getArchiveCheckIntervalSeconds(), TimeUnit.SECONDS);
+                    this.esConfig.getArchiveCheckIntervalSeconds(), TimeUnit.SECONDS);
         } else {
             LOG.info("DBCleanService is turned off");
         }
         }
         else {
-        	LOG.info("service is inactive on this node. active on another node.");
+            LOG.info("service is inactive on this node. active on another node.");
         }
     }
 
     public Date getDateForOldElements() {
-        return new Date(System.currentTimeMillis() - config.getArchiveLifetimeSeconds() * 1000);
+        return new Date(System.currentTimeMillis() - esConfig.getArchiveLifetimeSeconds() * 1000);
     }
 
     public int countOldEntries() {
@@ -117,39 +120,38 @@ public class ArchiveCleanService implements AutoCloseable, IConfigChangedListene
     @Override
     public void onConfigChanged() {
         LOG.debug("config changed. reninit timer");
-        ArchiveCleanService.this.config = EsConfig.reload();
-        ArchiveCleanService.this.reinit();
     };
 
     @Override
     public void close() throws Exception {
-        this.htconfig.unregisterConfigChangedListener(this);
+        this.htConfig.unregisterConfigChangedListener(this);
         this.scheduler.shutdown();
     }
 
     @Override
     public String toString() {
-        return "ArchivCleanService [ArchiveCheckIntervalSeconds=" + config.getArchiveCheckIntervalSeconds()
-                + "ArchiveLifetimeSeconds=" + config.getArchiveLifetimeSeconds() + "]";
+        return "ArchivCleanService [ArchiveCheckIntervalSeconds=" + esConfig.getArchiveCheckIntervalSeconds()
+                + "ArchiveLifetimeSeconds=" + esConfig.getArchiveLifetimeSeconds() + "]";
+    }
+
+    @SuppressWarnings("null")
+    @Override
+    public @NonNull ServiceGroupIdentifier getIdentifier() {
+         return IDENT;
+    }
+
+    @Override
+    public void instantiateServiceInstance() {
+        LOG.info("We take Leadership");
+        this.isMaster=true;
+        this.reinit();
     }
 
-	@Override
-	public ServiceGroupIdentifier getIdentifier() {
-		 return IDENT;
-	}
-
-	@Override
-	public void instantiateServiceInstance() {
-		LOG.info("We take Leadership");
-		this.isMaster=true;
-		this.reinit();
-	}
-
-	@Override
-	public ListenableFuture<? extends Object> closeServiceInstance() {
-		LOG.info("We lost Leadership");
-		this.isMaster=false;
-		this.reinit();
-		return Futures.immediateFuture(null);
-	}
+    @Override
+    public ListenableFuture<? extends Object> closeServiceInstance() {
+        LOG.info("We lost Leadership");
+        this.isMaster=false;
+        this.reinit();
+        return Futures.immediateFuture(null);
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementCoreData.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/NetworkElementCoreData.java
index d394af7b4..a86944c82 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementCoreData.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/NetworkElementCoreData.java
@@ -15,18 +15,18 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base;
 
-import javax.annotation.Nullable;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
 
-@SuppressWarnings("deprecation")
-public interface ONFCoreNetworkElementCoreData {
+public interface NetworkElementCoreData {
 
     public String getMountpoint();
     public DataBroker getDataBroker();
     public @Nullable NetworkElement getOptionalNetworkElement();
+    public NetworkElementDeviceType getDeviceType();
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDataBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDataBase.java
deleted file mode 100644
index 856163104..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDataBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.SearchHit;
-
-
-/**
- * Interface, used by access one object
- * @author Herbert
- *
- */
-public interface HtDataBase {
-
-    String getNetworkIndex();
-    void setNetworkIndex(String networkIndex);
-
-    Client getClient();
-    void closeDb();
-
-    public BytesReference doReadJsonData( String dataTypeName, IsEsObject esId );
-    public BytesReference doReadJsonData(String dataTypeName, String esId);
-    public SearchHit[] doReadAllJsonData( int start, int length, String dataTypeName );
-    public SearchHit[] doReadByQueryJsonData( int start, int length, String dataTypeName, QueryBuilder query);
-
-    public String doWriteByteArray( String dataTypeName, IsEsObject esId, byte[] json);
-    public String doWriteJsonString( String dataTypeName, IsEsObject esId, String json);
-
-    public boolean doRemove( String dataTypeName, IsEsObject esId );
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseClientAbstract.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseClientAbstract.java
deleted file mode 100644
index 5a6554398..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseClientAbstract.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Herbert
- *
- */
-public class HtDatabaseClientAbstract implements HtDataBase, AutoCloseable {
-
-    private final Logger log = LoggerFactory.getLogger(HtDatabaseClientAbstract.class);
-
-    private final Client client;
-    private String esIndexAlias;
-
-    /**
-     * Simple database initialization. Query all ES configuration information from cluster node.
-     *
-     * @param esIndex Database index
-     * @param database database node descriptor
-     */
-    public HtDatabaseClientAbstract(String esIndex, @Nonnull HtDatabaseNode database) {
-
-        this.esIndexAlias = esIndex;
-        this.client = database.getClient();
-    }
-
-
-    /*----------------------------------
-     * some constructing functions, used by public constructors
-     */
-
-
-    /*----------------------------------
-     * Getter / Setter
-     */
-
-    @Override
-    public String getNetworkIndex() {
-        return esIndexAlias;
-    }
-
-    @Override
-    public void setNetworkIndex(String es_index) {
-        this.esIndexAlias = es_index;
-    }
-
-    @Override
-    public Client getClient() {
-        return client;
-    }
-
-    /*----------------------------------
-     * Functions
-     */
-
-    /**
-     * Close function
-     */
-    @Override
-    public void close() {
-        client.close();
-    }
-
-    /**
-     * Verify if index already created
-     *
-     * @return boolean accordingly
-     */
-    public boolean isExistsIndex() {
-
-        if (esIndexAlias == null) {
-            throw new IllegalArgumentException("Missing Index");
-        }
-
-        log.debug("Check status of ES index: {}", esIndexAlias);
-
-        final IndicesExistsResponse indexStatus =
-                client.admin().indices().prepareExists(esIndexAlias).execute().actionGet();
-
-        return indexStatus.isExists();
-
-    }
-
-
-    /**
-     * Create and write the mapping and setting of the index
-     *
-     * @param jsonIndexMappingSetting with mapping and setting definition Object or null for no
-     *        configuration
-     */
-    public void doCreateIndexWithMapping(JSONObject jsonIndexMappingSetting) {
-
-        if (esIndexAlias == null) {
-            throw new IllegalArgumentException("Missing Index");
-        }
-
-        try {
-            // Create index with mapping and setting
-            String esIndexName = esIndexAlias + "_v1";
-            log.debug("Create not existing ES index: {} with alias:{}", esIndexName, esIndexAlias);
-
-            doCreateIndexWithMappingsAndSettings(esIndexName, jsonIndexMappingSetting);
-
-            // Set Alias
-            log.debug("Set alias {} to index {}", esIndexAlias, esIndexName);
-            IndicesAliasesResponse setAliasResponse =
-                    client.admin().indices().prepareAliases().addAlias(esIndexName, esIndexAlias).execute().actionGet();
-            log.debug("CreateIndex response {}", setAliasResponse);
-
-        } catch (ElasticsearchException e) {
-            log.warn("ElasticsearchException: {}", e.getDetailedMessage());
-        }
-    }
-
-
-    /**
-     * Assign each mapping in the mappings section as separate mapping entry
-     *
-     * @param createIndexRequestBuilder builder for command to ES
-     * @param jsonIndexMappingSetting json with mapping information
-     */
-    private void doCreateIndexWithMappingsAndSettings(String esIndexName, JSONObject jsonIndexMappingSetting) {
-
-        CreateIndexRequestBuilder createIndexRequestBuilder = client.admin().indices().prepareCreate(esIndexName);
-        if (createIndexRequestBuilder == null) {
-            throw new HtDatabaseClientException("No client. Can not create index.", esIndexAlias);
-        }
-
-        if (jsonIndexMappingSetting != null) {
-            try {
-                doAddMappings(createIndexRequestBuilder, jsonIndexMappingSetting);
-                doAddSetting(createIndexRequestBuilder, jsonIndexMappingSetting);
-                log.debug(" doCreateIndexWithMapping");
-            } catch (RuntimeException e) {
-                log.info("Exception during adding mappings or settings to CreateIndexRequestBuilder. ", e);
-            }
-        }
-
-        CreateIndexResponse createResponse = createIndexRequestBuilder.execute().actionGet();
-        log.debug("CreateIndex response {}", createResponse);
-    }
-
-    /**
-     * Add one or more mappings to command
-     *
-     * @param createIndexRequestBuilder to add parameters
-     * @param jsonIndexMappingSetting contains mapping and setting information
-     */
-    private void doAddMappings(CreateIndexRequestBuilder createIndexRequestBuilder,
-            JSONObject jsonIndexMappingSetting) {
-
-        // If there are json information .. verify if they contain mappings
-        JSONObject jsonMapping = jsonIndexMappingSetting.optJSONObject("mappings");
-
-        // Handle optional mappings if requested
-        if (jsonMapping != null) {
-            log.debug("Set mapping for index {} {}", esIndexAlias, jsonMapping);
-
-            // For any reason the function below was not working without iterator
-            Set<String> keys = getStringKeySet(jsonMapping);
-            if (log.isDebugEnabled()) {
-                log.debug("Found length: {} keys: {}", jsonMapping.length(), keys.size());
-            }
-
-            for (String docType : keys) {
-                JSONObject jsonObject = jsonMapping.getJSONObject(docType);
-                if (jsonObject != null) {
-                    String jsonObjectString = jsonObject.toString();
-                    log.debug("Doctype:{} mapping:{}", docType, jsonObjectString);
-                    createIndexRequestBuilder.addMapping(docType, jsonObjectString);
-                    log.debug("Mapping created Doctype:{}", docType);
-                } else {
-                    log.debug("No jsonObject for docType {}", docType);
-                }
-            }
-        } else {
-            log.debug("No mapping requested for index {}", esIndexAlias);
-        }
-    }
-
-    /**
-     * Add one setting to command
-     *
-     * @param createIndexRequestBuilder to add parameters
-     * @param jsonIndexMappingSetting contains mapping and setting information
-     */
-    private void doAddSetting(CreateIndexRequestBuilder createIndexRequestBuilder, JSONObject jsonIndexMappingSetting) {
-        // Handle optional settings if requested
-        log.debug("Handle settings");
-        JSONObject jsonSettings = jsonIndexMappingSetting.optJSONObject("settings");
-        if (jsonSettings != null) {
-            log.debug("Set setting for index {} {}", esIndexAlias, jsonSettings);
-            createIndexRequestBuilder.setSettings(Settings.settingsBuilder().loadFromSource(jsonSettings.toString()));
-        } else {
-            log.debug("No settings requested for index {}", esIndexAlias);
-        }
-    }
-
-    /**
-     * Create Index with alias according to definition, but no mapping
-     */
-    public void doCreateIndex() {
-        doCreateIndexWithMapping(null);
-    }
-
-    /**
-     * Write one object into Database
-     *
-     * @param esId Database index
-     * @param dataTypeName Name of datatype
-     * @param json String in JSON format.
-     * @return esId of the object
-     */
-    @Override
-    public String doWriteJsonString(String dataTypeName, IsEsObject esId, String json) {
-        return doWriteByteArray(dataTypeName, esId, json.getBytes());
-    }
-
-    /**
-     * Write one object into Database
-     *
-     * @param esId Database index
-     * @param dataTypeName Name of datatype
-     * @param json String in JSON format.
-     * @return esId of the object
-     */
-
-    @Override
-    public String doWriteByteArray(String dataTypeName, IsEsObject esId, byte[] json) {
-        return doWriteRaw(dataTypeName, esId.getEsId(), json);
-    }
-
-    /**
-     * Write one object into Database
-     *
-     * @param dataTypeName Name of datatype
-     * @param id id of the object or null
-     * @param json Object as json
-     * @return esId of the Object
-     */
-    public String doWriteJsonObject(String dataTypeName, String id, JSONObject json) {
-        return doWriteRaw(dataTypeName, id, json.toString().getBytes());
-    }
-
-    /**
-     * Write one object into Database
-     *
-     * @param esId Database index or null
-     * @param dataTypeName Name of datatype
-     * @param json String in JSON format.
-     * @return esId of the object
-     */
-
-    public String doWriteRaw(String dataTypeName, String esId, byte[] json) {
-
-        if (esIndexAlias == null) {
-            throw new IllegalArgumentException("Missing Index");
-        }
-
-        IndexRequestBuilder request = esId == null || esId.isEmpty() ? client.prepareIndex(esIndexAlias, dataTypeName)
-                : client.prepareIndex(esIndexAlias, dataTypeName, esId);
-
-        IndexResponse response = null;
-        try {
-            response = request.setSource(json).execute().actionGet();
-        } catch (ElasticsearchException e) {
-            log.warn("ES Exception {} Json: {}", e.getMessage(), new String(json));
-        }
-
-        if (response == null) {
-            String jsonString = new String(json);
-            log.warn("Response null during write: {} {}", esId, jsonString);
-            return null;
-        } else {
-            return response.getId();
-        }
-    }
-
-    /**
-     * Write JSON Data. First level contains datatype, next level id Example "datatype" : { "id" : { } }
-     * @param json Object
-     */
-    public void doWriteJSONObject(JSONObject json) {
-
-        Set<String> docTypes = getStringKeySet(json);
-        log.debug("Found number of keys: {} keys: {}", json.length(), docTypes.size());
-        for (String docType : docTypes) {
-            JSONObject objects = json.optJSONObject(docType);
-            if (objects == null) {
-                log.debug("Skip json {} with class {}", docType, json.get(docType).getClass());
-            } else {
-                doWriteJsonObjectsWithIds(docType, objects);
-            }
-        }
-    }
-
-    /**
-     * Write object and Id of object for a doctype
-     * @param docType of the objects
-     * @param objects a bunch of objects with ids as object name
-     */
-    private void doWriteJsonObjectsWithIds(String docType, JSONObject objects) {
-        Set<String> ids = getStringKeySet(objects);
-        log.debug("write doctype {} with elements {}", docType, ids.size());
-        for (String id : ids) {
-            JSONObject jsonIdObject = objects.optJSONObject(id);
-            if (jsonIdObject == null) {
-                log.debug("Skip jsonsub {} with class {}", id, objects.get(id).getClass());
-            } else {
-                if (log.isTraceEnabled()) {
-                    log.trace("Jsonsub object of id {} '{}'", id, jsonIdObject);
-                }
-                this.doWriteRaw(docType, id, jsonIdObject.toString().getBytes());
-            }
-        }
-    }
-
-    /**
-     * Remove Object from database
-     */
-    @Override
-    public boolean doRemove(String dataTypeName, IsEsObject esId) {
-
-        if (esIndexAlias == null) {
-            throw new IllegalArgumentException("Missing Index");
-        }
-
-        DeleteResponse response =
-                client.prepareDelete(esIndexAlias, dataTypeName, esId.getEsId()).execute().actionGet();
-
-        return response.isFound();
-    }
-
-    /**
-     * Read Json Object from database
-     */
-    @Override
-    public @Nullable BytesReference doReadJsonData(String dataTypeName, IsEsObject esId) {
-
-        if (esId.getEsId() == null) {
-            throw new IllegalArgumentException("Read access to object without database Id");
-        }
-
-        return doReadJsonData(dataTypeName, esId.getEsId());
-    }
-
-    /**
-     * Read Json Object from database
-     */
-    @Override
-    public @Nullable BytesReference doReadJsonData(String dataTypeName, String esId) {
-
-        log.debug("NetworkIndex read: {}", esIndexAlias);
-
-        GetResponse response = client.prepareGet(esIndexAlias, dataTypeName, esId)
-                // .setOperationThreaded(false)
-                .execute().actionGet();
-
-        return response.isExists() ? response.getSourceAsBytesRef() : null;
-    }
-
-
-    @Override
-    public SearchHit[] doReadByQueryJsonData(int start, int length, String dataTypeName, QueryBuilder qb) {
-
-        log.debug("NetworkIndex query and read: {}", esIndexAlias);
-
-        SearchResponse response1 = client.prepareSearch(esIndexAlias).setTypes(dataTypeName).setQuery(qb).setFrom(start)
-                .setSize(length).execute().actionGet();
-
-        return response1.getHits().hits();
-    }
-
-
-    @Override
-    public SearchHit[] doReadAllJsonData(int start, int length, String dataTypeName) {
-        // Use query
-        QueryBuilder qb = QueryBuilders.matchAllQuery();
-        return doReadByQueryJsonData(start, length, dataTypeName, qb);
-    }
-
-    /**
-     * Write Json datetype that is specified by file to ES
-     *
-     * @param dataType ES Datatype name
-     * @param fileName file name
-     */
-    public void writeJsonObjectsFromFile(String dataType, String fileName) {
-
-        log.debug("Start: Index: '{}' ' datatype: '{}'  File: '{}'", esIndexAlias, dataType, fileName);
-
-        String content = null;
-
-        try {
-            content = new String(Files.readAllBytes(Paths.get(fileName)), StandardCharsets.UTF_8);
-        } catch (IOException e1) {
-            log.warn("Can not read file: {}", e1.getMessage());
-        }
-
-        if (content != null && content.charAt(0) == 0xfeff) {
-            content = content.substring(1);
-            log.debug("Delete first char {} {}", dataType, fileName);
-        }
-
-        if (content != null) {
-            IndexResponse response = null;
-            try {
-                response = client.prepareIndex(esIndexAlias, dataType).setSource(content).execute().actionGet();
-            } catch (ElasticsearchException e) {
-                log.error("ElasticsearchException during write:  for {} from {} from {}", e.getMessage(), dataType, fileName);
-            } catch (Exception e) {
-                log.error("Exception during write:  for {} from {} from {}", e.getMessage(), dataType, fileName);
-            }
-
-            if (response != null) {
-                if (!response.isCreated()) {
-                    String responseAsString = response.toString();
-                    log.warn("Jackson Response not created: {} {} {}", dataType, fileName, responseAsString);
-                } else {
-                    log.debug("Created: {}", response.getId());
-                }
-            } else {
-                log.warn("Jackson Response null after write {} {}", dataType, fileName);
-            }
-        }
-
-    }
-
-    @Override
-    public void closeDb() {
-        if (client != null) {
-            client.close();
-        }
-    }
-
-
-    // For any reason the function json.keySet() was not working in Oxygen => replaced by iterator
-    public static @Nonnull Set<String> getStringKeySet(JSONObject json) {
-        Set<String> keys = new HashSet<>();
-        Iterator<?> iterator = json.keys();
-        while (iterator.hasNext()) {
-            keys.add((String) iterator.next());
-        }
-        return keys;
-    }
-
-
-    private static class HtDatabaseClientException extends RuntimeException {
-
-        private static final long serialVersionUID = 1L;
-
-        public HtDatabaseClientException(String string, String esIndexAlias) {
-            super(string + " Effected index: " + "esIndexAlias");
-        }
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseNode.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseNode.java
deleted file mode 100644
index 93a5bbd40..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseNode.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
-import java.io.File;
-import java.io.IOException;
-import java.net.DatagramSocket;
-import java.net.ServerSocket;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import org.apache.lucene.util.Version;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.node.Node;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AkkaConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.EsConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.GeoConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ClusterNodeInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HtDatabaseNode implements AutoCloseable {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HtDatabaseNode.class);
-    private static final String DBCONFIGFILENAME = "etc/elasticsearch.yml";
-    private static final String RESFOLDER_PLUGIN = "elasticsearch/plugins";
-    private static final String RESFOLDER_PLUGINHEAD = RESFOLDER_PLUGIN + "/head";
-    private static final String RESFOLDER_PLUGINDELETE = RESFOLDER_PLUGIN + "/delete-by-query";
-    private static int MIN_PORT_NUMBER = 1024;
-    private static int MAX_PORT_NUMBER = 65535;
-    private static int ES_PORT = 9200;
-    private static int DELAYSECONDS = 120;
-    private static String PLUGINFOLDER = "etc/elasticsearch-plugins";
-
-    private static HtDatabaseNode oneNode = null;
-    private static Object initializationLock = new Object();
-    private static Integer initializedTarget = 0;
-    private static Integer initializedReached = 0;
-
-    private final Node node;
-
-    private HtDatabaseNode() {
-        LOGGER.debug("Start elasticsearch service");
-
-        LOGGER.debug("Lucine version: " + Version.LATEST);
-
-        node = nodeBuilder().settings(Settings.builder().put("path.home", "etc").put("path.conf", "etc")).node();
-        LOGGER.info("Starting Database service. Wait {} s", DELAYSECONDS);
-        // Wait for orange status for single node without redundancy
-        ClusterHealthResponse nodeStatus = node.client().admin().cluster().prepareHealth().setWaitForYellowStatus()
-                .setTimeout(TimeValue.timeValueSeconds(DELAYSECONDS)).get();
-
-        LOGGER.debug("Elasticsearch service started with status {}", nodeStatus.toString());
-    }
-
-    /**
-     * Close node
-     */
-    @Override
-    public void close() {
-        node.close();
-        oneNode = null; // Release the one instance that was started !
-    }
-
-    /**
-     * Provide indication if all Index initializations are done.
-     *
-     * @return true if all index initializations are ready, false if not
-     */
-    public Boolean getInitialized() {
-        synchronized (initializationLock) {
-            return initializedTarget != 0 && initializedReached == initializedTarget;
-        }
-    }
-
-    public void setInitializedReached() {
-        synchronized (initializationLock) {
-            HtDatabaseNode.initializedReached++;
-        }
-    }
-
-    public void setInitializedTarget() {
-        synchronized (initializationLock) {
-            HtDatabaseNode.initializedTarget++;
-        }
-    }
-
-    public Client getClient() {
-        return node.client();
-    }
-
-
-    /*
-     * --------------------------------------- Static functions below
-     */
-
-
-    // Visibility package for test purpose
-    static void checkorcreateplugins(String pluginFolder) {
-        File f = new File(pluginFolder);
-        if (!f.exists()) {
-            f.mkdir();
-        }
-        if (!Resources.copyFolderInto(RESFOLDER_PLUGINHEAD, PLUGINFOLDER, RESFOLDER_PLUGIN)) {
-            throw new IllegalArgumentException("Copy not successfull Name: " + RESFOLDER_PLUGINHEAD + " folder src "
-                    + PLUGINFOLDER + " folder dst " + RESFOLDER_PLUGIN);
-        }
-       //Normal JAR loaded by classloader as part of the bundle
-       if (!Resources.copyFolderInto(RESFOLDER_PLUGINDELETE, PLUGINFOLDER, RESFOLDER_PLUGIN)) {
-            throw new IllegalArgumentException("Copy not successfull Name: " + RESFOLDER_PLUGINDELETE + " folder src "
-                    + PLUGINFOLDER + " folder dst " + RESFOLDER_PLUGIN);
-       }
-    }
-
-    /**
-     * Checks to see if a specific port is available.
-     *
-     * @param port the port to check for availability
-     */
-    private static boolean isPortAvailable(int port) {
-        if (port < MIN_PORT_NUMBER || port > MAX_PORT_NUMBER) {
-            throw new IllegalArgumentException("Invalid start port: " + port);
-        }
-
-        ServerSocket ss = null;
-        DatagramSocket ds = null;
-        try {
-            ss = new ServerSocket(port);
-            ss.setReuseAddress(true);
-            ds = new DatagramSocket(port);
-            ds.setReuseAddress(true);
-            return true;
-        } catch (IOException e) {
-        } finally {
-            if (ds != null) {
-                ds.close();
-            }
-
-            if (ss != null) {
-                try {
-                    ss.close();
-                } catch (IOException e) {
-                    /* should not be thrown */
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static void checkorcreateConfigFile(EsConfig config, AkkaConfig akkaConfig, GeoConfig geoConfig) {
-        File f = new File(DBCONFIGFILENAME);
-        if (!f.exists()) {
-            LOGGER.debug("no " + DBCONFIGFILENAME + " found - extracting from resources");
-            if (Resources.extractFileTo("elasticsearch/elasticsearch.yml", f)) {
-                // replace template values
-                LOGGER.debug("replace template values with config:" + config);
-                Charset charset = StandardCharsets.UTF_8;
-                try {
-                    Path p = f.toPath();
-                    String hostName = "0.0.0.0"; // Default as initialisation value
-                    if (akkaConfig != null && akkaConfig.isCluster()) {
-                        LOGGER.debug("cluster configuration found");
-                        hostName = akkaConfig.getClusterConfig().getHostName(hostName);
-                        String clusterDBName = akkaConfig.getClusterConfig().getDBClusterName(null);
-                        String nodeName = String.format("node%d.%s", akkaConfig.getClusterConfig().getRoleMemberIndex(),
-                                clusterDBName);
-                        if (clusterDBName != null) {
-                            config.setCluster(clusterDBName);
-                            config.setNode(nodeName);
-                            config.save();
-                            LOGGER.info("set db name to " + clusterDBName + " nodename=" + nodeName);
-                        } else {
-                            LOGGER.warn("unable to set correct db clustername");
-                        }
-                    }
-                    String content = new String(Files.readAllBytes(p), charset);
-                    content = content.replaceAll("\\$clustername", config.getCluster())
-                            .replaceAll("\\$nodename", config.getNode()).replaceAll("\\$hostname", hostName);
-
-                    // add cluster configuration
-                    if (akkaConfig != null && akkaConfig.isCluster()) {
-                        List<ClusterNodeInfo> seedNodes = akkaConfig.getClusterConfig().getSeedNodes();
-                        String nodesJSONString = "[\"" + seedNodes.get(0).getRemoteAddress() + "\"";
-                        for (int i = 1; i < seedNodes.size(); i++) {
-                            nodesJSONString += ",\"" + seedNodes.get(i).getRemoteAddress() + "\"";
-                        }
-                        nodesJSONString += "]";
-                        content += System.lineSeparator()
-                                + String.format("discovery.zen.ping.unicast.hosts: %s", nodesJSONString);
-
-                        if (geoConfig != null) {
-                            LOGGER.debug("adding zone configuration");
-                            content += System.lineSeparator() + String
-                                    .format("cluster.routing.allocation.awareness.force.zone.values: zone1,zone2");
-                            content += System.lineSeparator()
-                                    + String.format("cluster.routing.allocation.awareness.attributes: zone");
-                            if (geoConfig.isPrimary(akkaConfig.getClusterConfig().getRoleMember())) {
-                                content += System.lineSeparator() + String.format("node.zone: zone1");
-                                LOGGER.debug("setting zone to zone1");
-                            } else {
-                                content += System.lineSeparator() + String.format("node.zone: zone2");
-                                LOGGER.debug("setting zone to zone2");
-                            }
-                        }
-                    }
-                    Files.write(p, content.getBytes(charset));
-                } catch (IOException e) {
-                    LOGGER.warn("problem replacing values in file: " + e.getMessage());
-
-                }
-            } else {
-                LOGGER.warn("problem writing database.yml to etc folder from res");
-            }
-        }
-    }
-
-    /**
-     * Start as singleton
-     *
-     * @param config data
-     * @param akkaConfig data
-     * @param geoConfig data
-     * @return the node or null if external node used
-     */
-    public static HtDatabaseNode start(EsConfig config, AkkaConfig akkaConfig, GeoConfig geoConfig) {
-        if (isPortAvailable(ES_PORT)) {
-            LOGGER.info("ES Port not in use. Start internal ES.");
-            if (oneNode == null) {
-                checkorcreateplugins(PLUGINFOLDER);
-                checkorcreateConfigFile(config, akkaConfig, geoConfig);
-                oneNode = new HtDatabaseNode();
-            } else {
-                throw new IllegalStateException(
-                        "Database is already started, but can only be started once. Stop here.");
-            }
-        } else {
-            LOGGER.info("ES Port in use. External ES used.");
-        }
-
-        return oneNode;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseUpdateFile.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseUpdateFile.java
deleted file mode 100644
index 186b89c6c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseUpdateFile.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-public class HtDatabaseUpdateFile extends ZipFile {
-
-    public static final String FILENAME_DEFAULT = "elasticsearch_update.zip";
-
-    public class EsUpdateObject {
-        public final String Uri;
-        public final String Method;
-        public final JSONObject Body;
-
-        public EsUpdateObject(JSONObject o) {
-            this.Uri = o.getString("uri");
-            this.Method = o.getString("method");
-            this.Body = o.getJSONObject("body");
-        }
-    }
-
-    public interface FileReadCallback {
-        void read(EsUpdateObject obj,String filename);
-
-        void onerror(String filename,IOException e);
-    }
-
-    private static final Comparator<ZipEntry> byfilenameComparator = (o1, o2) -> o1.getName().compareTo(o2.getName());
-
-    public HtDatabaseUpdateFile(String filename) throws IOException {
-        super(filename);
-    }
-
-    private static String readFile(final InputStream s) throws IOException {
-        // read file
-        BufferedReader in = new BufferedReader(new InputStreamReader(s));
-        StringBuilder sb = new StringBuilder();
-        String inputLine;
-        while ((inputLine = in.readLine()) != null) {
-            sb.append(inputLine);
-        }
-        in.close();
-        s.close();
-        return sb.toString();
-    }
-
-    public boolean readFiles(FileReadCallback cb) {
-        boolean r=true;
-        Enumeration<? extends ZipEntry> entries = this.entries();
-        ArrayList<? extends ZipEntry> list = Collections.list(entries);
-        Collections.sort(list, byfilenameComparator);
-        for (ZipEntry entry : list) {
-            if (entry.isDirectory()) {
-                continue;
-            }
-            try {
-                InputStream stream = this.getInputStream(entry);
-                Object data = new JSONTokener(readFile(stream)).nextValue();
-                stream.close();
-                if(data instanceof JSONArray)
-                {
-                    JSONArray a=(JSONArray)data;
-                    for(int i=0;i<a.length();i++)
-                    {
-                        cb.read(new EsUpdateObject(a.getJSONObject(i)),entry.getName());
-                    }
-                }
-                else if(data instanceof JSONObject)
-                {
-                    cb.read(new EsUpdateObject( (JSONObject)data),entry.getName());
-                }
-            } catch (IOException e) {
-                r=false;
-                cb.onerror(entry.getName(),e);
-            }
-        }
-        return r;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseWebAPIClient.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseWebAPIClient.java
deleted file mode 100644
index ed09d34cd..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDatabaseWebAPIClient.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class HtDatabaseWebAPIClient {
-
-    private static Logger LOG = LoggerFactory.getLogger(HtDatabaseWebAPIClient.class);
-    private static final int BUFSIZE = 1024;
-    private static final String CHARSET = "UTF-8";
-    private final String host;
-    private final int port;
-
-    public HtDatabaseWebAPIClient() {
-        this.host = "http://localhost";
-        this.port = 9200;
-    }
-
-    public String sendRequest(String uri, String method, JSONObject body) throws IOException {
-        LOG.debug("try to send request with uri=" + uri + " as method=" + method);
-        String sresponse = "";
-        int responseCode = -1;
-
-        if (body != null) {
-            LOG.trace("body: {}", body);
-            InputStream response = null;
-            String surl = String.format("%s:%d%s", this.host, this.port, uri);
-            URL url = new URL(surl);
-            URLConnection urlConnection = url.openConnection();
-            if (urlConnection instanceof HttpURLConnection) {
-                HttpURLConnection http = (HttpURLConnection) urlConnection;
-                http.setRequestMethod(method);
-                http.setDoOutput(true);
-                http.setRequestProperty("Content-Type", "application/json");
-                // send request
-                // Send the message to destination
-                if (!method.equals("GET")) {
-                    try (OutputStream output = http.getOutputStream()) {
-                        output.write(body.toString().getBytes(CHARSET));
-                    }
-                }
-                responseCode = http.getResponseCode();
-                // Receive answer
-                if (responseCode >= 200 && responseCode < 300) {
-                    response = http.getInputStream();
-                } else {
-                    response = http.getErrorStream();
-                    if (response == null) {
-                        http.getInputStream();
-                    }
-                }
-            }
-            byte[] buffer = new byte[BUFSIZE];
-            int len = 0;
-            if (response != null) {
-                while (true) {
-                    len = response.read(buffer, 0, BUFSIZE);
-                    if (len <= 0) {
-                        break;
-                    }
-                    sresponse += new String(buffer, 0, len, CHARSET);
-                }
-                response.close();
-            } else {
-                LOG.debug("response is null");
-            }
-        }
-        LOG.debug("ResponseCode: " + responseCode);
-        LOG.trace("Response: " + sresponse);
-
-        return sresponse;
-    }
-
-	public void insertEntry(String index, String type, JSONObject data) throws IOException {
-		this.sendRequest(String.format("/%s/%s/", index,type), "POST", data);
-	}
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/IndexClientBuilder.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/IndexClientBuilder.java
deleted file mode 100644
index facc1c6f7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/IndexClientBuilder.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.json.JSONObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Setup index in the database
- * @author herbert
- *
- */
-public class IndexClientBuilder implements AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IndexClientBuilder.class);
-
-    /** Index name to be used */
-    private final String index;
-    /** Location of mapping data **/
-    private String mappingSettingFileName = null;
-    /** Location of configuration data **/
-    private String modelDataDirectory = null;
-
-	private final ScheduledExecutorService scheduler;
-    private HtDatabaseClientAbstract client;
-    private HtDatabaseNode databaseNode;
-
-
-    // --- Construct and initialize
-
-    public IndexClientBuilder(String index) {
-    	this.index = index;
-    	this.databaseNode = null;
-    	this.scheduler = Executors.newSingleThreadScheduledExecutor();
-    }
-
-    // Additional setter functions
-
-    public IndexClientBuilder setMappingSettingJsonFileName(String jsonFileName) {
-    	this.mappingSettingFileName = jsonFileName;
-    	return(this);
-    }
-
-    public IndexClientBuilder setModelDataDirectory(String jsonDirectory) {
-    	this.modelDataDirectory = jsonDirectory;
-    	return(this);
-    }
-
-    public HtDatabaseClientAbstract create(HtDatabaseNode database) {
-		LOG.info("Create {} start with node", this.getClass().getSimpleName() );
-     	this.databaseNode = database;
-		client = new HtDatabaseClientAbstract(index, database);
-		setupIndex();
-       	return client;
-    }
-
-
-    public void stop() {
-	   this.scheduler.shutdown();
-    }
-
-    @Override
-    public void close() throws Exception {
-	   stop();
-    }
-
-    private void setupIndex() {
-		if (! client.isExistsIndex()) {
-			LOG.info("Index not existing ... create index");
-
-			// Initialisation 1
-			if (mappingSettingFileName != null) {
-  				JSONObject indexconfigdata=Resources.getJSONFile(mappingSettingFileName);
-    			client.doCreateIndexWithMapping(indexconfigdata);
-			} else
-				client.doCreateIndex();
-
-			// Initialisation 2 - start asynchron initialization and let it run
-   			scheduler.schedule(fillDatabase, 0, TimeUnit.SECONDS);
-		}
-    }
-
-    private final Runnable fillDatabase = new Runnable() {
-    	@Override
-    	public void run() {
-    		if (databaseNode != null) {
-    			databaseNode.setInitializedTarget();
-    		}
-    		try { //Prevent ending task by exception
-				if (modelDataDirectory != null) {
-					LOG.info("... write initial data for index {}",index);
-					List<JSONObject> dataList=Resources.getJSONFiles(modelDataDirectory, false);
-					LOG.debug("received number of objects: {} of index {}", dataList.size(), index);
-					for (JSONObject da: dataList) {
-						client.doWriteJSONObject(da);
-					}
-					LOG.debug("wrote all objects for index {}", index);
-				} else {
-					LOG.info("No initial data for index {}",index);
-				}
-			} catch (Exception e) {
-				LOG.warn("Problem during initialization of index "+index+" {}", e);
-			}
-    		if (databaseNode != null) {
-    			databaseNode.setInitializedReached();
-    		}
-    	}
-    };
-
-    /*---------------------------------------------------------
-     * static files
-     */
-
-    public static IndexClientBuilder getBuilder(String index) {
-    	return new IndexClientBuilder(index);
-    }
-
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/IniConfigurationFile.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/IniConfigurationFile.java
deleted file mode 100644
index ebb46547e..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/IniConfigurationFile.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IniConfigurationFile {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IniConfigurationFile.class);
-
-    private static final String SECTIONNAME_ROOT = "";
-    private static final String DELIMITER = "=";
-    private static final String COMMENTCHARS[] = {"#", ";"};
-    private static final String LR = "\n";
-
-    private final File mFile;
-    private final List<Section> sections;
-
-    public IniConfigurationFile(File f) {
-        this.mFile = f;
-        this.sections = new ArrayList<>();
-        this.sections.add(new Section(SECTIONNAME_ROOT));
-    }
-
-    public void load() throws ConfigurationException {
-        String curSectionName = SECTIONNAME_ROOT;
-        LOG.debug("loading file");
-        BufferedReader br = null;
-        try {
-            br = new BufferedReader(new FileReader(this.mFile));
-            for (String line; (line = br.readLine()) != null;) {
-                line = line.trim();
-                if (line.isEmpty()) {
-                    continue;
-                }
-                if (line.startsWith("[") && line.endsWith("]")) {
-                    curSectionName = line.substring(1, line.length() - 1);
-                    this.addSection(curSectionName);
-                } else {
-                    this.getSection(curSectionName).addLine(line);
-                }
-            }
-
-        } catch (Exception e) {
-            throw new ConfigurationException(e.getMessage());
-        } finally {
-            try {
-                if (br != null) {
-                    br.close();
-                }
-            } catch (IOException e) {
-            }
-        }
-        LOG.debug("finished loading file");
-        LOG.debug("start parsing sections");
-        for (Section section : this.sections) {
-            section.parseLines();
-        }
-        LOG.debug("finished parsing " + this.sections.size() + " sections");
-    }
-
-    private Section getSection(String name) {
-        for (Section s : this.sections) {
-            if (s.Name.equals(name)) {
-                return s;
-            }
-        }
-        return this.addSection(name);
-
-    }
-
-    private Section addSection(String name) {
-
-        Section s = new Section(name);
-        this.sections.add(s);
-        return s;
-    }
-
-    public void reLoad() throws ConfigurationException {
-        this.sections.clear();
-        this.sections.add(new Section(SECTIONNAME_ROOT));
-        this.load();
-    }
-
-
-    public void setProperty(String key, String value) {
-        Section s;
-        if (key.contains(".")) {
-            s = this.getSection(key.substring(0, key.indexOf(".")));
-            key = key.substring(key.indexOf(".") + 1);
-        } else {
-            s = this.getSection(SECTIONNAME_ROOT);
-        }
-        s.setProperty(key, value);
-    }
-
-
-    public void setProperty(String key, int value) {
-        Section s;
-        if (key.contains(".")) {
-            s = this.getSection(key.substring(0, key.indexOf(".")));
-            key = key.substring(key.indexOf(".") + 1);
-        } else {
-            s = this.getSection(SECTIONNAME_ROOT);
-        }
-        s.setProperty(key, String.format("%d", value));
-    }
-
-
-    public void setProperty(String key, boolean value) {
-        Section s;
-        if (key.contains(".")) {
-            s = this.getSection(key.substring(0, key.indexOf(".")));
-            key = key.substring(key.indexOf(".") + 1);
-        } else {
-            s = this.getSection(SECTIONNAME_ROOT);
-        }
-        s.setProperty(key, value ? "true" : "false");
-    }
-
-    public void setProperty(String key, Object value) {
-        this.setProperty(key, value == null ? "null" : value.toString());
-    }
-
-    public void save() {
-        try (BufferedWriter bw = new BufferedWriter(new FileWriter(this.mFile, false))) {
-            for (Section section : this.sections) {
-                if (section.hasValues()) {
-                    bw.write(String.join(LR, section.toLines()) + LR + LR);
-                }
-            }
-            bw.close();
-        } catch (Exception e) {
-            LOG.warn("problem saving value: " + e.getMessage());
-        }
-    }
-
-    public Section subset(String section) {
-        return this.getSection(section);
-    }
-
-    public static class ConfigurationException extends Exception {
-
-        private static final long serialVersionUID = 733061908616404383L;
-
-        public ConfigurationException(String m) {
-            super(m);
-        }
-    }
-
-    public static class ConversionException extends Exception {
-        private static final long serialVersionUID = 5179891576029923079L;
-
-        public ConversionException(String m) {
-            super(m);
-        }
-    }
-
-    private static class SectionValue {
-        private String Value;
-        private final List<String> Comments;
-        private boolean IsUncommented;
-
-        public SectionValue(String value) {
-            this(value, new ArrayList<String>(), false);
-        }
-
-        public SectionValue(String value, List<String> commentsForValue, boolean isuncommented) {
-            this.Comments = commentsForValue;
-            this.Value = value;
-            this.IsUncommented = isuncommented;
-        }
-    }
-
-    public static class Section {
-        private final String Name;
-        private final List<String> rawLines;
-        private final LinkedHashMap<String, SectionValue> values;
-
-        public Section(String name) {
-            LOG.debug("new section created:" + name);
-            this.Name = name;
-            this.rawLines = new ArrayList<>();
-            this.values = new LinkedHashMap<>();
-        }
-
-        public void addLine(String line) {
-            LOG.trace("adding raw line:" + line);
-            this.rawLines.add(line);
-        }
-
-        public String getProperty(String key) {
-            return this.getProperty(key, null);
-        }
-
-        public String getProperty(String key, String defValue) {
-            if (values.containsKey(key)) {
-                return values.get(key).Value;
-            }
-            return defValue;
-        }
-
-        public void setProperty(String key, String value) {
-            boolean isuncommented = this.isCommentLine(key);
-            if (isuncommented) {
-                key = key.substring(1);
-            }
-            if (this.values.containsKey(key)) {
-                this.values.get(key).Value = value;
-                this.values.get(key).IsUncommented = isuncommented;
-            } else {
-                SectionValue sv = new SectionValue(value);
-                sv.IsUncommented = isuncommented;
-                this.values.put(key, sv);
-            }
-        }
-
-        public void parseLines() {
-            this.values.clear();
-            List<String> commentsForValue = new ArrayList<>();
-            boolean uncommented = false;
-            for (String line : rawLines) {
-
-                if (this.isCommentLine(line)) {
-                    if (!line.contains(DELIMITER)) {
-                        commentsForValue.add(line);
-                        continue;
-                    } else {
-                        uncommented = true;
-                        line = line.substring(1);
-                    }
-                }
-                if (!line.contains(DELIMITER)) {
-                    continue;
-                }
-                String hlp[] = line.split(DELIMITER);
-                if (hlp.length > 1) {
-                    String key = hlp[0];
-                    String value =
-                            line.length() > (key + DELIMITER).length() ? line.substring((key + DELIMITER).length())
-                                    : "";
-                    if (this.values.containsKey(key)) {
-                        this.values.get(key).Value = value;
-                    } else {
-                        this.values.put(key, new SectionValue(value, commentsForValue, uncommented));
-                        commentsForValue = new ArrayList<>();
-                    }
-                } else {
-                    LOG.warn("ignoring unknown formatted line:" + line);
-                }
-                uncommented = false;
-            }
-        }
-
-        private boolean isCommentLine(String line) {
-            for (String c : COMMENTCHARS) {
-                if (line.startsWith(c)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public String[] toLines() {
-            List<String> lines = new ArrayList<>();
-            if (!this.Name.isEmpty()) {
-                lines.add("[" + this.Name + "]");
-            }
-            for (Entry<String, SectionValue> entry : this.values.entrySet()) {
-                if (entry.getValue().Comments.size() > 0) {
-                    for (String comment : entry.getValue().Comments) {
-                        lines.add(comment);
-                    }
-                }
-                lines.add((entry.getValue().IsUncommented ? COMMENTCHARS[0] : "") + entry.getKey() + DELIMITER
-                        + entry.getValue().Value);
-            }
-            String[] alines = new String[lines.size()];
-            return lines.toArray(alines);
-        }
-
-        public String getString(String key, String def) {
-            return this.getProperty(key, def);
-        }
-
-        public boolean getBoolean(String key, boolean def) throws ConversionException {
-            String v = this.getProperty(key);
-            if (v == null || v.isEmpty()) {
-                return def;
-            }
-            if (v.equals("true")) {
-                return true;
-            }
-            if (v.equals("false")) {
-                return false;
-            }
-            throw new ConversionException("invalid value for key " + key);
-        }
-
-        public int getInt(String key, int def) throws ConversionException {
-            String v = this.getProperty(key);
-            if (v == null || v.isEmpty()) {
-                return def;
-            }
-            try {
-                return Integer.parseInt(v);
-            } catch (NumberFormatException e) {
-                throw new ConversionException(e.getMessage());
-            }
-        }
-
-        public long getLong(String key, long def) throws ConversionException {
-            String v = this.getProperty(key);
-            if (v == null || v.isEmpty()) {
-                return def;
-            }
-            try {
-                return Long.parseLong(v);
-            } catch (NumberFormatException e) {
-                throw new ConversionException(e.getMessage());
-            }
-        }
-
-        public boolean hasValues() {
-            return this.values.size() > 0;
-        }
-
-        public boolean hasKey(String key) {
-            return this.values.containsKey(key);
-        }
-
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementBase.java
deleted file mode 100644
index f6fdb13b6..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementBase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-/**
- *
- */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author herbert
- *
- */
-@SuppressWarnings("deprecation")
-public abstract class ONFCoreNetworkElementBase implements AutoCloseable, ONFCoreNetworkElementRepresentation {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElementBase.class);
-
-    protected static final String EMPTY = "";
-
-    private final String mountPointNodeName;
-    private final DataBroker netconfNodeDataBroker;
-    private final Capabilities capabilities;
-
-    protected ONFCoreNetworkElementBase(String mountPointNodeName, DataBroker netconfNodeDataBroker,
-            Capabilities capabilities) {
-        LOG.info("Create ONFCoreNetworkElementBase");
-        this.mountPointNodeName = mountPointNodeName;
-        this.netconfNodeDataBroker = netconfNodeDataBroker;
-        this.capabilities = capabilities;
-
-    }
-
-    @Override
-    public String getMountPointNodeName() {
-        return mountPointNodeName;
-    }
-
-    /**
-     * @return the netconfNodeDataBroker
-     */
-    public DataBroker getNetconfNodeDataBroker() {
-        return netconfNodeDataBroker;
-    }
-
-    /**
-     * @return the capabilities
-     */
-    public Capabilities getCapabilities() {
-        return capabilities;
-    }
-
-    /*---------------------------------------------------------------
-     * Getter/ Setter
-     */
-
-    public String getMountpoint() {
-        return mountPointNodeName;
-    }
-
-    public DataBroker getDataBroker() {
-        return netconfNodeDataBroker;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementFactory.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementFactory.java
deleted file mode 100644
index 3455f1681..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementFactory.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
-
-import com.google.common.base.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.OnfMicrowaveModel;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev170324;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev180907;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev181010;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Create a Network Element representation according to the capability
- * information. The capabilities are more than an ODL-QName. After the ? other
- * terms than "revision" are provided.
- *
- */
-@SuppressWarnings("deprecation")
-public class ONFCoreNetworkElementFactory {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElementFactory.class);
-
-    public static @Nonnull ONFCoreNetworkElementRepresentation create(String mountPointNodeName, DataBroker dataBroker,
-            WebSocketServiceClient webSocketService, HtDatabaseEventsService databaseService,
-            InstanceIdentifier<Node> instanceIdentifier, DataBroker mountpointDataBroker, ProviderClient dcaeProvider,
-            @Nullable ProviderClient aotsmClient, MaintenanceService maintenanceService,
-            NotificationDelayService<ProblemNotificationXml> notificationDelayService) {
-
-        ONFCoreNetworkElementRepresentation res = null;
-        try (ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction();){
-            Optional<Node> nodeOption = tx.read(LogicalDatastoreType.OPERATIONAL, instanceIdentifier).checkedGet();
-            if (nodeOption.isPresent()) {
-                Node node = nodeOption.get();
-                NetconfNode nnode = node.augmentation(NetconfNode.class);
-                if (nnode != null) {
-                    ConnectionStatus csts = nnode.getConnectionStatus();
-                    if (csts == ConnectionStatus.Connected) {
-                        Capabilities capabilities = Capabilities.getAvailableCapabilities(nnode);
-                        LOG.info("Mountpoint {} capabilities {}", mountPointNodeName, capabilities);
-                        res = build(mountPointNodeName, capabilities, mountpointDataBroker,
-                                webSocketService, databaseService, dcaeProvider, aotsmClient, maintenanceService,
-                                notificationDelayService);
-                        LOG.info("ONFCoreNetworkElementRepresentation12 value is not null? " + (res != null));
-                    }
-                }
-            }
-            tx.close();
-        } catch (ReadFailedException | IllegalArgumentException e) {
-            LOG.warn("Can not generate specific NE Version representation. ", e);
-        }
-        if (res == null) {
-            res = new ONFCoreNetworkElementEmpty(mountPointNodeName);
-        }
-        LOG.info("Mointpoint {} started as {}", mountPointNodeName, res.getClass().getSimpleName());
-        return res;
-    }
-
-    public static @Nonnull ONFCoreNetworkElementRepresentation getEmpty(String mountPointNodeName) {
-    	return new ONFCoreNetworkElementEmpty(mountPointNodeName);
-    }
-
-    /**
-     * Check capabilities are matching the this specific implementation and create network element
-     * representation if so.
-     *
-     * @param mountPointNodeName as String
-     * @param capabilities of the specific network element
-     * @param netconfNodeDataBroker for the network element specific data
-     * @param webSocketService to forward event notifications
-     * @param databaseService to access the database
-     * @param dcaeProvider to forward problem / change notifications
-     * @return created Object if conditions are OK or null if not.
-     */
-    private static @Nullable ONFCoreNetworkElementRepresentation build(String mountPointNodeName, Capabilities capabilities,
-            DataBroker netconfNodeDataBroker, WebSocketServiceClient webSocketService,
-            HtDatabaseEventsService databaseService, ProviderClient dcaeProvider, @Nullable ProviderClient aotsmClient,
-            MaintenanceService maintenanceService,
-            NotificationDelayService<ProblemNotificationXml> notificationDelayService) {
-
-        if (capabilities.isSupportingNamespaceAndRevision(NetworkElement.QNAME)) {
-            OnfMicrowaveModel onfMicrowaveModel = null;
-
-            if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev170324.QNAME)) {
-                onfMicrowaveModel = new WrapperMicrowaveModelRev170324();
-            } else if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev180907.QNAME)) {
-                onfMicrowaveModel = new WrapperMicrowaveModelRev180907();
-            } else if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev181010.QNAME)) {
-                onfMicrowaveModel = new WrapperMicrowaveModelRev181010();
-            }
-
-            if (onfMicrowaveModel != null) {
-                return new ONFCoreNetworkElement12Microwave(mountPointNodeName, capabilities, netconfNodeDataBroker,
-                        webSocketService, databaseService, dcaeProvider, aotsmClient, maintenanceService,
-                        notificationDelayService, onfMicrowaveModel);
-            } else {
-            	return new ONFCoreNetworkElement12(mountPointNodeName, capabilities, netconfNodeDataBroker,
-                        webSocketService, databaseService, dcaeProvider, aotsmClient, maintenanceService,
-                        notificationDelayService);
-            }
-        }
-        return null;
-
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperPTPModelRev170208.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperPTPModelRev170208.java
deleted file mode 100644
index d02ca12fb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperPTPModelRev170208.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.InstanceList;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.InstanceListKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.instance.list.PortDsList;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.port.ds.entry.PortIdentity;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Reading PTP specific information from networkelement and creating log-trace output.
- *
- * @author herbert
- */
-@SuppressWarnings("deprecation")
-public class WrapperPTPModelRev170208 {
-
-    private static final Logger LOG = LoggerFactory.getLogger(WrapperPTPModelRev170208.class);
-
-    protected static final InstanceIdentifier<InstanceList> PTPINSTANCES_IID = InstanceIdentifier
-            .builder(InstanceList.class, new InstanceListKey(1)).build();
-
-    /**
-     * Query synchronization information out of NE
-     */
-
-    public static void initSynchronizationExtension(String mountPointNodeName, DataBroker netconfNodeDataBroker,
-            Capabilities capabilities) {
-        try {
-            if (!capabilities.isSupportingNamespaceAndRevision(InstanceList.QNAME)) {
-                LOG.debug("Mountpoint {} does not support PTP", mountPointNodeName);
-            } else {
-                StringBuffer sb = new StringBuffer();
-                sb.append("NE ");
-                sb.append(mountPointNodeName);
-                sb.append(" does support synchronisation.\n");
-                InstanceList ptpInstance = readPTPClockInstances(netconfNodeDataBroker);
-                if (ptpInstance != null) {
-                    List<PortDsList> dsList = ptpInstance.getPortDsList();
-                    if (dsList != null) {
-                        int t = 0;
-                        for (PortDsList portDs : ptpInstance.getPortDsList()) {
-                            PortIdentity portId = portDs.getPortIdentity();
-                            if (portId != null) {
-                                sb.append("Port[");
-                                sb.append(portId.getPortNumber());
-                                sb.append("]{ ClockId: ");
-                                sb.append(portId.getClockIdentity());
-                                sb.append(", Portstate: ");
-                                sb.append(portDs.getPortState());
-                                sb.append("}, ");
-                            } else {
-                                sb.append("Incomplete port #" + t + ", ");
-                            }
-                            t++;
-                        }
-                    } else {
-                        sb.append("dsList contains null");
-                    }
-                } else {
-                    sb.append("ptpInstance equals null");
-                }
-                LOG.trace(sb.toString());
-            }
-        } catch (Exception e) {
-            LOG.info("Inconsistent synchronisation structure: " + e.getMessage());
-        }
-    }
-
-    @Nullable
-    private static InstanceList readPTPClockInstances(DataBroker netconfNodeDataBroker) {
-        return GenericTransactionUtils.readData(netconfNodeDataBroker, LogicalDatastoreType.OPERATIONAL,
-                PTPINSTANCES_IID);
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/ISubConfigHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/CallBack.java
index c1f67f0a3..62e55a97c 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/ISubConfigHandler.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/CallBack.java
@@ -15,8 +15,12 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
+
+/**
+ * @author herbert
+ *
+ */
+public interface CallBack {
 
-public interface ISubConfigHandler {
-    void save();
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/NotificationActor.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/NotificationActor.java
index 7daf7c9c5..4f2dfdeef 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/NotificationActor.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/NotificationActor.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 public interface NotificationActor<T> {
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/NotificationWorker.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/NotificationWorker.java
index 9a073e20e..0c3014a0d 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/NotificationWorker.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/NotificationWorker.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Base.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Base.java
index 2aa8dd99b..8464cc809 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Base.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Base.java
@@ -15,28 +15,29 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperPTPModelRev170208;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperPTPModelRev170208;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.InstanceList;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
@@ -55,8 +56,7 @@ import org.slf4j.LoggerFactory;
  * Provides the basic ONF Core Model function.<br>
  * - initialReadFromNetworkElement is not implemented in child classes.
  */
-@SuppressWarnings("deprecation")
-public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementBase implements ONFCoreNetworkElementCoreData {
+public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementBase implements NetworkElementCoreData {
 
     private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElement12Base.class);
 
@@ -73,37 +73,35 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
 
     // Non specific part. Used by all functions.
     /** interfaceList is used by PM task and should be synchronized */
-    private final @Nonnull List<Lp> interfaceList = Collections.synchronizedList(new CopyOnWriteArrayList<>());
+    private final @NonNull List<Lp> interfaceList = Collections.synchronizedList(new CopyOnWriteArrayList<>());
     private @Nullable NetworkElement optionalNe = null;
 
     // Performance monitoring specific part
     /** Lock for the PM access specific elements that could be null */
-    private final @Nonnull Object pmLock = new Object();
+    private final @NonNull Object pmLock = new Object();
     protected @Nullable Iterator<Lp> interfaceListIterator = null;
     /** Actual pmLp used during iteration over interfaces */
     protected @Nullable Lp pmLp = null;
 
     // Device monitoring specific part
     /** Lock for the DM access specific elements that could be null */
-    protected final @Nonnull Object dmLock = new Object();
+    protected final @NonNull Object dmLock = new Object();
 
     protected final boolean isNetworkElementCurrentProblemsSupporting12;
 
-    private final ONFCoreNetworkElement12Equipment equipment;
-
-    private @Nonnull InventoryInformation inventoryInformation = new InventoryInformation();
+    protected final ONFCoreNetworkElement12Equipment equipment;
 
     /*
      * Constructor
      */
 
-    protected ONFCoreNetworkElement12Base(String mountPointNodeName, DataBroker netconfNodeDataBroker,
+    protected ONFCoreNetworkElement12Base(INetconfAcessor acessor, String mountPointNodeName, DataBroker netconfNodeDataBroker,
             Capabilities capabilities) {
-        super(mountPointNodeName, netconfNodeDataBroker, capabilities);
+        super(acessor, mountPointNodeName, netconfNodeDataBroker, capabilities);
         // TODO Auto-generated constructor stub
         this.isNetworkElementCurrentProblemsSupporting12 = capabilities.isSupportingNamespaceAndRevision(NetworkElementPac.QNAME);
-        this.equipment = new ONFCoreNetworkElement12Equipment(this, capabilities);
-        WrapperPTPModelRev170208.initSynchronizationExtension(mountPointNodeName, netconfNodeDataBroker, capabilities);
+        this.equipment = new ONFCoreNetworkElement12Equipment(acessor, this, capabilities);
+        WrapperPTPModelRev170208.initSynchronizationExtension(acessor);
         LOG.debug("support necurrent-problem-list=" + this.isNetworkElementCurrentProblemsSupporting12);
         LOG.info("Create NE instance {}", InstanceList.QNAME.getLocalName());
     }
@@ -117,42 +115,24 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
         return optionalNe;
     }
 
-	List<Lp> getInterfaceList() {
-		return interfaceList;
-	}
+    List<Lp> getInterfaceList() {
+        return interfaceList;
+    }
 
     public Object getPmLock() {
-		return pmLock;
-	}
-
-    public ONFCoreNetworkElement12Equipment getEquipment() {
-    	return equipment;
+        return pmLock;
     }
 
     /*---------------------------------------------------------------
      * Core model related function
      */
 
-	/**
-     * Read the NetworkElement part from database.
-     *
-     * @return Optional with NetworkElement or empty
-     */
-    @Nullable
-    private NetworkElement readNetworkElement() {
-        // Step 2.2: construct data and the relative iid
-        // The schema path to identify an instance is
-        // <i>CoreModel-CoreNetworkModule-ObjectClasses/NetworkElement</i>
-        // Read to the config data store
-        return GenericTransactionUtils.readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
-                NETWORKELEMENT_IID);
-    }
-
     /**
      * Get uuid of Optional NE.
      *
      * @return Uuid or EMPTY String if optionNE is not available
      */
+    @SuppressWarnings("null")
     protected String getUuId() {
         String uuid = EMPTY;
 
@@ -172,7 +152,7 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
 
         LOG.debug("Update mountpoint if changed {}", getMountPointNodeName());
 
-        optionalNe = GenericTransactionUtils.readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
+        optionalNe = getGenericTransactionUtils().readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
                 NETWORKELEMENT_IID);;
         synchronized (pmLock) {
             boolean change = false;
@@ -290,11 +270,11 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
 
     }
 
-	/**
-	 * Reading problems for the networkElement V1.2
-	 * @param resultList
-	 * @return
-	 */
+    /**
+     * Reading problems for the networkElement V1.2
+     * @param resultList
+     * @return
+     */
     private List<ProblemNotificationXml> readNetworkElementCurrentProblems12(List<ProblemNotificationXml> resultList) {
 
         LOG.info("DBRead Get {} NetworkElementCurrentProblems12", getMountPointNodeName());
@@ -306,21 +286,21 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
 
         // Step 2.3: read to the config data store
         NetworkElementPac problemPac;
-        NetworkElementCurrentProblems problems;
+        NetworkElementCurrentProblems problems = null;
         try {
-            problemPac = GenericTransactionUtils.readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
+            problemPac = getGenericTransactionUtils().readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
                     networkElementCurrentProblemsIID);
-            problems = problemPac.getNetworkElementCurrentProblems();
+            if (problemPac != null) {
+                problems = problemPac.getNetworkElementCurrentProblems();
+            }
             if (problems == null) {
                 LOG.debug("DBRead no NetworkElementCurrentProblems12");
-            } else if (problems.getCurrentProblemList() == null) {
-                LOG.debug("DBRead empty CurrentProblemList12");
             } else {
                 for (org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g.CurrentProblemList problem : problems
-                        .getCurrentProblemList()) {
+                        .nonnullCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(getMountPointNodeName(), problem.getObjectReference(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
@@ -335,7 +315,7 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
      * Device Monitor
      */
 
-	@Override
+    @Override
     public boolean checkIfConnectionToMediatorIsOk() {
         synchronized (dmLock) {
             return optionalNe != null;
@@ -363,15 +343,15 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
      */
 
     @Override
-    public @Nonnull InventoryInformation getInventoryInformation(String layerProtocolFilter) {
+    public @NonNull InventoryInformation getInventoryInformation(String layerProtocolFilter) {
         LOG.debug("request inventory information. filter:" + layerProtocolFilter);
         return this.equipment.getInventoryInformation(getFilteredInterfaceUuidsAsStringList(layerProtocolFilter));
     }
 
-	@Override
-	public InventoryInformation getInventoryInformation() {
-		return getInventoryInformation(null);
-	}
+    @Override
+    public InventoryInformation getInventoryInformation() {
+        return getInventoryInformation(null);
+    }
 
     protected List<String> getFilteredInterfaceUuidsAsStringList(String layerProtocolFilter) {
         List<String> uuids = new ArrayList<>();
@@ -442,16 +422,31 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
         return res.toString();
     }
 
-	@Override
-	public AllPm getHistoricalPM() {
+    @Override
+    public AllPm getHistoricalPM() {
         return AllPm.getEmpty();
-	}
+    }
 
 
-	@Override
-	public void doRegisterMicrowaveEventListener(MountPoint mountPoint) {
+    @Override
+    public void doRegisterEventListener(MountPoint mountPoint) {
         //Do nothing
-	}
+    }
+
+
+    @Override
+    public void register() {
+    }
+
 
+    @Override
+    public void deregister() {
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return clazz.isInstance(this) ? Optional.of((L)this) : Optional.empty();
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Basic.java
index a06e4a601..4ea6fee25 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Basic.java
@@ -15,28 +15,21 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.NetconfEventListener12;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.NetconfEventListenerHandler12;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.Extension;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,16 +47,15 @@ import org.slf4j.LoggerFactory;
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
-public class ONFCoreNetworkElement12 extends ONFCoreNetworkElement12Base
+public class ONFCoreNetworkElement12Basic extends ONFCoreNetworkElement12Base
         implements ONFCoreNetworkElementCallback, NotificationActor<AttributeValueChangedNotificationXml> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElement12.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElement12Basic.class);
 
     /*-----------------------------------------------------------------------------
      * Class members
      */
-    private final @Nonnull NetconfEventListener12 netconfEventListener;
+    private final @NonNull NetconfEventListenerHandler12 netconfEventListener;
     private final NotificationWorker<AttributeValueChangedNotificationXml> notificationQueue;
 
     /*-----------------------------------------------------------------------------
@@ -80,16 +72,15 @@ public class ONFCoreNetworkElement12 extends ONFCoreNetworkElement12Base
      * @param databaseService to access the database
      * @param dcaeProvider to forward problem / change notifications
      */
-    ONFCoreNetworkElement12(String mountPointNodeName, Capabilities capabilities,
-            DataBroker netconfNodeDataBroker, WebSocketServiceClient webSocketService,
-            HtDatabaseEventsService databaseService, ProviderClient dcaeProvider, @Nullable ProviderClient aotsmClient,
-            MaintenanceService maintenanceService,
+    ONFCoreNetworkElement12Basic(INetconfAcessor acessor, String mountPointNodeName, Capabilities capabilities,
+            DataBroker netconfNodeDataBroker, WebSocketServiceClientInternal webSocketService,
+            DataProvider databaseService, DcaeForwarderInternal aotsDcaeForwarder,
             NotificationDelayService<ProblemNotificationXml> notificationDelayService ) {
 
-        super(mountPointNodeName, netconfNodeDataBroker, capabilities);
+        super(acessor, mountPointNodeName, netconfNodeDataBroker, capabilities);
 
-        this.netconfEventListener = new NetconfEventListener12(mountPointNodeName, webSocketService,
-                databaseService, dcaeProvider, aotsmClient, maintenanceService, notificationDelayService, this);
+        this.netconfEventListener = new NetconfEventListenerHandler12(mountPointNodeName, webSocketService,
+                databaseService, aotsDcaeForwarder, notificationDelayService, this);
         this.notificationQueue = new NotificationWorker<>(1, 100, this);
 
     }
@@ -176,7 +167,7 @@ public class ONFCoreNetworkElement12 extends ONFCoreNetworkElement12Base
         int problems = netconfEventListener.removeObjectsCurrentProblemsOfNode(uuidString);
         LOG.debug("Removed {} problems for uuid {}", problems, uuidString);
 
-        List<ProblemNotificationXml> resultList = getEquipment().addProblemsofNodeObject(uuidString);
+        List<ProblemNotificationXml> resultList = equipment.addProblemsofNodeObject(uuidString);
         netconfEventListener.initCurrentProblemStatus(resultList);
         LOG.debug("Added {} problems for uuid {}", resultList.size(), uuidString);
 
@@ -203,53 +194,20 @@ public class ONFCoreNetworkElement12 extends ONFCoreNetworkElement12Base
 
         // Step 2.2: read ne from data store
         readNetworkElementAndInterfaces();
-        getEquipment().readNetworkElementEquipment();
+        equipment.readNetworkElementEquipment();
 
         // Step 2.3: read the existing faults and add to DB
         List<ProblemNotificationXml> resultList = readAllCurrentProblemsOfNode();
-        getEquipment().addProblemsofNode(resultList);
+        equipment.addProblemsofNode(resultList);
 
         netconfEventListener.initCurrentProblemStatus(resultList);
 
-        netconfEventListener.writeEquipment(getEquipment());
+        netconfEventListener.writeEquipment(equipment);
 
         LOG.info("Found info at {} for device {} number of problems: {}", getMountPointNodeName(), getUuId(),
                 resultList.size());
     }
 
-
-
-
-    /**
-     * Read the NetworkElement part from database.
-     *
-     * @return Optional with NetworkElement or empty
-     */
-    @Nullable
-    private NetworkElement readNetworkElement() {
-        // Step 2.2: construct data and the relative iid
-        // The schema path to identify an instance is
-        // <i>CoreModel-CoreNetworkModule-ObjectClasses/NetworkElement</i>
-        // Read to the config data store
-        return GenericTransactionUtils.readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
-                NETWORKELEMENT_IID);
-    }
-
-    /**
-     * Read element from class that could be not available
-     *
-     * @param ltp layer termination point
-     * @return List with extension parameters or empty list
-     */
-    @Nonnull
-    private static List<Extension> getExtensionList(@Nullable Lp ltp) {
-        if (ltp != null && ltp.getExtension() != null) {
-            return ltp.getExtension();
-        } else {
-            return EMPTYLTPEXTENSIONLIST;
-        }
-    }
-
     /**
      * Remove all entries from list
      */
@@ -259,8 +217,14 @@ public class ONFCoreNetworkElement12 extends ONFCoreNetworkElement12Base
     }
 
 
-	@Override
-	public void close() throws Exception {
-	}
+    @Override
+    public void close() throws Exception {
+    }
+
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.Optical;
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Equipment.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Equipment.java
index dcce28c35..21309c02c 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Equipment.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Equipment.java
@@ -15,26 +15,29 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ValueNameList;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.OnfInterfacePac;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperEquipmentPacRev170402;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment.ExtendedEquipment;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedEquipment;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ValueNameList;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.OnfInterfacePac;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperEquipmentPacRev170402;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.Equipment;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.EquipmentKey;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolder;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ManufacturedThing;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.EquipmentType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.ManufacturerProperties;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -50,25 +53,26 @@ public class ONFCoreNetworkElement12Equipment {
 
     private static final UniversalId EQUIPMENTROOT = new UniversalId("network-element");
     private static final int EQUIPMENTROOTLEVEL = 0;
-    private static final OnfInterfacePac EMPTYEQUIPMENTPAC = (interfacePacUuid, resultList) -> { return(resultList); };
 
-    private final ONFCoreNetworkElementCoreData coreData;
+    private final NetworkElementCoreData coreData;
     private final OnfInterfacePac equipmentPac;
+    private final INetconfAcessor acessor;
 
     private final ValueNameList extensionList;
     private final List<UniversalId> topLevelEqUuidList;
     private final List<ProblemNotificationXml> globalProblemList;
     private final List<ExtendedEquipment> globalEquipmentList;
 
-    public ONFCoreNetworkElement12Equipment(ONFCoreNetworkElementCoreData coreData, Capabilities capabilities) {
+    public ONFCoreNetworkElement12Equipment(INetconfAcessor acessor, NetworkElementCoreData coreData, Capabilities capabilities) {
         LOG.debug("Initialize " + ONFCoreNetworkElement12Equipment.class.getName());
+        this.acessor = acessor;
         this.coreData = coreData;
         if (capabilities.isSupportingNamespaceAndRevision(WrapperEquipmentPacRev170402.QNAME)) {
-            this.equipmentPac = new WrapperEquipmentPacRev170402(coreData);
-            LOG.debug("Equipment pac supported {}", WrapperEquipmentPacRev170402.QNAME);
+            this.equipmentPac = new WrapperEquipmentPacRev170402(acessor, coreData);
+            LOG.debug("Equipement pac supported {}", WrapperEquipmentPacRev170402.QNAME);
         } else {
-            this.equipmentPac = EMPTYEQUIPMENTPAC;
-            LOG.debug("Equipment pac not supported {}", WrapperEquipmentPacRev170402.QNAME);
+            this.equipmentPac = null;
+            LOG.debug("Equipement pac not supported {}", WrapperEquipmentPacRev170402.QNAME);
         }
 
         extensionList = new ValueNameList();
@@ -92,7 +96,7 @@ public class ONFCoreNetworkElement12Equipment {
         return res;
     }
 
-    public @Nonnull InventoryInformation getInventoryInformation(List<String> uuids) {
+    public @NonNull InventoryInformation getInventoryInformation(List<String> uuids) {
         return getInventoryInformation(this.extensionList, uuids);
     }
 
@@ -125,6 +129,9 @@ public class ONFCoreNetworkElement12Equipment {
         return equipmentListAll;
     }
 
+    TransactionUtils getGenericTransactionUtils() {
+        return acessor.getTransactionUtils();
+    }
 
     /*
      * --------------------------------------------------------------------------------- private
@@ -162,7 +169,7 @@ public class ONFCoreNetworkElement12Equipment {
                 } else {
                     // Read equipment and problems
                     for (UniversalId uuid : topLevelEqUuidList) {
-                        recurseReadEquipmentProblems(uuid, EQUIPMENTROOT, EQUIPMENTROOTLEVEL, globalProblemList,
+                        recurseReadEquipmentProblems(uuid, EQUIPMENTROOT, coreData.getMountpoint(), EQUIPMENTROOTLEVEL, globalProblemList,
                                 globalEquipmentList);
                     }
                 }
@@ -172,29 +179,32 @@ public class ONFCoreNetworkElement12Equipment {
         }
     }
 
-    private void recurseReadEquipmentProblems(UniversalId uuid, UniversalId parentUuid, int treeLevel,
+    private void recurseReadEquipmentProblems(UniversalId uuid, UniversalId parentUuid, String path, int treeLevel,
             List<ProblemNotificationXml> problemList, List<ExtendedEquipment> equipmentList) {
 
         if (uuid != null) {
 
             Equipment equipment = this.readEquipment(uuid);
 
-			if (equipment != null) {
-				equipmentList.add(new ExtendedEquipment(parentUuid.getValue(), equipment, treeLevel));
-
-				this.equipmentPac.readTheFaults(uuid, problemList);
-				List<ContainedHolder> containedHolderListe = equipment.getContainedHolder();
-				if (containedHolderListe != null) {
-					for (ContainedHolder containedHolder : containedHolderListe) {
-						recurseReadEquipmentProblems(containedHolder.getOccupyingFru(), uuid, treeLevel + 1,
-								problemList, equipmentList);
-					}
-				}
-			}
+            if (equipment != null) {
+                equipmentList.add(new ExtendedEquipment(this.getMountpoint(),parentUuid.getValue(), equipment, path, treeLevel));
+
+                if (this.equipmentPac != null) {
+                    this.equipmentPac.readTheFaults(uuid, problemList);
+
+                    List<ContainedHolder> containedHolderListe = equipment.getContainedHolder();
+                    if (containedHolderListe != null) {
+                        for (ContainedHolder containedHolder : containedHolderListe) {
+                            recurseReadEquipmentProblems(containedHolder.getOccupyingFru(), uuid, path+"/"+uuid.getValue(), treeLevel + 1,
+                                    problemList, equipmentList);
+                        }
+                    }
+                }
+            }
         }
     }
 
-    private @Nonnull InventoryInformation getInventoryInformation(ValueNameList extensions, List<String> uuids) {
+    private @NonNull InventoryInformation getInventoryInformation(ValueNameList extensions, List<String> uuids) {
 
         InventoryInformation inventoryInformation = new InventoryInformation();
 
@@ -209,18 +219,20 @@ public class ONFCoreNetworkElement12Equipment {
             if (topLevelEqUuidList.isEmpty()) {
                 LOG.debug("no top level equipment found");
             } else {
-                //
                 if (!globalEquipmentList.isEmpty()) {
                     Equipment e = globalEquipmentList.get(0).getEquipment();
-                    if (e.getManufacturedThing() != null) {
-                        EquipmentType et;
-                        if ((et = e.getManufacturedThing().getEquipmentType()) != null) {
-                            inventoryInformation.setType(et.getTypeName());
-                            inventoryInformation.setModel(et.getModelIdentifier());
-                        }
-                        ManufacturerProperties em;
-                        if ((em = e.getManufacturedThing().getManufacturerProperties()) != null) {
-                            inventoryInformation.setVendor(em.getManufacturerIdentifier());
+                    if (e != null) {
+                        ManufacturedThing manufacturedThing = e.getManufacturedThing();
+                        if (manufacturedThing != null) {
+                            EquipmentType et;
+                            if ((et = manufacturedThing.getEquipmentType()) != null) {
+                                inventoryInformation.setType(et.getTypeName());
+                                inventoryInformation.setModel(et.getModelIdentifier());
+                            }
+                            ManufacturerProperties em;
+                            if ((em = manufacturedThing.getManufacturerProperties()) != null) {
+                                inventoryInformation.setVendor(em.getManufacturerIdentifier());
+                            }
                         }
                     }
                 }
@@ -251,7 +263,7 @@ public class ONFCoreNetworkElement12Equipment {
         InstanceIdentifier<Equipment> equipmentIID =
                 InstanceIdentifier.builder(Equipment.class, new EquipmentKey(interfacePacUuid)).build();
 
-        Equipment res = GenericTransactionUtils.readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+        Equipment res = getGenericTransactionUtils().readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
                 equipmentIID);
 
         return res;
@@ -272,7 +284,7 @@ public class ONFCoreNetworkElement12Equipment {
 
         InstanceIdentifier<Equipment> equipmentIID = InstanceIdentifier.builder(Equipment.class).build();
 
-        Equipment res = GenericTransactionUtils.readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+        Equipment res = getGenericTransactionUtils().readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
                 equipmentIID);
 
         return res;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Microwave.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Microwave.java
index d8a052f7f..89f803a17 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElement12Microwave.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElement12Microwave.java
@@ -15,35 +15,35 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.OnfMicrowaveModel;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.NetconfEventListener12;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.OnfMicrowaveModel;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.NetconfEventListenerHandler12;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance24Hours;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.Extension;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
@@ -51,6 +51,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.r
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.NetworkElementPac;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.pac.NetworkElementCurrentProblems;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.NotificationListener;
@@ -58,8 +59,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-
 /**
  * Get information over NETCONF device according to ONF Coremodel. Read networkelement and
  * conditional packages.
@@ -74,7 +73,6 @@ import com.google.common.base.Optional;
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
 public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Base
         implements ONFCoreNetworkElementCallback, NotificationActor<AttributeValueChangedNotificationXml> {
 
@@ -83,8 +81,8 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
     /*-----------------------------------------------------------------------------
      * Class members
      */
-    private final @Nonnull NetconfEventListener12 microwaveEventListener;
-    private final @Nonnull OnfMicrowaveModel microwaveModel;
+    private final @NonNull NetconfEventListenerHandler12 microwaveEventListener;
+    private final @NonNull OnfMicrowaveModel microwaveModel;
     private final NotificationWorker<AttributeValueChangedNotificationXml> notificationQueue;
 
     private ListenerRegistration<NotificationListener> listenerRegistrationresult = null;
@@ -103,21 +101,20 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
      * @param databaseService to access the database
      * @param dcaeProvider to forward problem / change notifications
      */
-    ONFCoreNetworkElement12Microwave(String mountPointNodeName, Capabilities capabilities,
-            DataBroker netconfNodeDataBroker, WebSocketServiceClient webSocketService,
-            HtDatabaseEventsService databaseService, ProviderClient dcaeProvider, @Nullable ProviderClient aotsmClient,
-            MaintenanceService maintenanceService,
+    ONFCoreNetworkElement12Microwave(INetconfAcessor acessor, String mountPointNodeName, Capabilities capabilities,
+            DataBroker netconfNodeDataBroker, WebSocketServiceClientInternal webSocketService,
+            DataProvider databaseService, DcaeForwarderInternal aotsDcaeForwarder,
             NotificationDelayService<ProblemNotificationXml> notificationDelayService,
             OnfMicrowaveModel onfMicrowaveModel) {
 
-        super(mountPointNodeName, netconfNodeDataBroker, capabilities);
+        super(acessor, mountPointNodeName, netconfNodeDataBroker, capabilities);
 
         this.microwaveModel = onfMicrowaveModel;
         this.microwaveModel.setCoreData(this);
 
         // Create MicrowaveService here
-        this.microwaveEventListener = new NetconfEventListener12(mountPointNodeName, webSocketService,
-                databaseService, dcaeProvider, aotsmClient, maintenanceService, notificationDelayService, this);
+        this.microwaveEventListener = new NetconfEventListenerHandler12(mountPointNodeName, webSocketService,
+                databaseService, aotsDcaeForwarder, notificationDelayService, this);
         this.microwaveModel.setOnfMicrowaveModelListener(microwaveEventListener);
 
         this.notificationQueue = new NotificationWorker<>(1, 100, this);
@@ -211,7 +208,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         int problems = microwaveEventListener.removeObjectsCurrentProblemsOfNode(uuidString);
         LOG.debug("Removed {} problems for uuid {}", problems, uuidString);
 
-        List<ProblemNotificationXml> resultList = getEquipment().addProblemsofNodeObject(uuidString);
+        List<ProblemNotificationXml> resultList = equipment.addProblemsofNodeObject(uuidString);
         microwaveEventListener.initCurrentProblemStatus(resultList);
         LOG.debug("Added {} problems for uuid {}", resultList.size(), uuidString);
 
@@ -238,15 +235,15 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
 
         // Step 2.2: read ne from data store
         readNetworkElementAndInterfaces();
-        getEquipment().readNetworkElementEquipment();
+        equipment.readNetworkElementEquipment();
 
         // Step 2.3: read the existing faults and add to DB
         List<ProblemNotificationXml> resultList = readAllCurrentProblemsOfNode();
-        getEquipment().addProblemsofNode(resultList);
+        equipment.addProblemsofNode(resultList);
 
         microwaveEventListener.initCurrentProblemStatus(resultList);
 
-        microwaveEventListener.writeEquipment(getEquipment());
+        microwaveEventListener.writeEquipment(equipment);
 
         LOG.info("Found info at {} for device {} number of problems: {}", getMountPointNodeName(), getUuId(),
                 resultList.size());
@@ -279,7 +276,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
      * @return List with all problems
      */
     @Override
-	protected List<ProblemNotificationXml> readAllCurrentProblemsOfNode() {
+    protected List<ProblemNotificationXml> readAllCurrentProblemsOfNode() {
 
         // Step 2.3: read the existing faults and add to DB
         List<ProblemNotificationXml> resultList = new ArrayList<>();
@@ -367,7 +364,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
      * @param ltp layer termination point
      * @return List with extension parameters or empty list
      */
-    @Nonnull
+    @NonNull
     private static List<Extension> getExtensionList(@Nullable Lp ltp) {
         if (ltp != null && ltp.getExtension() != null) {
             return ltp.getExtension();
@@ -376,7 +373,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         }
     }
 
-    @Nonnull
+    @NonNull
     private List<? extends OtnHistoryDataG> readTheHistoricalPerformanceData(Lp lp) {
         ONFLayerProtocolName lpName = ONFLayerProtocolName.valueOf(lp.getLayerProtocolName());
 
@@ -449,7 +446,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
      * Register the listener
      */
     @Override
-    public void doRegisterMicrowaveEventListener(MountPoint mountPoint) {
+    public void doRegisterEventListener(MountPoint mountPoint) {
         LOG.info("End registration listener for Mountpoint {}", mountPoint.getIdentifier().toString());
         final Optional<NotificationService> optionalNotificationService =
                 mountPoint.getService(NotificationService.class);
@@ -461,7 +458,6 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
                 mountPoint.getIdentifier().toString(), optionalNotificationService, listenerRegistrationresult);
     }
 
-
     /*------------------------------------------------------------
      * private function to access database
      */
@@ -483,25 +479,24 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         NetworkElementPac problemPac;
         NetworkElementCurrentProblems problems;
         try {
-            problemPac = GenericTransactionUtils.readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
+            problemPac = getGenericTransactionUtils().readData(getNetconfNodeDataBroker(), LogicalDatastoreType.OPERATIONAL,
                     networkElementCurrentProblemsIID);
             problems = problemPac.getNetworkElementCurrentProblems();
             if (problems == null) {
                 LOG.debug("DBRead no NetworkElementCurrentProblems12");
-            } else if (problems.getCurrentProblemList() == null) {
-                LOG.debug("DBRead empty CurrentProblemList12");
             } else {
-                for (org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g.CurrentProblemList problem : problems
-                        .getCurrentProblemList()) {
+                for (org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g.CurrentProblemList problem : problems.nonnullCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(getMountPointNodeName(), problem.getObjectReference(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
         } catch (Exception e) {
-            LOG.warn("DBRead {} NetworkElementCurrentProblems12 not supported. Message '{}' ", getMountPointNodeName(),
-                    e.getMessage());
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            LOG.warn("DBRead {} NetworkElementCurrentProblems12 not supported. Message '{}' ", getMountPointNodeName(), pw.toString());
         }
         return resultList;
 
@@ -514,7 +509,8 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         }
     }
 
-
-
-
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.Wireless;
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementBase.java
new file mode 100644
index 000000000..7b8e1c0d3
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementBase.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+/**
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
+
+import javax.annotation.Nonnull;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.InternalConnectionStatus;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPassword;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.network.element.connection.entity.NodeDetailsBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author herbert
+ *
+ */
+@SuppressWarnings("deprecation")
+public abstract class ONFCoreNetworkElementBase implements AutoCloseable, ONFCoreNetworkElementRepresentation {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElementBase.class);
+
+    protected static final String EMPTY = "";
+
+    private final String mountPointNodeName;
+    private final NodeId nodeId;
+    private final DataBroker netconfNodeDataBroker;
+    private final Capabilities capabilities;
+    private final INetconfAcessor acessor;
+
+    protected ONFCoreNetworkElementBase(INetconfAcessor acessor, String mountPointNodeName, DataBroker netconfNodeDataBroker,
+            Capabilities capabilities) {
+        LOG.info("Create ONFCoreNetworkElementBase");
+        this.mountPointNodeName = mountPointNodeName;
+        this.nodeId = new NodeId(mountPointNodeName);
+        this.netconfNodeDataBroker = netconfNodeDataBroker;
+        this.capabilities = capabilities;
+        this.acessor = acessor;
+
+    }
+
+    @Override
+    public String getMountPointNodeName() {
+        return mountPointNodeName;
+    }
+
+    /**
+     * @return the netconfNodeDataBroker
+     */
+    public DataBroker getNetconfNodeDataBroker() {
+        return netconfNodeDataBroker;
+    }
+
+    /**
+     * @return the capabilities
+     */
+    public Capabilities getCapabilities() {
+        return capabilities;
+    }
+
+    /**
+     * Update devicetype and let all other field empty
+     * @param deviceType that should be updated
+     * @return NetworkElementConnectionEntity with related parameter
+     */
+    public static NetworkElementConnectionEntity getNetworkConnectionDeviceTpe(NetworkElementDeviceType deviceType) {
+        NetworkElementConnectionBuilder eb = new NetworkElementConnectionBuilder();
+        eb.setDeviceType(deviceType);
+        return eb.build();
+    }
+
+    /**
+     * Provide device specific data
+     * @param nodeId mountpoint id
+     * @param nNode data
+     * @return NetworkElementConnectionEntity specific information
+     */
+    public static NetworkElementConnectionEntity getNetworkConnection(String nodeId, @Nonnull NetconfNode nNode) {
+
+        NetworkElementConnectionBuilder eb = new NetworkElementConnectionBuilder();
+        // -- basics
+        eb.setId(nodeId).setNodeId(nodeId).setDeviceType(NetworkElementDeviceType.Unknown).setIsRequired(false);
+
+        // -- connection status
+        ConnectionLogStatus status = InternalConnectionStatus.statusFromNodeStatus(nNode.getConnectionStatus());
+        eb.setStatus(status);
+
+        // -- capabilites
+        Capabilities availableCapabilities = Capabilities.getAvailableCapabilities(nNode);
+        Capabilities unAvailableCapabilities = Capabilities.getUnavailableCapabilities(nNode);
+        eb.setCoreModelCapability(availableCapabilities.getRevisionForNamespace(NetworkElement.QNAME));
+
+        NodeDetailsBuilder nodeDetails = new NodeDetailsBuilder()
+                .setAvailableCapabilities(availableCapabilities.getCapabilities())
+                .setUnavailableCapabilities(unAvailableCapabilities.getCapabilities());
+        eb.setNodeDetails(nodeDetails.build());
+        // -- host information
+        Host host = nNode.getHost();
+        PortNumber portNumber = nNode.getPort();
+        if (host != null && portNumber != null) {
+            eb.setHost(host.stringValue()).setPort(portNumber.getValue().longValue());
+        }
+
+        Credentials credentials = nNode.getCredentials();
+        if (credentials instanceof LoginPassword) {
+            LoginPassword loginPassword = (LoginPassword) credentials;
+            eb.setUsername(loginPassword.getUsername()).setPassword(loginPassword.getPassword());
+        }
+        return eb.build();
+    }
+
+
+    @Override
+    public void warmstart() {
+        int problems = removeAllCurrentProblemsOfNode();
+        LOG.debug("Removed all {} problems from database at deregistration for {}", problems, mountPointNodeName);
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return nodeId;
+    }
+
+    public TransactionUtils getGenericTransactionUtils() {
+        return acessor.getTransactionUtils();
+    }
+
+    /*---------------------------------------------------------------
+     * Getter/ Setter
+     */
+    @Override
+    public String getMountpoint() {
+        return mountPointNodeName;
+    }
+
+    @Override
+    public DataBroker getDataBroker() {
+        return netconfNodeDataBroker;
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementCallback.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementCallback.java
index e681ee0a0..12790b30e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementCallback.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementCallback.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementEmpty.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementEmpty.java
index fe0c144a1..2c623d8d3 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementEmpty.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementEmpty.java
@@ -18,13 +18,17 @@
 /**
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
+
+import java.util.Optional;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,17 +36,17 @@ import org.slf4j.LoggerFactory;
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
 public class ONFCoreNetworkElementEmpty implements ONFCoreNetworkElementRepresentation {
 
     private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElementEmpty.class);
 
-    private String mountPointNodeName = "";
-
+    private final String mountPointNodeName;
+    private final NodeId nodeId;
 
     ONFCoreNetworkElementEmpty(String mountPointNodeName) {
-    	LOG.info("Create {}",ONFCoreNetworkElementEmpty.class.getSimpleName());
+        LOG.info("Create {}",ONFCoreNetworkElementEmpty.class.getSimpleName());
         this.mountPointNodeName = mountPointNodeName;
+        this.nodeId = new NodeId(mountPointNodeName);
     }
 
     @Override
@@ -54,10 +58,10 @@ public class ONFCoreNetworkElementEmpty implements ONFCoreNetworkElementRepresen
         return mountPointNodeName;
     }
 
-	@Override
-	public String getMountpoint() {
-		return mountPointNodeName;
-	}
+    @Override
+    public String getMountpoint() {
+        return mountPointNodeName;
+    }
 
     @Override
     public void resetPMIterator() {
@@ -88,7 +92,7 @@ public class ONFCoreNetworkElementEmpty implements ONFCoreNetworkElementRepresen
     }
 
     @Override
-    public void doRegisterMicrowaveEventListener(MountPoint mointPoint) {
+    public void doRegisterEventListener(MountPoint mointPoint) {
         //Do nothing
     }
 
@@ -99,12 +103,12 @@ public class ONFCoreNetworkElementEmpty implements ONFCoreNetworkElementRepresen
 
     @Override
     public boolean checkIfConnectionToMediatorIsOk() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean checkIfConnectionToNeIsOk() {
-        return false;
+        return true;
     }
 
     @Override
@@ -117,14 +121,41 @@ public class ONFCoreNetworkElementEmpty implements ONFCoreNetworkElementRepresen
         return InventoryInformation.getDefault();
     }
 
-	@Override
-	public DataBroker getDataBroker() {
-		return null;
-	}
+    @Override
+    public DataBroker getDataBroker() {
+        return null;
+    }
+
+    @Override
+    public NetworkElement getOptionalNetworkElement() {
+        return null;
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return  NetworkElementDeviceType.Unknown;
+    }
 
-	@Override
-	public NetworkElement getOptionalNetworkElement() {
-		return null;
-	}
+    @Override
+    public void register() {
+    }
+
+    @Override
+    public void deregister() {
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return nodeId;
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void warmstart() {
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementFactory.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementFactory.java
new file mode 100644
index 000000000..58dcfd2d0
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementFactory.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
+
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.UnkownDevicemanagerServiceException;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.OnfMicrowaveModel;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev170324;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev180907;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev181010;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DevicemanagerNotificationDelayService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Create a Network Element representation according to the capability
+ * information. The capabilities are more than an ODL-QName. After the ? other
+ * terms than "revision" are provided.
+ *
+ */
+public class ONFCoreNetworkElementFactory implements NetworkElementFactory {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ONFCoreNetworkElementFactory.class);
+
+    private static final ONFCoreNetworkElementRepresentation ONFCORE_NETWORKELEMENT_LOCK = new ONFCoreNetworkElementEmpty("NE-LOCK");
+
+    /**
+     * Used as Lock by devicemanager
+     * @return ONFCoreNetworkElementRepresentation for lock purpose
+     */
+    public @NonNull ONFCoreNetworkElementRepresentation getLock() {
+        return ONFCORE_NETWORKELEMENT_LOCK;
+    }
+
+    @Override
+    public Optional<org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement> create(INetconfAcessor acessor,
+            DeviceManagerServiceProvider serviceProvider) {
+        try {
+            DataProvider dataProvider = serviceProvider.getDataProvider();
+            WebSocketServiceClientInternal webSocketService = serviceProvider.getService(WebSocketServiceClientInternal.class);
+            DcaeForwarderInternal aotsDcaeForwarder = serviceProvider.getService(DcaeForwarderInternal.class);
+            DevicemanagerNotificationDelayService notificationDelayService = serviceProvider
+                    .getService(DevicemanagerNotificationDelayService.class);
+
+            Capabilities capabilities = acessor.getCapabilites();
+
+            if (capabilities.isSupportingNamespaceAndRevision(NetworkElement.QNAME)) {
+                OnfMicrowaveModel onfMicrowaveModel = null;
+
+                if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev170324.QNAME)) {
+                    onfMicrowaveModel = new WrapperMicrowaveModelRev170324(acessor);
+                } else if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev180907.QNAME)) {
+                    onfMicrowaveModel = new WrapperMicrowaveModelRev180907(acessor);
+                } else if (capabilities.isSupportingNamespaceAndRevision(WrapperMicrowaveModelRev181010.QNAME)) {
+                    onfMicrowaveModel = new WrapperMicrowaveModelRev181010(acessor);
+                }
+
+                String mountPointNodeName = acessor.getNodeId().getValue();
+                DataBroker netconfNodeDataBroker = acessor.getDataBroker();
+
+                if (onfMicrowaveModel != null) {
+                    return Optional.of(new ONFCoreNetworkElement12Microwave(acessor, mountPointNodeName, capabilities, netconfNodeDataBroker,
+                            webSocketService, dataProvider, aotsDcaeForwarder,
+                            notificationDelayService, onfMicrowaveModel));
+                } else {
+                    return Optional.of(new ONFCoreNetworkElement12Basic(acessor, mountPointNodeName, capabilities, netconfNodeDataBroker,
+                            webSocketService, dataProvider, aotsDcaeForwarder,
+                            notificationDelayService));
+                }
+            }
+
+        } catch (UnkownDevicemanagerServiceException e) {
+            LOG.warn("Service missing", e);
+        }
+        return Optional.empty();
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementRepresentation.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementRepresentation.java
index 3e7a9caa7..565a0f591 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/ONFCoreNetworkElementRepresentation.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/ONFCoreNetworkElementRepresentation.java
@@ -15,31 +15,28 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.InventoryProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.MicrowaveModelPerformanceDataProvider;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPoint;
 
 public interface ONFCoreNetworkElementRepresentation
-		extends DeviceMonitoredNe, MicrowaveModelPerformanceDataProvider, ONFCoreNetworkElementCoreData {
+        extends DeviceMonitoredNe, MicrowaveModelPerformanceDataProvider, NetworkElementCoreData, InventoryProvider, NetworkElement {
 
-	/**
-	 * Read during startup all relevant structure and status parameters from device.
-	 * Remove all currentAlarms, read structure from networkElement with all
-	 * interfacePacs, read current alarm status
-	 */
-	public void initialReadFromNetworkElement();
+    /**
+     * Read during startup all relevant structure and status parameters from device.
+     * Remove all currentAlarms, read structure from networkElement with all
+     * interfacePacs, read current alarm status
+     */
+    public void initialReadFromNetworkElement();
 
-	public String getMountPointNodeName();
+    public String getMountPointNodeName();
 
-	public int removeAllCurrentProblemsOfNode();
-
-	public void doRegisterMicrowaveEventListener(MountPoint mountPoint);
-
-	public InventoryInformation getInventoryInformation();
-
-	public InventoryInformation getInventoryInformation(String layerProtocolFilter);
+    public int removeAllCurrentProblemsOfNode();
 
+    public void doRegisterEventListener(MountPoint mountPoint);
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/AllPm.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/AllPm.java
index 5c7cd03bd..36f4b9709 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/AllPm.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/AllPm.java
@@ -1,4 +1,4 @@
-/**
+/*******************************************************************************
  * ============LICENSE_START========================================================================
  * ONAP : ccsdk feature sdnr wt
  * =================================================================================================
@@ -6,29 +6,30 @@
  * =================================================================================================
  * 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
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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==========================================================================
- */
+ ******************************************************************************/
 /**
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance24Hours;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance24Hours;
+
 public class AllPm {
 
+    private final static AllPm EMPTY = new AllPm();
+
     private final List<EsHistoricalPerformance15Minutes> pm15 = new ArrayList<>();
     private final List<EsHistoricalPerformance24Hours> pm24 = new ArrayList<>();
 
@@ -41,19 +42,19 @@ public class AllPm {
     }
 
     public List<EsHistoricalPerformance15Minutes> getPm15() {
-        return Collections.unmodifiableList(pm15);
+        return pm15;
     }
 
     public List<EsHistoricalPerformance24Hours> getPm24() {
-        return Collections.unmodifiableList(pm24);
+        return pm24;
     }
 
-    public int size() {
-        return pm15.size() + pm24.size();
+    public Object size() {
+        return pm15.size()+pm24.size();
     }
 
     public static AllPm getEmpty() {
-        return new AllPm();
+        return EMPTY;
     }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType12.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType12.java
index 470ddab80..cbff0c9ef 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType12.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType12.java
@@ -15,9 +15,9 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.LinkIdentifyingObject;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.LinkIdentifyingObject;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.GranularityPeriodType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.ObjectIdentifier;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType1211.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType1211.java
index 115e20e17..b21b04fe2 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType1211.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType1211.java
@@ -15,9 +15,9 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.LinkIdentifyingObject;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.LinkIdentifyingObject;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.GranularityPeriodType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.ObjectIdentifier;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType1211p.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType1211p.java
index abac75fed..1fdadd090 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ExtendedAirInterfaceHistoricalPerformanceType1211p.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedAirInterfaceHistoricalPerformanceType1211p.java
@@ -15,9 +15,9 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.LinkIdentifyingObject;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.LinkIdentifyingObject;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.GranularityPeriodType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.ObjectIdentifier;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedEquipment.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedEquipment.java
new file mode 100644
index 000000000..5bffd989a
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ExtendedEquipment.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.Equipment;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolder;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ManufacturedThing;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.EquipmentInstance;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.EquipmentType;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.ManufacturerProperties;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExtendedEquipment {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ExtendedEquipment.class);
+
+    public static final String ESDATATYPENAME = "inventoryequipment";
+    private final String parentUuid;
+    private final int treeLevel;
+    private final Equipment equipment;
+    private final String nodeId;
+    private final String path;
+    /**
+     * Equipment with additional information beside NETCONF equipment
+     *
+     * @param parentUuid of parent equipment
+     * @param equipment NETCONF Equipment
+     * @param treeLevel level of tree starting with root at 0
+     */
+    public ExtendedEquipment(String nodeId, String parentUuid, Equipment equipment, String path, int treeLevel) {
+        super();
+        this.nodeId = nodeId;
+        this.parentUuid = parentUuid;
+        this.equipment = equipment;
+        this.path = path;
+        this.treeLevel = treeLevel;
+    }
+
+    public String getParentUuid() {
+        return parentUuid;
+    }
+
+    public Equipment getEquipment() {
+        return equipment;
+    }
+
+    public int getTreeLevel() {
+        return treeLevel;
+    }
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public Inventory getCreateInventoryInput() {
+
+        InventoryBuilder inventoryBuilder = new InventoryBuilder();
+
+        // General
+        inventoryBuilder.setNodeId(getNodeId());
+        inventoryBuilder.setParentUuid(getParentUuid());
+        inventoryBuilder.setTreeLevel(new Long(getTreeLevel()));
+
+        if (equipment != null) {
+            inventoryBuilder.setUuid(equipment.getUuid().getValue());
+            // -- String list with ids of holders
+            List<String> containerHolderKeyList = new ArrayList<>();
+            List<ContainedHolder> containerHolderList = equipment.getContainedHolder();
+            if (containerHolderList != null) {
+                for (ContainedHolder containerHolder : containerHolderList) {
+                    containerHolderKeyList.add(containerHolder.getUuid().getValue());
+                }
+            }
+            inventoryBuilder.setContainedHolder(containerHolderKeyList);
+
+            // -- Manufacturer related things
+            ManufacturedThing mThing = equipment.getManufacturedThing();
+            if (mThing != null) {
+                ManufacturerProperties mProperties = mThing.getManufacturerProperties();
+                if (mProperties != null) {
+                    inventoryBuilder.setManufacturerName(mProperties.getManufacturerName());
+                    inventoryBuilder.setManufacturerIdentifier(mProperties.getManufacturerIdentifier());
+                }
+                EquipmentType mType = mThing.getEquipmentType();
+                if (mType != null) {
+                    inventoryBuilder.setDescription(mType.getDescription());
+                    inventoryBuilder.setModelIdentifier(mType.getModelIdentifier());
+                    inventoryBuilder.setPartTypeId(mType.getPartTypeIdentifier());
+                    inventoryBuilder.setTypeName(mType.getTypeName());
+                    inventoryBuilder.setVersion(mType.getVersion());
+                }
+                EquipmentInstance mInstance = mThing.getEquipmentInstance();
+                if (mInstance != null) {
+                    String manufacturedDateString = mInstance.getManufactureDate();
+                    if (manufacturedDateString != null && !manufacturedDateString.isEmpty()) {
+                        try {
+                            inventoryBuilder.setDate(mInstance.getManufactureDate());
+                        } catch (IllegalArgumentException e) {
+                            LOG.debug("Format problem", e);
+                        }
+                    }
+                    inventoryBuilder.setSerial(mInstance.getSerialNumber());
+                }
+            }
+        }
+
+        return inventoryBuilder.build();
+    }
+
+    @Override
+    public String toString() {
+        return "ExtendedEquipment [parentUuid=" + parentUuid + ", treeLevel=" + treeLevel + ", equipment=" + equipment
+                + ", nodeId=" + nodeId + ", path=" + path + "]";
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ONFLayerProtocolName.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ONFLayerProtocolName.java
index 68627a862..7f0e60d5e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ONFLayerProtocolName.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ONFLayerProtocolName.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ValueNameList.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ValueNameList.java
index 1e0156c20..1af59a007 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/ValueNameList.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/container/ValueNameList.java
@@ -6,23 +6,21 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container;
 
 import java.util.HashMap;
 import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.Extension;
 
@@ -32,53 +30,53 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170
  */
 public class ValueNameList extends HashMap<String, String> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * Create ValueNameList for NETCONF extensions
-	 * @param extensionList Parameters as received from device. Could be null.
-	 */
-	public void put(@Nullable List<Extension> extensionList) {
+    /**
+     * Create ValueNameList for NETCONF extensions
+     * @param extensionList Parameters as received from device. Could be null.
+     */
+    public void put(@Nullable List<Extension> extensionList) {
 
-		if (extensionList != null) {
-			String name;
-			String value;
+        if (extensionList != null) {
+            String name;
+            String value;
 
-			for (Extension e : extensionList) {
-				name = e.getValueName();
-				value = e.getValue();
-				if (name != null && value != null) {
-					put(name, value);
-				}
-			}
-		}
-	}
+            for (Extension e : extensionList) {
+                name = e.getValueName();
+                value = e.getValue();
+                if (name != null && value != null) {
+                    put(name, value);
+                }
+            }
+        }
+    }
 
-	/**
-	 * Return value or null
-	 * @param name key for element
-	 * @return value if key exists; if not nul
-	 */
-	public String getOrNull(String name) {
-		return containsKey(name) ? get(name) : null;
-	}
+    /**
+     * Return value or null
+     * @param name key for element
+     * @return value if key exists; if not nul
+     */
+    public String getOrNull(String name) {
+        return containsKey(name) ? get(name) : null;
+    }
 
-	/**
-	 * Get element as id list
-	 * @param name key of element
-	 * @param topLevelEqUuidList as input to add elements
-	 * @return List<UniversalId>
-	 */
-	public  @Nonnull List<UniversalId> getAsUniversalIdList(String name, List<UniversalId> topLevelEqUuidList) {
-		if (containsKey(name)) {
-			String[] result = get(name).split(",\\s*");
-			if (result.length > 0) {
-				for (String e : result) {
-					topLevelEqUuidList.add(new UniversalId(e));
-				}
-			}
-		}
-		return topLevelEqUuidList;
-	}
+    /**
+     * Get element as id list
+     * @param name key of element
+     * @param topLevelEqUuidList as input to add elements
+     * @return List<UniversalId>
+     */
+    public  @NonNull List<UniversalId> getAsUniversalIdList(String name, List<UniversalId> topLevelEqUuidList) {
+        if (containsKey(name)) {
+            String[] result = get(name).split(",\\s*");
+            if (result.length > 0) {
+                for (String e : result) {
+                    topLevelEqUuidList.add(new UniversalId(e));
+                }
+            }
+        }
+        return topLevelEqUuidList;
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfInterfacePac.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfInterfacePac.java
index e26d997a0..674f06768 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfInterfacePac.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfInterfacePac.java
@@ -15,11 +15,10 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 import java.util.List;
-
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfMicrowaveModel.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfMicrowaveModel.java
index d716a01bc..bd7aa835c 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfMicrowaveModel.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfMicrowaveModel.java
@@ -15,11 +15,12 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCoreData;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
@@ -29,7 +30,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 
 public interface OnfMicrowaveModel {
 
-    public void setCoreData(ONFCoreNetworkElementCoreData coreData);
+    public void setCoreData(NetworkElementCoreData coreData);
 
 	public void readTheFaultsOfMicrowaveModel(ONFLayerProtocolName lpName, Class<?> lpClass, UniversalId uuid,
 			List<ProblemNotificationXml> resultList);
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfMicrowaveModelNotification.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfMicrowaveModelNotification.java
index 2c7aead70..3f91f6f6c 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/OnfMicrowaveModelNotification.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/OnfMicrowaveModelNotification.java
@@ -6,16 +6,16 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperEquipmentPacRev170402.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperEquipmentPacRev170402.java
index 3ee0c91ad..15a9cfd45 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperEquipmentPacRev170402.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperEquipmentPacRev170402.java
@@ -15,20 +15,20 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCoreData;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.CurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.EquipmentPac;
@@ -36,16 +36,25 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.co
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.equipment.pac.EquipmentCurrentProblems;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WrapperEquipmentPacRev170402 implements OnfInterfacePac {
 
     private static final Logger LOG = LoggerFactory.getLogger(WrapperEquipmentPacRev170402.class);
     public static final QName QNAME = EquipmentPac.QNAME;
 
-    ONFCoreNetworkElementCoreData coreData;
+    private final NetworkElementCoreData coreData;
+    private final INetconfAcessor acessor;
+
 
-    public WrapperEquipmentPacRev170402(ONFCoreNetworkElementCoreData coreData) {
+    public WrapperEquipmentPacRev170402(INetconfAcessor acessor, NetworkElementCoreData coreData) {
         this.coreData = coreData;
+        this.acessor = acessor;
+    }
+
+    private TransactionUtils getGenericTransactionUtils() {
+        return acessor.getTransactionUtils();
     }
 
     /**
@@ -79,18 +88,16 @@ public class WrapperEquipmentPacRev170402 implements OnfInterfacePac {
                     .builder(clazzPac, cons.newInstance(interfacePacUuid)).child(clazzProblems).build();
 
             // -- Specific part 2
-            EquipmentCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+            EquipmentCurrentProblems problems = getGenericTransactionUtils().readData(coreData.getDataBroker(),
                     LogicalDatastoreType.OPERATIONAL, interfaceIID);
             if (problems == null) {
                 LOG.debug("DBRead Id {} no {}", interfacePacUuid, clazzProblems, clazzProblems.getName());
-            } else if (problems.getCurrentProblemList() == null) {
-                LOG.debug("DBRead Id {} no list {}", interfacePacUuid, clazzProblems.getName());
-            } else {
+             } else {
                 // -- Specific part 3
-                for (CurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+                for (CurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev170324.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev170324.java
index 32fb095b4..b0a9558c3 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev170324.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev170324.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 
 
@@ -23,17 +23,19 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCoreData;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType12;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
+import javax.annotation.Nonnull;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType12;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectDeletionNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
@@ -83,19 +85,27 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
     public static final QName QNAME = MwAirInterfacePac.QNAME;
 
 
-    private ONFCoreNetworkElementCoreData coreData;
+    private NetworkElementCoreData coreData;
     private OnfMicrowaveModelNotification microwaveModelListener;
+    private final TransactionUtils genericTransactionUtils;
 
     /*-----------------------------------------------------------------------------
      * Setter/Getter
      */
 
+    /**
+     * @param acessor
+     */
+    public WrapperMicrowaveModelRev170324(INetconfAcessor acessor) {
+        genericTransactionUtils = acessor.getTransactionUtils();
+    }
+
     @Override
-    public void setCoreData(ONFCoreNetworkElementCoreData coreData) {
+    public void setCoreData(NetworkElementCoreData coreData) {
         this.coreData = coreData;
     }
 
-    public ONFCoreNetworkElementCoreData getCoreData() {
+    public NetworkElementCoreData getCoreData() {
         return coreData;
     }
 
@@ -155,7 +165,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
     }
 
     @Override
-    public List<? extends OtnHistoryDataG> readTheHistoricalPerformanceData(ONFLayerProtocolName lpName, Lp lp) {
+    public List<? extends OtnHistoryDataG> readTheHistoricalPerformanceData(@Nonnull ONFLayerProtocolName lpName, Lp lp) {
         switch (lpName) {
         case MWAirInterface:
             return readTheHistoricalPerformanceDataOfMwAirInterfacePac(lp);
@@ -169,12 +179,11 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         case TDMContainer:
         case Structure:
         case Unknown:
-            LOG.debug("Do not read HistoricalPM data for {} {}", lpName, lp.getUuid().getValue());
+            LOG.debug("Do not read HistoricalPM data for {} {}", lpName, getUuid(lp));
             break;
         }
         return new ArrayList<>();
     }
-
     @Override
     public Class<?> getClassForLtpExtension(QName qName) {
         Class<?> res = null;
@@ -224,18 +233,16 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
                 .child(AirInterfaceCurrentProblems.class).build();
 
         // Step 2.3: read to the config data store
-        AirInterfaceCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceIID);
 
         if (problems == null) {
             LOG.debug("DBRead Id {} no AirInterfaceCurrentProblems", interfacePacUuid);
-        } else if (problems.getCurrentProblemList() == null) {
-            LOG.debug("DBRead Id {} empty CurrentProblemList", interfacePacUuid);
         } else {
-            for (AirInterfaceCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+            for (AirInterfaceCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -265,17 +272,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
                 .builder(MwEthernetContainerPac.class, new MwEthernetContainerPacKey(interfacePacUuid))
                 .child(EthernetContainerCurrentProblems.class).build();
 
-        EthernetContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        EthernetContainerCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no EthernetContainerCurrentProblems", interfacePacUuid);
-        } else if (problems.getCurrentProblemList() == null) {
-            LOG.debug("DBRead Id {} empty CurrentProblemsList", interfacePacUuid);
         } else {
-            for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+            for (ContainerCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -303,17 +308,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwAirInterfaceDiversityPacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        AirInterfaceDiversityCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceDiversityCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no AirInterfaceDiversityCurrentProblems", interfacePacUuid);
-        } else if (problems.getCurrentProblemList() == null) {
-            LOG.debug("DBRead Id {} empty CurrentProblemList", interfacePacUuid);
         } else {
-            for (AirInterfaceDiversityCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+            for (AirInterfaceDiversityCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -341,17 +344,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwPureEthernetStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        PureEthernetStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        PureEthernetStructureCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no PureEthernetStructureCurrentProblems", interfacePacUuid);
-        } else if (problems.getCurrentProblemList() == null) {
-            LOG.debug("DBRead Id {} empty CurrentProblemsList", interfacePacUuid);
         } else {
-            for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+            for (StructureCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -379,17 +380,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwHybridMwStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        HybridMwStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        HybridMwStructureCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no HybridMwStructureCurrentProblems", interfacePacUuid);
-        } else if (problems.getCurrentProblemList() == null) {
-            LOG.debug("DBRead Id {} empty CurrentProblemsList", interfacePacUuid);
         } else {
-            for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+            for (StructureCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -428,18 +427,16 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
                     .builder(clazzPac, cons.newInstance(interfacePacUuid)).child(clazzProblems).build();
 
             // -- Specific part 2
-            TdmContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+            TdmContainerCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                     LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
             if (problems == null) {
                 LOG.debug("DBRead Id {} no TdmContainerCurrentProblems", interfacePacUuid);
-            } else if (problems.getCurrentProblemList() == null) {
-                LOG.debug("DBRead Id {} empty CurrentProblemsList", interfacePacUuid);
             } else {
                 // -- Specific part 3
-                for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
+                for (ContainerCurrentProblemTypeG problem : problems.nonnullCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
@@ -463,17 +460,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
     private List<ExtendedAirInterfaceHistoricalPerformanceType12> readTheHistoricalPerformanceDataOfMwAirInterfacePac(
             Lp lp) {
 
-        String uuId = lp.getUuid().getValue();
-
         List<ExtendedAirInterfaceHistoricalPerformanceType12> resultList = new ArrayList<>();
-        LOG.debug("DBRead Get {} MWAirInterfacePac: {}", coreData.getMountpoint(), uuId);
+        LOG.debug("DBRead Get {} MWAirInterfacePac: {}", coreData.getMountpoint(), lp.getUuid());
         // ----
-        UniversalId mwAirInterfacePacuuId = new UniversalId(uuId);
+        UniversalId mwAirInterfacePacuuId = lp.getUuid();
         // Step 2.1: construct data and the relative iid
         InstanceIdentifier<AirInterfaceConfiguration> mwAirInterfaceConfigurationIID = InstanceIdentifier
                 .builder(MwAirInterfacePac.class, new MwAirInterfacePacKey(mwAirInterfacePacuuId))
                 .child(AirInterfaceConfiguration.class).build();
-        AirInterfaceConfiguration airConfiguration = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceConfiguration airConfiguration = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceConfigurationIID);
 
         if (airConfiguration == null) {
@@ -486,7 +481,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
                     .child(AirInterfaceHistoricalPerformances.class).build();
 
             // Step 2.3: read to the config data store
-            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = GenericTransactionUtils.readData(
+            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = genericTransactionUtils.readData(
                     coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, mwAirInterfaceHistoricalPerformanceIID);
 
             if (airHistoricalPerformanceData == null) {
@@ -495,14 +490,12 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
             } else {
                 // org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170320.air._interface.historical.performances.g.HistoricalPerformanceDataList
                 List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performances.g.HistoricalPerformanceDataList> airHistPMList = airHistoricalPerformanceData
-                        .getHistoricalPerformanceDataList();
+                        .nonnullHistoricalPerformanceDataList();
                 LOG.debug("DBRead MWAirInterfacePac Id {} Records intermediate: {}", mwAirInterfacePacuuId,
                         airHistPMList.size());
-                if (airHistPMList != null) {
-                    for (AirInterfaceHistoricalPerformanceTypeG pmRecord : airHistoricalPerformanceData
-                            .getHistoricalPerformanceDataList()) {
-                        resultList.add(new ExtendedAirInterfaceHistoricalPerformanceType12(pmRecord, airConfiguration));
-                    }
+                for (AirInterfaceHistoricalPerformanceTypeG pmRecord : airHistoricalPerformanceData
+                        .nonnullHistoricalPerformanceDataList()) {
+                    resultList.add(new ExtendedAirInterfaceHistoricalPerformanceType12(pmRecord, airConfiguration));
                 }
             }
         }
@@ -513,19 +506,18 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
     private List<ContainerHistoricalPerformanceTypeG> readTheHistoricalPerformanceDataOfEthernetContainer(Lp lp) {
 
         final String myName = "MWEthernetContainerPac";
-        String uuId = lp.getUuid().getValue();
 
         List<ContainerHistoricalPerformanceTypeG> resultList = new ArrayList<>();
-        LOG.debug("DBRead Get {} : {}", coreData.getMountpoint(), myName, uuId);
+        LOG.debug("DBRead Get {} : {}", coreData.getMountpoint(), myName, lp.getUuid());
         // ----
-        UniversalId ethContainerPacuuId = new UniversalId(uuId);
+        UniversalId ethContainerPacuuId = lp.getUuid();
         // Step 2.2: construct data and the relative iid
         InstanceIdentifier<EthernetContainerHistoricalPerformances> ethContainerIID = InstanceIdentifier
                 .builder(MwEthernetContainerPac.class, new MwEthernetContainerPacKey(ethContainerPacuuId))
                 .child(EthernetContainerHistoricalPerformances.class).build();
 
         // Step 2.3: read to the config data store
-        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = GenericTransactionUtils
+        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = genericTransactionUtils
                 .readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, ethContainerIID);
 
         if (ethContainerHistoricalPerformanceData == null) {
@@ -535,12 +527,10 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
             // org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170320.ethernet.container.historical.performances.g.HistoricalPerformanceDataList
             // org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.ethernet.container.historical.performances.g.HistoricalPerformanceDataList
             List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.ethernet.container.historical.performances.g.HistoricalPerformanceDataList> airHistPMList = ethContainerHistoricalPerformanceData
-                    .getHistoricalPerformanceDataList();
+                    .nonnullHistoricalPerformanceDataList();
             LOG.debug("DBRead {} Id {} Records intermediate: {}", myName, ethContainerPacuuId, airHistPMList.size());
-            if (airHistPMList != null) {
-                for (ContainerHistoricalPerformanceTypeG pmRecord : airHistPMList) {
-                    resultList.add(pmRecord);
-                }
+            for (ContainerHistoricalPerformanceTypeG pmRecord : airHistPMList) {
+                resultList.add(pmRecord);
             }
         }
         LOG.debug("DBRead {} Id {} Records result: {}", myName, ethContainerPacuuId, resultList.size());
@@ -550,20 +540,22 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
     @Override
     public void onObjectCreationNotification(ObjectCreationNotification notification) {
         LOG.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
-
-        ObjectCreationNotificationXml notificationXml = new ObjectCreationNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
-                InternalDateAndTime.valueOf(notification.getTimeStamp()),
-                notification.getObjectIdRef().getValue());
-        microwaveModelListener.onObjectCreationNotification(notificationXml);
+        if (notification != null) {
+            ObjectCreationNotificationXml notificationXml = new ObjectCreationNotificationXml(coreData.getMountpoint(),
+                    notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()),
+                    notification.getObjectIdRef().getValue());
+            microwaveModelListener.onObjectCreationNotification(notificationXml);
+        }
     }
 
+
+
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
         LOG.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
 
         ObjectDeletionNotificationXml notificationXml = new ObjectDeletionNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
+                notification.getCounter(),
                 InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue()
                 );
@@ -577,7 +569,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
 
         ProblemNotificationXml notificationXml = new ProblemNotificationXml(coreData.getMountpoint(), notification.getObjectIdRef().getValue(),
                 notification.getProblem(), InternalSeverity.valueOf(notification.getSeverity()),
-                notification.getCounter().toString(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
 
         microwaveModelListener.onProblemNotification(notificationXml);
     }
@@ -587,11 +579,15 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         LOG.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
 
         AttributeValueChangedNotificationXml notificationXml = new AttributeValueChangedNotificationXml(coreData.getMountpoint(),
-                String.valueOf(notification.getCounter()), InternalDateAndTime.valueOf(notification.getTimeStamp()),
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue(), notification.getAttributeName(), notification.getNewValue());
 
         microwaveModelListener.onAttributeValueChangedNotification(notificationXml);
     }
 
+    private static String getUuid(Lp lp) {
+        UniversalId uuid = lp.getUuid();
+        return uuid != null ? uuid.getValue() : null;
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev180907.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev180907.java
index 27583f8ac..f01f9c83d 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev180907.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev180907.java
@@ -15,39 +15,34 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCoreData;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType1211;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType1211;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectDeletionNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.AirInterfaceCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.AirInterfaceDiversityCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.AirInterfaceHistoricalPerformanceTypeG;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.AttributeValueChangedNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ContainerCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ContainerHistoricalPerformanceTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.MicrowaveModelListener;
@@ -63,6 +58,9 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.r
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.MwPureEthernetStructurePacKey;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.MwTdmContainerPac;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.MwTdmContainerPacKey;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ProblemNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.StructureCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.diversity.pac.AirInterfaceDiversityCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.pac.AirInterfaceConfiguration;
@@ -73,10 +71,11 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.r
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.hybrid.mw.structure.pac.HybridMwStructureCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.pure.ethernet.structure.pac.PureEthernetStructureCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.tdm.container.pac.TdmContainerCurrentProblems;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.AttributeValueChangedNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ObjectCreationNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ObjectDeletionNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ProblemNotification;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, MicrowaveModelListener {
@@ -86,34 +85,43 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
     public static final QName QNAME = MwAirInterfacePac.QNAME;
 
 
-    private ONFCoreNetworkElementCoreData coreData;
+    private NetworkElementCoreData coreData;
+
+    private OnfMicrowaveModelNotification microwaveModelListener;
 
-	private OnfMicrowaveModelNotification microwaveModelListener;
+    private final TransactionUtils genericTransactionUtil;
 
 
     /*-----------------------------------------------------------------------------
      * Setter/Getter
      */
 
+    /**
+     * @param acessor
+     */
+    public WrapperMicrowaveModelRev180907(INetconfAcessor acessor) {
+        genericTransactionUtil = acessor.getTransactionUtils();
+    }
+
     @Override
-    public void setCoreData(ONFCoreNetworkElementCoreData coreData) {
-		this.coreData = coreData;
-	}
+    public void setCoreData(NetworkElementCoreData coreData) {
+        this.coreData = coreData;
+    }
 
-	public ONFCoreNetworkElementCoreData getCoreData() {
-		return coreData;
-	}
+    public NetworkElementCoreData getCoreData() {
+        return coreData;
+    }
 
-	@Override
-	public void setOnfMicrowaveModelListener(OnfMicrowaveModelNotification microwaveModelListener) {
-		this.microwaveModelListener = microwaveModelListener;
-	}
+    @Override
+    public void setOnfMicrowaveModelListener(OnfMicrowaveModelNotification microwaveModelListener) {
+        this.microwaveModelListener = microwaveModelListener;
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public <T extends NotificationListener> T getNotificationListener() {
-		return (T) this;
-	}
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends NotificationListener> T getNotificationListener() {
+        return (T) this;
+    }
 
     /*-----------------------------------------------------------------------------
      * Interfacefunctions
@@ -121,66 +129,66 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
 
     @Override
     public void readTheFaultsOfMicrowaveModel(ONFLayerProtocolName lpName, Class<?> lpClass, UniversalId uuid,
-    		List<ProblemNotificationXml> resultList) {
+            List<ProblemNotificationXml> resultList) {
 
-    	switch (lpName) {
-    	case MWAirInterface:
-    		readTheFaultsOfMwAirInterfacePac(uuid, resultList);
-    		break;
+        switch (lpName) {
+        case MWAirInterface:
+            readTheFaultsOfMwAirInterfacePac(uuid, resultList);
+            break;
 
-    	case EthernetContainer12:
-    		readTheFaultsOfMwEthernetContainerPac(uuid, resultList);
-    		break;
+        case EthernetContainer12:
+            readTheFaultsOfMwEthernetContainerPac(uuid, resultList);
+            break;
 
-    	case TDMContainer:
-    		readTheFaultsOfMwTdmContainerPac(uuid, resultList);
-    		break;
+        case TDMContainer:
+            readTheFaultsOfMwTdmContainerPac(uuid, resultList);
+            break;
 
-    	case Structure:
-    		if (lpClass == MwHybridMwStructurePac.class) {
-    			readTheFaultsOfMwHybridMwStructurePac(uuid, resultList);
+        case Structure:
+            if (lpClass == MwHybridMwStructurePac.class) {
+                readTheFaultsOfMwHybridMwStructurePac(uuid, resultList);
 
-    		} else if (lpClass == MwAirInterfaceDiversityPac.class) {
-    			readTheFaultsOfMwAirInterfaceDiversityPac(uuid, resultList);
+            } else if (lpClass == MwAirInterfaceDiversityPac.class) {
+                readTheFaultsOfMwAirInterfaceDiversityPac(uuid, resultList);
 
-    		} else if (lpClass == MwPureEthernetStructurePac.class) {
-    			readTheFaultsOfMwPureEthernetStructurePac(uuid, resultList);
+            } else if (lpClass == MwPureEthernetStructurePac.class) {
+                readTheFaultsOfMwPureEthernetStructurePac(uuid, resultList);
 
-    		} else {
-    			LOG.warn("Unassigned lp model {} class {}", lpName, lpClass);
-    		}
-    		break;
+            } else {
+                LOG.warn("Unassigned lp model {} class {}", lpName, lpClass);
+            }
+            break;
         case Ethernet:
             // No alarms supported
             break;
         case EthernetContainer10:
         default:
             LOG.warn("Unassigned or not expected lp in model {}", lpName);
-    	}
+        }
     }
 
-	@Override
+    @Override
     public List<? extends OtnHistoryDataG> readTheHistoricalPerformanceData(ONFLayerProtocolName lpName, Lp lp) {
-    	switch (lpName) {
-    	case MWAirInterface:
-    		return readTheHistoricalPerformanceDataOfMwAirInterfacePac(lp);
-
-    	case EthernetContainer12:
-    		return readTheHistoricalPerformanceDataOfEthernetContainer(lp);
-
-    	case EthernetContainer10:
-    	case EthernetPhysical:
-    	case Ethernet:
-    	case TDMContainer:
-    	case Structure:
-    	case Unknown:
-    		LOG.debug("Do not read HistoricalPM data for {} {}", lpName, lp.getUuid().getValue());
-    		break;
-    	}
-    	return new ArrayList<>();
+        switch (lpName) {
+        case MWAirInterface:
+            return readTheHistoricalPerformanceDataOfMwAirInterfacePac(lp);
+
+        case EthernetContainer12:
+            return readTheHistoricalPerformanceDataOfEthernetContainer(lp);
+
+        case EthernetContainer10:
+        case EthernetPhysical:
+        case Ethernet:
+        case TDMContainer:
+        case Structure:
+        case Unknown:
+            LOG.debug("Do not read HistoricalPM data for {} {}", lpName, lp.getUuid().getValue());
+            break;
+        }
+        return new ArrayList<>();
     }
 
-	@Override
+    @Override
     public Class<?> getClassForLtpExtension(QName qName) {
         Class<?> res = null;
         if (qName.equals(MwAirInterfacePac.QNAME)) {
@@ -197,8 +205,8 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             res = MwTdmContainerPac.class;
         }
         LOG.info("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
-		return res;
-	}
+        return res;
+    }
 
     /*-----------------------------------------------------------------------------
      * Reading problems for specific interface pacs
@@ -221,7 +229,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         // AirInterfaceCurrentProblemTypeG.class;
 
         LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
-        		coreData.getMountpoint(), interfacePacUuid.getValue());
+                coreData.getMountpoint(), interfacePacUuid.getValue());
 
         // Step 2.2: construct data and the relative iid
         InstanceIdentifier<AirInterfaceCurrentProblems> mwAirInterfaceIID = InstanceIdentifier
@@ -229,7 +237,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                 .child(AirInterfaceCurrentProblems.class).build();
 
         // Step 2.3: read to the config data store
-        AirInterfaceCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceIID);
 
         if (problems == null) {
@@ -240,7 +248,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             for (AirInterfaceCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -270,7 +278,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                 .builder(MwEthernetContainerPac.class, new MwEthernetContainerPacKey(interfacePacUuid))
                 .child(EthernetContainerCurrentProblems.class).build();
 
-        EthernetContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        EthernetContainerCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no EthernetContainerCurrentProblems", interfacePacUuid);
@@ -280,7 +288,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -308,7 +316,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwAirInterfaceDiversityPacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        AirInterfaceDiversityCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceDiversityCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no AirInterfaceDiversityCurrentProblems", interfacePacUuid);
@@ -318,7 +326,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             for (AirInterfaceDiversityCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -346,7 +354,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwPureEthernetStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        PureEthernetStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        PureEthernetStructureCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no PureEthernetStructureCurrentProblems", interfacePacUuid);
@@ -356,7 +364,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -384,7 +392,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwHybridMwStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        HybridMwStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        HybridMwStructureCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no HybridMwStructureCurrentProblems", interfacePacUuid);
@@ -394,7 +402,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -433,7 +441,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                     .builder(clazzPac, cons.newInstance(interfacePacUuid)).child(clazzProblems).build();
 
             // -- Specific part 2
-            TdmContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+            TdmContainerCurrentProblems problems = genericTransactionUtil.readData(coreData.getDataBroker(),
                     LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
             if (problems == null) {
                 LOG.debug("DBRead Id {} no TdmContainerCurrentProblems", interfacePacUuid);
@@ -444,7 +452,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                 for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
@@ -478,7 +486,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<AirInterfaceConfiguration> mwAirInterfaceConfigurationIID = InstanceIdentifier
                 .builder(MwAirInterfacePac.class, new MwAirInterfacePacKey(mwAirInterfacePacuuId))
                 .child(AirInterfaceConfiguration.class).build();
-        AirInterfaceConfiguration airConfiguration = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceConfiguration airConfiguration = genericTransactionUtil.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceConfigurationIID);
 
         if (airConfiguration == null) {
@@ -491,8 +499,8 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                     .child(AirInterfaceHistoricalPerformances.class).build();
 
             // Step 2.3: read to the config data store
-            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = GenericTransactionUtils.readData(
-            		coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, mwAirInterfaceHistoricalPerformanceIID);
+            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = genericTransactionUtil.readData(
+                    coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, mwAirInterfaceHistoricalPerformanceIID);
 
             if (airHistoricalPerformanceData == null) {
                 LOG.debug("DBRead MWAirInterfacePac Id {} no AirInterfaceHistoricalPerformances",
@@ -530,7 +538,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
                 .child(EthernetContainerHistoricalPerformances.class).build();
 
         // Step 2.3: read to the config data store
-        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = GenericTransactionUtils
+        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = genericTransactionUtil
                 .readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, ethContainerIID);
 
         if (ethContainerHistoricalPerformanceData == null) {
@@ -556,23 +564,23 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         LOG.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
 
         ObjectCreationNotificationXml notificationXml = new ObjectCreationNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
+                notification.getCounter(),
                 InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue());
         microwaveModelListener.onObjectCreationNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
         LOG.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
 
         ObjectDeletionNotificationXml notificationXml = new ObjectDeletionNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
+                notification.getCounter(),
                 InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue()
                 );
         microwaveModelListener.onObjectDeletionNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onProblemNotification(ProblemNotification notification) {
@@ -581,20 +589,20 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
 
         ProblemNotificationXml notificationXml = new ProblemNotificationXml(coreData.getMountpoint(), notification.getObjectIdRef().getValue(),
                 notification.getProblem(), InternalSeverity.valueOf(notification.getSeverity()),
-                notification.getCounter().toString(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
 
         microwaveModelListener.onProblemNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onAttributeValueChangedNotification(AttributeValueChangedNotification notification) {
         LOG.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
 
         AttributeValueChangedNotificationXml notificationXml = new AttributeValueChangedNotificationXml(coreData.getMountpoint(),
-                String.valueOf(notification.getCounter()), InternalDateAndTime.valueOf(notification.getTimeStamp()),
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue(), notification.getAttributeName(), notification.getNewValue());
 
         microwaveModelListener.onAttributeValueChangedNotification(notificationXml);
-	}
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev181010.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev181010.java
index 86358072e..627b64e6d 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/wrapperc/WrapperMicrowaveModelRev181010.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperMicrowaveModelRev181010.java
@@ -15,39 +15,34 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
 
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCoreData;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType1211p;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.GenericTransactionUtils;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.NetworkElementCoreData;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType1211p;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectDeletionNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.AirInterfaceCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.AirInterfaceDiversityCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.AirInterfaceHistoricalPerformanceTypeG;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.AttributeValueChangedNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ContainerCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ContainerHistoricalPerformanceTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.MicrowaveModelListener;
@@ -63,6 +58,9 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.r
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.MwPureEthernetStructurePacKey;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.MwTdmContainerPac;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.MwTdmContainerPacKey;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ProblemNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.StructureCurrentProblemTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.diversity.pac.AirInterfaceDiversityCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.pac.AirInterfaceConfiguration;
@@ -73,10 +71,11 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.r
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.hybrid.mw.structure.pac.HybridMwStructureCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.pure.ethernet.structure.pac.PureEthernetStructureCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.tdm.container.pac.TdmContainerCurrentProblems;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.AttributeValueChangedNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ObjectCreationNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ObjectDeletionNotification;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ProblemNotification;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, MicrowaveModelListener {
@@ -86,33 +85,41 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
     public static final QName QNAME = MwAirInterfacePac.QNAME;
 
 
-    private ONFCoreNetworkElementCoreData coreData;
+    private NetworkElementCoreData coreData;
 
-	private OnfMicrowaveModelNotification microwaveModelListener;
+    private OnfMicrowaveModelNotification microwaveModelListener;
+    private final TransactionUtils genericTransactionUtils;
 
     /*-----------------------------------------------------------------------------
      * Setter/Getter
      */
 
+    /**
+     * @param acessor
+     */
+    public WrapperMicrowaveModelRev181010(INetconfAcessor acessor) {
+        genericTransactionUtils = acessor.getTransactionUtils();
+    }
+
     @Override
-    public void setCoreData(ONFCoreNetworkElementCoreData coreData) {
-		this.coreData = coreData;
-	}
+    public void setCoreData(NetworkElementCoreData coreData) {
+        this.coreData = coreData;
+    }
 
-	public ONFCoreNetworkElementCoreData getCoreData() {
-		return coreData;
-	}
+    public NetworkElementCoreData getCoreData() {
+        return coreData;
+    }
 
-	@Override
-	public void setOnfMicrowaveModelListener(OnfMicrowaveModelNotification microwaveModelListener) {
-		this.microwaveModelListener = microwaveModelListener;
-	}
+    @Override
+    public void setOnfMicrowaveModelListener(OnfMicrowaveModelNotification microwaveModelListener) {
+        this.microwaveModelListener = microwaveModelListener;
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public <T extends NotificationListener> T getNotificationListener() {
-		return (T) this;
-	}
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends NotificationListener> T getNotificationListener() {
+        return (T) this;
+    }
 
     /*-----------------------------------------------------------------------------
      * Interfacefunctions
@@ -120,66 +127,66 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
 
     @Override
     public void readTheFaultsOfMicrowaveModel(ONFLayerProtocolName lpName, Class<?> lpClass, UniversalId uuid,
-    		List<ProblemNotificationXml> resultList) {
+            List<ProblemNotificationXml> resultList) {
 
-    	switch (lpName) {
-    	case MWAirInterface:
-    		readTheFaultsOfMwAirInterfacePac(uuid, resultList);
-    		break;
+        switch (lpName) {
+        case MWAirInterface:
+            readTheFaultsOfMwAirInterfacePac(uuid, resultList);
+            break;
 
-    	case EthernetContainer12:
-    		readTheFaultsOfMwEthernetContainerPac(uuid, resultList);
-    		break;
+        case EthernetContainer12:
+            readTheFaultsOfMwEthernetContainerPac(uuid, resultList);
+            break;
 
-    	case TDMContainer:
-    		readTheFaultsOfMwTdmContainerPac(uuid, resultList);
-    		break;
+        case TDMContainer:
+            readTheFaultsOfMwTdmContainerPac(uuid, resultList);
+            break;
 
-    	case Structure:
-    		if (lpClass == MwHybridMwStructurePac.class) {
-    			readTheFaultsOfMwHybridMwStructurePac(uuid, resultList);
+        case Structure:
+            if (lpClass == MwHybridMwStructurePac.class) {
+                readTheFaultsOfMwHybridMwStructurePac(uuid, resultList);
 
-    		} else if (lpClass == MwAirInterfaceDiversityPac.class) {
-    			readTheFaultsOfMwAirInterfaceDiversityPac(uuid, resultList);
+            } else if (lpClass == MwAirInterfaceDiversityPac.class) {
+                readTheFaultsOfMwAirInterfaceDiversityPac(uuid, resultList);
 
-    		} else if (lpClass == MwPureEthernetStructurePac.class) {
-    			readTheFaultsOfMwPureEthernetStructurePac(uuid, resultList);
+            } else if (lpClass == MwPureEthernetStructurePac.class) {
+                readTheFaultsOfMwPureEthernetStructurePac(uuid, resultList);
 
-    		} else {
-    			LOG.warn("Unassigned lp model {} class {}", lpName, lpClass);
-    		}
-    		break;
+            } else {
+                LOG.warn("Unassigned lp model {} class {}", lpName, lpClass);
+            }
+            break;
         case Ethernet:
             // No alarms supported
             break;
         case EthernetContainer10:
         default:
             LOG.warn("Unassigned or not expected lp in model {}", lpName);
-    	}
+        }
     }
 
-	@Override
+    @Override
     public List<? extends OtnHistoryDataG> readTheHistoricalPerformanceData(ONFLayerProtocolName lpName, Lp lp) {
-    	switch (lpName) {
-    	case MWAirInterface:
-    		return readTheHistoricalPerformanceDataOfMwAirInterfacePac(lp);
-
-    	case EthernetContainer12:
-    		return readTheHistoricalPerformanceDataOfEthernetContainer(lp);
-
-    	case EthernetContainer10:
-    	case EthernetPhysical:
-    	case Ethernet:
-    	case TDMContainer:
-    	case Structure:
-    	case Unknown:
-    		LOG.debug("Do not read HistoricalPM data for {} {}", lpName, lp.getUuid().getValue());
-    		break;
-    	}
-    	return new ArrayList<>();
+        switch (lpName) {
+        case MWAirInterface:
+            return readTheHistoricalPerformanceDataOfMwAirInterfacePac(lp);
+
+        case EthernetContainer12:
+            return readTheHistoricalPerformanceDataOfEthernetContainer(lp);
+
+        case EthernetContainer10:
+        case EthernetPhysical:
+        case Ethernet:
+        case TDMContainer:
+        case Structure:
+        case Unknown:
+            LOG.debug("Do not read HistoricalPM data for {} {}", lpName, lp.getUuid().getValue());
+            break;
+        }
+        return new ArrayList<>();
     }
 
-	@Override
+    @Override
     public Class<?> getClassForLtpExtension(QName qName) {
         Class<?> res = null;
         if (qName.equals(MwAirInterfacePac.QNAME)) {
@@ -196,8 +203,8 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             res = MwTdmContainerPac.class;
         }
         LOG.info("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
-		return res;
-	}
+        return res;
+    }
 
     /*-----------------------------------------------------------------------------
      * Reading problems for specific interface pacs
@@ -220,7 +227,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         // AirInterfaceCurrentProblemTypeG.class;
 
         LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
-        		coreData.getMountpoint(), interfacePacUuid.getValue());
+                coreData.getMountpoint(), interfacePacUuid.getValue());
 
         // Step 2.2: construct data and the relative iid
         InstanceIdentifier<AirInterfaceCurrentProblems> mwAirInterfaceIID = InstanceIdentifier
@@ -228,7 +235,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                 .child(AirInterfaceCurrentProblems.class).build();
 
         // Step 2.3: read to the config data store
-        AirInterfaceCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceIID);
 
         if (problems == null) {
@@ -239,7 +246,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             for (AirInterfaceCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -269,7 +276,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                 .builder(MwEthernetContainerPac.class, new MwEthernetContainerPacKey(interfacePacUuid))
                 .child(EthernetContainerCurrentProblems.class).build();
 
-        EthernetContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        EthernetContainerCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no EthernetContainerCurrentProblems", interfacePacUuid);
@@ -279,7 +286,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -307,7 +314,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwAirInterfaceDiversityPacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        AirInterfaceDiversityCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceDiversityCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no AirInterfaceDiversityCurrentProblems", interfacePacUuid);
@@ -317,7 +324,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             for (AirInterfaceDiversityCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -345,7 +352,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwPureEthernetStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        PureEthernetStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        PureEthernetStructureCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no PureEthernetStructureCurrentProblems", interfacePacUuid);
@@ -355,7 +362,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -383,7 +390,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
                 .builder(clazzPac, new MwHybridMwStructurePacKey(interfacePacUuid)).child(clazzProblems).build();
 
-        HybridMwStructureCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        HybridMwStructureCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
         if (problems == null) {
             LOG.debug("DBRead Id {} no HybridMwStructureCurrentProblems", interfacePacUuid);
@@ -393,7 +400,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             for (StructureCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                 resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                         problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                        problem.getSequenceNumber().toString(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
+                        problem.getSequenceNumber(), InternalDateAndTime.valueOf(problem.getTimeStamp())));
             }
         }
         return resultList;
@@ -432,7 +439,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                     .builder(clazzPac, cons.newInstance(interfacePacUuid)).child(clazzProblems).build();
 
             // -- Specific part 2
-            TdmContainerCurrentProblems problems = GenericTransactionUtils.readData(coreData.getDataBroker(),
+            TdmContainerCurrentProblems problems = genericTransactionUtils.readData(coreData.getDataBroker(),
                     LogicalDatastoreType.OPERATIONAL, mwEthInterfaceIID);
             if (problems == null) {
                 LOG.debug("DBRead Id {} no TdmContainerCurrentProblems", interfacePacUuid);
@@ -443,7 +450,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                 for (ContainerCurrentProblemTypeG problem : problems.getCurrentProblemList()) {
                     resultList.add(new ProblemNotificationXml(coreData.getMountpoint(), interfacePacUuid.getValue(),
                             problem.getProblemName(), InternalSeverity.valueOf(problem.getProblemSeverity()),
-                            problem.getSequenceNumber().toString(),
+                            problem.getSequenceNumber(),
                             InternalDateAndTime.valueOf(problem.getTimeStamp())));
                 }
             }
@@ -477,7 +484,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         InstanceIdentifier<AirInterfaceConfiguration> mwAirInterfaceConfigurationIID = InstanceIdentifier
                 .builder(MwAirInterfacePac.class, new MwAirInterfacePacKey(mwAirInterfacePacuuId))
                 .child(AirInterfaceConfiguration.class).build();
-        AirInterfaceConfiguration airConfiguration = GenericTransactionUtils.readData(coreData.getDataBroker(),
+        AirInterfaceConfiguration airConfiguration = genericTransactionUtils.readData(coreData.getDataBroker(),
                 LogicalDatastoreType.OPERATIONAL, mwAirInterfaceConfigurationIID);
 
         if (airConfiguration == null) {
@@ -490,8 +497,8 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                     .child(AirInterfaceHistoricalPerformances.class).build();
 
             // Step 2.3: read to the config data store
-            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = GenericTransactionUtils.readData(
-            		coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, mwAirInterfaceHistoricalPerformanceIID);
+            AirInterfaceHistoricalPerformances airHistoricalPerformanceData = genericTransactionUtils.readData(
+                    coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, mwAirInterfaceHistoricalPerformanceIID);
 
             if (airHistoricalPerformanceData == null) {
                 LOG.debug("DBRead MWAirInterfacePac Id {} no AirInterfaceHistoricalPerformances",
@@ -529,7 +536,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
                 .child(EthernetContainerHistoricalPerformances.class).build();
 
         // Step 2.3: read to the config data store
-        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = GenericTransactionUtils
+        EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData = genericTransactionUtils
                 .readData(coreData.getDataBroker(), LogicalDatastoreType.OPERATIONAL, ethContainerIID);
 
         if (ethContainerHistoricalPerformanceData == null) {
@@ -555,23 +562,23 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         LOG.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
 
         ObjectCreationNotificationXml notificationXml = new ObjectCreationNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
+                notification.getCounter(),
                 InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue());
         microwaveModelListener.onObjectCreationNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
         LOG.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
 
         ObjectDeletionNotificationXml notificationXml = new ObjectDeletionNotificationXml(coreData.getMountpoint(),
-                notification.getCounter().toString(),
+                notification.getCounter(),
                 InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue()
                 );
         microwaveModelListener.onObjectDeletionNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onProblemNotification(ProblemNotification notification) {
@@ -580,20 +587,20 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
 
         ProblemNotificationXml notificationXml = new ProblemNotificationXml(coreData.getMountpoint(), notification.getObjectIdRef().getValue(),
                 notification.getProblem(), InternalSeverity.valueOf(notification.getSeverity()),
-                notification.getCounter().toString(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()));
 
         microwaveModelListener.onProblemNotification(notificationXml);
-	}
+    }
 
     @Override
     public void onAttributeValueChangedNotification(AttributeValueChangedNotification notification) {
         LOG.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
 
         AttributeValueChangedNotificationXml notificationXml = new AttributeValueChangedNotificationXml(coreData.getMountpoint(),
-                String.valueOf(notification.getCounter()), InternalDateAndTime.valueOf(notification.getTimeStamp()),
+                notification.getCounter(), InternalDateAndTime.valueOf(notification.getTimeStamp()),
                 notification.getObjectIdRef().getValue(), notification.getAttributeName(), notification.getNewValue());
 
         microwaveModelListener.onAttributeValueChangedNotification(notificationXml);
-	}
+    }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperPTPModelRev170208.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperPTPModelRev170208.java
new file mode 100644
index 000000000..172db1198
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/onfcore/wrapperc/WrapperPTPModelRev170208.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc;
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 java.util.List;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.InstanceList;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.InstanceListKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.instance.list.PortDsList;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.port.ds.entry.PortIdentity;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Reading PTP specific information from networkelement and creating log-trace output.
+ *
+ * @author herbert
+ */
+public class WrapperPTPModelRev170208 {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperPTPModelRev170208.class);
+
+    protected static final InstanceIdentifier<InstanceList> PTPINSTANCES_IID = InstanceIdentifier
+            .builder(InstanceList.class, new InstanceListKey(1)).build();
+
+    /**
+     * Query synchronization information out of NE
+     */
+
+    public static void initSynchronizationExtension(INetconfAcessor acessor) {
+
+        String mountPointNodeName = acessor.getNodeId().getValue();
+        Capabilities capabilities = acessor.getCapabilites();
+        try {
+            if (!capabilities.isSupportingNamespaceAndRevision(InstanceList.QNAME)) {
+                LOG.debug("Mountpoint {} does not support PTP", mountPointNodeName);
+            } else {
+                StringBuffer sb = new StringBuffer();
+                sb.append("NE ");
+                sb.append(mountPointNodeName);
+                sb.append(" does support synchronisation.\n");
+                InstanceList ptpInstance = readPTPClockInstances(acessor);
+                if (ptpInstance != null) {
+                    List<PortDsList> dsList = ptpInstance.getPortDsList();
+                    if (dsList != null) {
+                        int t = 0;
+                        for (PortDsList portDs : dsList) {
+                            PortIdentity portId = portDs.getPortIdentity();
+                            if (portId != null) {
+                                sb.append("Port[");
+                                sb.append(portId.getPortNumber());
+                                sb.append("]{ ClockId: ");
+                                sb.append(portId.getClockIdentity());
+                                sb.append(", Portstate: ");
+                                sb.append(portDs.getPortState());
+                                sb.append("}, ");
+                            } else {
+                                sb.append("Incomplete port #" + t + ", ");
+                            }
+                            t++;
+                        }
+                    } else {
+                        sb.append("dsList contains null");
+                    }
+                } else {
+                    sb.append("ptpInstance equals null");
+                }
+                LOG.trace(sb.toString());
+            }
+        } catch (Exception e) {
+            LOG.info("Inconsistent synchronisation structure: " + e.getMessage());
+        }
+    }
+
+    @Nullable
+    private static InstanceList readPTPClockInstances(INetconfAcessor acessor) {
+        return acessor.getTransactionUtils().readData(acessor.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+                PTPINSTANCES_IID);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/BaseSubConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/BaseSubConfig.java
deleted file mode 100644
index 88dde506c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/BaseSubConfig.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConversionException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.Section;
-
-public class BaseSubConfig {
-
-    private final Section subconfig;
-    private final ISubConfigHandler configHandler;
-    private final IniConfigurationFile config;
-
-    protected Section getSubConfig() {
-        return this.subconfig;
-    }
-    protected ISubConfigHandler getConfigHandler() {
-        return this.configHandler;
-    }
-    protected IniConfigurationFile getConfig() {
-        return this.config;
-    }
-    public BaseSubConfig()
-    {
-        this.config=null;
-        this.subconfig=null;
-        this.configHandler=null;
-    }
-    public BaseSubConfig(IniConfigurationFile config, ISubConfigHandler configHandler,String section) {
-        this.config = config;
-        this.subconfig = config.subset(section);
-        this.configHandler = configHandler;
-    }
-    protected boolean hasKey(String key)
-    {
-        if(this.subconfig==null) {
-            return false;
-        }
-        return this.subconfig.hasKey(key);
-    }
-    protected String getString(String key,String def)
-    {
-        if(this.subconfig==null) {
-            return def;
-        }
-        String s;
-        //try
-        {
-            s=this.subconfig.getString(key, def);
-            if(s.isEmpty()) {
-                s=def;
-            }
-        }
-        /*catch(ConversionException e)
-        {
-            s=def;
-        }
-        */
-        return s;
-    }
-    protected boolean getBoolean(String key, boolean def) {
-        if(this.subconfig==null) {
-            return def;
-        }
-        boolean s;
-        try {
-            s=this.subconfig.getBoolean(key, def);
-        }
-        catch(ConversionException e)
-        {
-            s=def;
-        }
-        return s;
-    }
-    protected int getInt(String key, int def) {
-        if(this.subconfig==null) {
-            return def;
-        }
-        int s;
-        try {
-            s=this.subconfig.getInt(key, def);
-        }
-        catch(ConversionException e)
-        {
-            s=def;
-        }
-        return s;
-    }
-    protected long getLong(String key, long def) {
-        if(this.subconfig==null) {
-            return def;
-        }
-        long s;
-        try {
-            s=this.subconfig.getLong(key, def);
-        }
-        catch(ConversionException e)
-        {
-            s=def;
-        }
-        return s;
-    }
-    protected void save()
-    {
-        if(this.configHandler!=null) {
-            this.configHandler.save();
-        }
-    }
-
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/HtDevicemanagerConfiguration.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/HtDevicemanagerConfiguration.java
deleted file mode 100644
index 1f2dde235..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/HtDevicemanagerConfiguration.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config;
-
-import java.io.File;
-import java.io.IOException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AaiConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DcaeConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DmConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.EsConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.PmConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.ToggleAlarmConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ConfigFileObserver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HtDevicemanagerConfiguration {
-
-    private static final long FILE_POLL_INTERVAL_MS = 1000;
-
-    private static final Logger LOG = LoggerFactory.getLogger(HtDevicemanagerConfiguration.class);
-
-    private static final String CONFIGURATIONFILE = "etc/devicemanager.properties";
-    private static final String CONFIGURATIONTESTFILE = "test.properties"; // for
-    // testing
-
-    private static HtDevicemanagerConfiguration mObj;
-    private static HtDevicemanagerConfiguration mObjTest;
-    private static IniConfigurationFile mConfig;
-    private final ISubConfigHandler subconfigHandler = () -> mConfig.save();
-
-    private final ConfigFileObserver fileObserver;
-    private File mFile;
-
-    private HtDevicemanagerConfiguration(String filename) {
-
-        try {
-            this.mFile = new File(filename);
-            if (!this.mFile.exists()) {
-                if (!this.mFile.createNewFile()) {
-                    LOG.error("Can not create file {}", filename);
-                }
-            }
-            if (mConfig == null) {
-                mConfig = new IniConfigurationFile(this.mFile);
-            }
-            mConfig.load();
-
-        } catch (ConfigurationException e) {
-            LOG.error("Problem loading config values: {}", e.getMessage());
-        } catch (IOException e) {
-            LOG.error("Problem loading config file {} : {}", filename, e.getMessage());
-        }
-
-        this.fileObserver = new ConfigFileObserver(filename, FILE_POLL_INTERVAL_MS, mConfig);
-        this.fileObserver.start();
-    }
-
-
-    public static HtDevicemanagerConfiguration getConfiguration() {
-        if (mObj == null) {
-            mObj = new HtDevicemanagerConfiguration(CONFIGURATIONFILE);
-        }
-        return mObj;
-    }
-    public static HtDevicemanagerConfiguration getTestConfiguration() {
-        return getTestConfiguration(CONFIGURATIONTESTFILE,false);
-    }
-
-    public static HtDevicemanagerConfiguration getTestConfiguration(boolean newInstance) {
-        return getTestConfiguration(CONFIGURATIONTESTFILE,newInstance);
-    }
-    public static HtDevicemanagerConfiguration getTestConfiguration(String filename) {
-        return getTestConfiguration(filename,false);
-    }
-    public static HtDevicemanagerConfiguration getTestConfiguration(final String filename,boolean newInstance) {
-        if (mObjTest == null || newInstance) {
-            mObjTest = new HtDevicemanagerConfiguration(filename);
-        }
-        return mObjTest;
-    }
-
-    public IniConfigurationFile getMConfig() {
-        return mConfig;
-    }
-
-    public void registerConfigChangedListener(IConfigChangedListener l) {
-        this.fileObserver.registerConfigChangedListener(l);
-    }
-
-    public void unregisterConfigChangedListener(IConfigChangedListener l) {
-        this.fileObserver.unregisterConfigChangedListener(l);
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        if (this.fileObserver != null) {
-            this.fileObserver.interrupt();
-        }
-        super.finalize();
-    }
-
-    public DcaeConfig getDcae() {
-        return DcaeConfig.getDcae(mConfig, this.subconfigHandler);
-    }
-
-    public AaiConfig getAai() {
-        return AaiConfig.getAai(mConfig, this.subconfigHandler);
-    }
-
-    public EsConfig getEs() {
-        return EsConfig.getEs(mConfig, this.subconfigHandler);
-    }
-
-    public PmConfig getPm() {
-        return PmConfig.getPm(mConfig, this.subconfigHandler);
-    }
-
-    public ToggleAlarmConfig getToggleAlarm() {
-        return ToggleAlarmConfig.getTa(mConfig, this.subconfigHandler);
-    }
-
-    public DmConfig getDmConfig() {
-    	return DmConfig.getDmConfig(mConfig, this.subconfigHandler);
-    }
-
-    public ISubConfigHandler getSubconfigHandler() {
-        return subconfigHandler;
-    }
-
-    public static void clear() {
-        mObj = null;
-        mObjTest = null;
-        DcaeConfig.clear();
-        AaiConfig.clear();
-        EsConfig.clear();
-        PmConfig.clear();
-        ToggleAlarmConfig.clear();
-        DmConfig.clear();
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiClientPropertiesFile.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiClientPropertiesFile.java
deleted file mode 100644
index 7912f047b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiClientPropertiesFile.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-public class AaiClientPropertiesFile{
-
-    private final File mFile;
-    private String mPCKS12CertFilename;
-    private String mPCKS12Passphrase;
-    private boolean mTrustInsecureSSL;
-    private String mApplicationIdentifier;
-    private String mRemoteUrl;
-    private int mConnectionTimeout;
-    private int mReadTimeout;
-
-    public String getFilename()
-    { return this.mFile.getAbsolutePath();    }
-    public String getPCKS12CertFilename()
-    {return this.mPCKS12CertFilename;}
-    public String getPCKS12Passphrase()
-    {return this.mPCKS12Passphrase;    }
-    public boolean trustInsecureSSL()
-    {return this.mTrustInsecureSSL;}
-    public String getApplicationIdentifier()
-    {return this.mApplicationIdentifier;}
-    public String getRemoteUrl()
-    {return this.mRemoteUrl;}
-    public int getConnectionTimeout()
-    {return this.mConnectionTimeout;}
-    public int getReadTimeout()
-    {return this.mReadTimeout;}
-
-    public boolean exists()
-    {return this.mFile.exists();}
-    public AaiClientPropertiesFile(String filename)
-    {
-        this.mFile=new File(filename);
-    }
-    public void load() throws IOException,NumberFormatException
-    {
-        Properties defaultProps = new Properties();
-        FileInputStream in = new FileInputStream(this.mFile);
-        defaultProps.load(in);
-        this.mPCKS12CertFilename=defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.ssl.key",null);
-        this.mPCKS12Passphrase=defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd",null);
-        this.mTrustInsecureSSL=defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore","false").equals("true");
-        this.mApplicationIdentifier=defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.application",null);
-        this.mRemoteUrl=defaultProps.getProperty("org.onap.ccsdk.sli.adaptors.aai.uri",null);
-        this.mConnectionTimeout=Integer.parseInt(defaultProps.getProperty("connection.timeout","60000"));
-        this.mReadTimeout=Integer.parseInt(defaultProps.getProperty("read.timeout","60000"));
-        in.close();
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiConfig.java
deleted file mode 100644
index fd5d04e6a..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AaiConfig.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import java.io.IOException;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import javax.annotation.Nullable;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AaiConfig extends BaseSubConfig {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AaiConfig.class);
-
-    private static final String SECTION_MARKER_AAI = "aai";
-
-    private static final String PROPERTY_KEY_AAIPROP_FILE ="aaiPropertiesFile";
-    private static final String PROPERTY_KEY_BASEURL = "aaiUrl";
-    private static final String PROPERTY_KEY_USERCREDENTIALS = "aaiUserCredentials";
-    private static final String PROPERTY_KEY_HEADERS = "aaiHeaders";
-    private static final String PROPERTY_KEY_DELETEONMOUNTPOINTREMOVED = "aaiDeleteOnMountpointRemove";
-    private static final String PROPERTY_KEY_TRUSTALLCERTS = "aaiTrustAllCerts";
-    private static final String PROPERTY_KEY_APIVERSION = "aaiApiVersion";
-    private static final String PROPERTY_KEY_PCKS12CERTFILENAME = "aaiPcks12ClientCertFile";
-    private static final String PROPERTY_KEY_PCKS12PASSPHRASE = "aaiPcks12ClientCertPassphrase";
-    private static final String PROPERTY_KEY_CONNECTIONTIMEOUT = "aaiClientConnectionTimeout";
-    private static final String PROPERTY_KEY_APPLICATIONID = "aaiApplicationId";
-
-    private static final String DEFAULT_VALUE_AAIPROP_FILE ="null";
-    private static final String DEFAULT_VALUE_BASEURL = "off";
-    private static final String DEFAULT_VALUE_APPLICATION = "SDNR";
-    private static final String DEFAULT_VALUE_USERNAME = "";
-    private static final String DEFAULT_VALUE_USERPASSWORD = "";
-    private static final String DEFAULT_VALUE_USERCREDENTIALS = "";
-    private static final String DEFAULT_VALUE_HEADERS = "[\"X-TransactionId: 9999\"]";
-    private static final boolean DEFAULT_VALUE_DELETEONMOUNTPOINTREMOVED = false;
-    private static final boolean DEFAULT_VALUE_TRUSTALLCERTS = false;
-    private static final int DEFAULT_VALUE_CONNECTION_TIMEOUT = 30000;    //in ms
-    private static final String DEFAULT_VALUE_APIVERSION = "aai/v13";
-    private static final String DEFAULT_VALUE_PCKS12CERTFILENAME ="";
-    private static final String DEFAULT_VALUE_PCKS12PASSPHRASE = "";
-    private static final String DEFAULT_VALUE_APPLICATIONID = "SDNR";
-
-    private static final String HEADER_KEY_APPLICATION = "X-FromAppId";
-
-
-    private static AaiConfig aaiConfig;
-
-    private final String aaiPropFile;
-    private final String baseUrl;
-    private String apiVersion;
-    private String applicationIdentifier;
-    private String username;
-    private String password;
-    private String pcks12CertificateFilename;
-    private String pcks12CertificatePassphrase;
-    private int connectionTimeout;
-    private final boolean deleteOnMountPointRemoved;
-    private final boolean trustAllCerts;
-
-    public boolean doDeleteOnMountPointRemoved() {
-        return this.deleteOnMountPointRemoved;
-    }
-
-    private Map<String, String> headers;
-
-
-    private AaiConfig() {
-        super();
-        this.aaiPropFile = DEFAULT_VALUE_AAIPROP_FILE;
-        this.apiVersion=DEFAULT_VALUE_APIVERSION;
-        this.applicationIdentifier = DEFAULT_VALUE_APPLICATION;
-        this.baseUrl = DEFAULT_VALUE_BASEURL;
-        this.username = DEFAULT_VALUE_USERNAME;
-        this.password = DEFAULT_VALUE_USERPASSWORD;
-        this.deleteOnMountPointRemoved = DEFAULT_VALUE_DELETEONMOUNTPOINTREMOVED;
-        this.trustAllCerts=DEFAULT_VALUE_TRUSTALLCERTS;
-        this.applicationIdentifier=DEFAULT_VALUE_APPLICATIONID;
-    }
-
-    public AaiConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    public AaiConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-        super(config, configHandler, SECTION_MARKER_AAI);
-        // load
-        this.aaiPropFile=this.getString(PROPERTY_KEY_AAIPROP_FILE, "");
-        AaiClientPropertiesFile aaiProperties = new AaiClientPropertiesFile(this.aaiPropFile);
-        String defBaseUrl=DEFAULT_VALUE_BASEURL;
-        String defPCKSCertFilename=DEFAULT_VALUE_PCKS12CERTFILENAME;
-        String defPCKSPassphrase=DEFAULT_VALUE_PCKS12PASSPHRASE;
-        String defApplicationId=DEFAULT_VALUE_APPLICATION;
-        int defconnectionTimeout=DEFAULT_VALUE_CONNECTION_TIMEOUT;
-        boolean loaded=false;
-        if(aaiProperties.exists())
-        {
-            LOG.debug("found another aaiclient.properties file");
-            try
-            {
-                aaiProperties.load();
-                loaded=true;
-                LOG.debug("loaded successfully");
-            }
-            catch(IOException|NumberFormatException e)
-            {
-                LOG.warn("problem loading external properties file "+aaiProperties.getFilename()+": "+e.getMessage());
-            }
-            if(loaded)    //preload new default values
-            {
-                String value;
-                value = aaiProperties.getRemoteUrl();
-                if (value != null) {
-                    defBaseUrl = value;
-                }
-                value = aaiProperties.getPCKS12CertFilename();
-                if (value != null) {
-                    defPCKSCertFilename = value;
-                }
-                value = aaiProperties.getPCKS12Passphrase();
-                if (value != null) {
-                    defPCKSPassphrase = value;
-                }
-                value = aaiProperties.getApplicationIdentifier();
-                if (value != null) {
-                    defApplicationId = value;
-                }
-            }
-        } else {
-            LOG.debug("no aaiclient.properties file found");
-        }
-
-
-        this.baseUrl = this.getString(PROPERTY_KEY_BASEURL, defBaseUrl);
-        this.apiVersion=this.getString(PROPERTY_KEY_APIVERSION,DEFAULT_VALUE_APIVERSION);
-        String credentials = this.getString(PROPERTY_KEY_USERCREDENTIALS, DEFAULT_VALUE_USERCREDENTIALS);
-        if (credentials.contains(":")) {
-            try {
-                this.username = credentials.split(":")[0];
-                this.password = credentials.split(":")[1];
-            } catch (Exception e) {
-                this.username = DEFAULT_VALUE_USERNAME;
-                this.password = DEFAULT_VALUE_USERPASSWORD;
-            }
-        } else {
-            this.username = DEFAULT_VALUE_USERNAME;
-            this.password = DEFAULT_VALUE_USERPASSWORD;
-        }
-        this.headers = _parseHeadersMap(this.getString(PROPERTY_KEY_HEADERS, DEFAULT_VALUE_HEADERS));
-        this.applicationIdentifier = this.getString(PROPERTY_KEY_APPLICATIONID, defApplicationId);
-        this.pcks12CertificateFilename=this.getString(PROPERTY_KEY_PCKS12CERTFILENAME, defPCKSCertFilename);
-        this.pcks12CertificatePassphrase=this.getString(PROPERTY_KEY_PCKS12PASSPHRASE, defPCKSPassphrase);
-        this.connectionTimeout = this.getInt(PROPERTY_KEY_CONNECTIONTIMEOUT, defconnectionTimeout);
-        this.deleteOnMountPointRemoved = this.getBoolean(PROPERTY_KEY_DELETEONMOUNTPOINTREMOVED,
-                DEFAULT_VALUE_DELETEONMOUNTPOINTREMOVED);
-        this.trustAllCerts = this.getBoolean(PROPERTY_KEY_TRUSTALLCERTS, DEFAULT_VALUE_TRUSTALLCERTS);
-
-        boolean missing=!this.hasKey(PROPERTY_KEY_APPLICATIONID)|| !this.hasKey(PROPERTY_KEY_CONNECTIONTIMEOUT)||
-                !this.hasKey(PROPERTY_KEY_TRUSTALLCERTS) || !this.hasKey(PROPERTY_KEY_PCKS12CERTFILENAME) ||
-                !this.hasKey(PROPERTY_KEY_PCKS12PASSPHRASE);
-        if(missing) {
-            LOG.debug("some params missing in config file");
-        }
-        //re-save if external aaiproperties file changed to show that params are submitted internally
-        if(missing || aaiConfig!=null && aaiConfig!=this && (
-                !propertyEquals(aaiConfig.aaiPropFile, this.aaiPropFile) ||
-                !propertyEquals(aaiConfig.pcks12CertificateFilename, this.pcks12CertificateFilename) ||
-                !propertyEquals(aaiConfig.pcks12CertificatePassphrase, this.pcks12CertificatePassphrase) ||
-                !propertyEquals(aaiConfig.connectionTimeout, this.connectionTimeout)
-
-                ))
-        {
-            LOG.debug("force saving because of reload changes from remote file");
-            save=true;
-        }
-        if (save) {
-            config.setProperty(SECTION_MARKER_AAI + "." + PROPERTY_KEY_BASEURL, this.baseUrl);
-            config.setProperty(SECTION_MARKER_AAI + "." + PROPERTY_KEY_USERCREDENTIALS,
-                    nullorempty(this.username) && nullorempty(this.password)?"":this.username + ":" + this.password);
-            config.setProperty(SECTION_MARKER_AAI + "." + PROPERTY_KEY_HEADERS, _printHeadersMap(this.headers));
-            config.setProperty(SECTION_MARKER_AAI + "." + PROPERTY_KEY_DELETEONMOUNTPOINTREMOVED,
-                    this.deleteOnMountPointRemoved);
-            config.setProperty(SECTION_MARKER_AAI + "." + PROPERTY_KEY_TRUSTALLCERTS, this.trustAllCerts);
-            config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_AAIPROP_FILE, this.aaiPropFile);
-            config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_APIVERSION,this.apiVersion);
-            config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_APPLICATIONID, this.applicationIdentifier);
-            config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_CONNECTIONTIMEOUT, this.connectionTimeout);
-            /*if(this.pcks12CertificateFilename !=null && !this.pcks12CertificateFilename.isEmpty() &&
-                    this.pcks12CertificatePassphrase!=null && !this.pcks12CertificatePassphrase.isEmpty())*/
-            {
-                LOG.debug("no client credentials to save");
-                config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_PCKS12CERTFILENAME, this.pcks12CertificateFilename);
-                config.setProperty(SECTION_MARKER_AAI+"."+PROPERTY_KEY_PCKS12PASSPHRASE, this.pcks12CertificatePassphrase);
-            }
-            LOG.debug("save");
-            this.save();
-        }
-    }
-
-    private boolean nullorempty(String s) {
-        return s==null || s.isEmpty();
-    }
-
-    public boolean isOff() {
-        return this.baseUrl == null || this.baseUrl.toLowerCase().equals("off");
-    }
-
-    private static boolean propertyEquals(final Object p1,final Object p2)
-    {
-        return p1==null && p2==null || p1 != null && p1.equals(p2);
-    }
-    private static boolean propertyEquals(final int p1,final int p2)
-    {
-        return p1==p2;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (aaiPropFile == null ? 0 : aaiPropFile.hashCode());
-        result = prime * result + (apiVersion == null ? 0 : apiVersion.hashCode());
-        result = prime * result + (applicationIdentifier == null ? 0 : applicationIdentifier.hashCode());
-        result = prime * result + (baseUrl == null ? 0 : baseUrl.hashCode());
-        result = prime * result + connectionTimeout;
-        result = prime * result + (deleteOnMountPointRemoved ? 1231 : 1237);
-        result = prime * result + (headers == null ? 0 : headers.hashCode());
-        result = prime * result + (password == null ? 0 : password.hashCode());
-        result = prime * result + (pcks12CertificateFilename == null ? 0 : pcks12CertificateFilename.hashCode());
-        result = prime * result + (pcks12CertificatePassphrase == null ? 0 : pcks12CertificatePassphrase.hashCode());
-        result = prime * result + (trustAllCerts ? 1231 : 1237);
-        result = prime * result + (username == null ? 0 : username.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        AaiConfig other = (AaiConfig) obj;
-        if (aaiPropFile == null) {
-            if (other.aaiPropFile != null) {
-                return false;
-            }
-        } else if (!aaiPropFile.equals(other.aaiPropFile)) {
-            return false;
-        }
-        if (apiVersion == null) {
-            if (other.apiVersion != null) {
-                return false;
-            }
-        } else if (!apiVersion.equals(other.apiVersion)) {
-            return false;
-        }
-        if (applicationIdentifier == null) {
-            if (other.applicationIdentifier != null) {
-                return false;
-            }
-        } else if (!applicationIdentifier.equals(other.applicationIdentifier)) {
-            return false;
-        }
-        if (baseUrl == null) {
-            if (other.baseUrl != null) {
-                return false;
-            }
-        } else if (!baseUrl.equals(other.baseUrl)) {
-            return false;
-        }
-        if (connectionTimeout != other.connectionTimeout) {
-            return false;
-        }
-        if (deleteOnMountPointRemoved != other.deleteOnMountPointRemoved) {
-            return false;
-        }
-        if (headers == null) {
-            if (other.headers != null) {
-                return false;
-            }
-        } else if (!headers.equals(other.headers)) {
-            return false;
-        }
-        if (password == null) {
-            if (other.password != null) {
-                return false;
-            }
-        } else if (!password.equals(other.password)) {
-            return false;
-        }
-        if (pcks12CertificateFilename == null) {
-            if (other.pcks12CertificateFilename != null) {
-                return false;
-            }
-        } else if (!pcks12CertificateFilename.equals(other.pcks12CertificateFilename)) {
-            return false;
-        }
-        if (pcks12CertificatePassphrase == null) {
-            if (other.pcks12CertificatePassphrase != null) {
-                return false;
-            }
-        } else if (!pcks12CertificatePassphrase.equals(other.pcks12CertificatePassphrase)) {
-            return false;
-        }
-        if (trustAllCerts != other.trustAllCerts) {
-            return false;
-        }
-        if (username == null) {
-            if (other.username != null) {
-                return false;
-            }
-        } else if (!username.equals(other.username)) {
-            return false;
-        }
-        return true;
-    }
-
-    public String getBaseUri() {
-    	String s;
-    	if(!this.apiVersion.startsWith("/")) {
-            s="/"+this.apiVersion;
-        }
-    	else
-    		s=this.apiVersion;
-    	return s;
-    }
-    public String getBaseUrl() {
-        String url=this.baseUrl;
-        if(!url.endsWith("/")) {
-            url+="/";
-        }
-        if(this.apiVersion.startsWith("/")) {
-            this.apiVersion=this.apiVersion.substring(1);
-        }
-        return url+this.apiVersion;
-    }
-
-    public Map<String, String> getHeaders() {
-        if (this.headers == null) {
-            this.headers = new HashMap<>();
-        }
-        this.headers.put(HEADER_KEY_APPLICATION, this.applicationIdentifier);
-        String s = this.headers.getOrDefault("Authorization", null);
-        if (nullorempty(s) && !nullorempty(this.username) && !nullorempty(this.password)) {
-            this.headers.put("Authorization", "Basic "
-                    + new String(Base64.getEncoder().encode((this.username + ":" + this.password).getBytes())));
-        }
-        return this.headers;
-    }
-
-    @Override
-    public String toString() {
-        return "AaiConfig [aaiPropFile=" + aaiPropFile + ", baseUrl=" + baseUrl + ", apiVersion=" + apiVersion
-                + ", applicationIdentifier=" + applicationIdentifier + ", username=" + username + ", password="
-                + password + ", pcks12CertificateFilename=" + pcks12CertificateFilename
-                + ", pcks12CertificatePassphrase=" + pcks12CertificatePassphrase + ", connectionTimeout="
-                + connectionTimeout + ", deleteOnMountPointRemoved=" + deleteOnMountPointRemoved + ", trustAllCerts="
-                + trustAllCerts + ", headers=" + this.getHeaders() + "]";
-    }
-
-    private static String _printHeadersMap(Map<String, String> headers) {
-        String r = "[";
-        if (headers != null) {
-            int i = 0;
-            for (Entry<String, String> entry : headers.entrySet()) {
-                if (i > 0) {
-                    r += ",";
-                }
-                r += "\"" + entry.getKey() + ":" + entry.getValue() + "\"";
-                i++;
-            }
-        }
-        r += "]";
-        return r;
-    }
-
-    private static Map<String, String> _parseHeadersMap(String s) throws JSONException {
-        Map<String, String> r = new HashMap<>();
-        JSONArray a = new JSONArray(s);
-        if (a != null && a.length() > 0) {
-            for (int i = 0; i < a.length(); i++) {
-                String item = a.getString(i);
-                String[] hlp = item.split(":");
-                if (hlp.length > 1) {
-                    r.put(hlp[0], hlp[1]);
-                }
-            }
-        }
-        return r;
-    }
-
-    public static boolean isInstantiated() {
-        return aaiConfig != null;
-    }
-
-    public static AaiConfig getDefaultConfiguration() {
-        return new AaiConfig();
-    }
-
-    public static AaiConfig getAai(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (aaiConfig == null) {
-            try {
-                aaiConfig = new AaiConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                aaiConfig = AaiConfig.getDefaultConfiguration();
-            }
-        }
-        return aaiConfig;
-    }
-
-    public static @Nullable AaiConfig reload() {
-        if (aaiConfig == null) {
-            return null;
-        }
-        AaiConfig tmpConfig;
-        try {
-            tmpConfig = new AaiConfig(aaiConfig.getConfig(), aaiConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = AaiConfig.getDefaultConfiguration();
-            LOG.warn("problem loading config: "+e.getMessage());
-        }
-        aaiConfig = tmpConfig;
-        return aaiConfig;
-    }
-
-    public boolean getTrustAll() {
-        return this.trustAllCerts;
-    }
-
-    public String getPcks12CertificateFilename() {
-        return this.pcks12CertificateFilename;
-    }
-
-    public String getPcks12CertificatePassphrase() {
-        return this.pcks12CertificatePassphrase;
-    }
-
-    public int getConnectionTimeout() {
-        return this.connectionTimeout;
-    }
-
-    public static void clear() {
-        aaiConfig=null;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DcaeConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DcaeConfig.java
deleted file mode 100644
index 669b211e1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DcaeConfig.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-
-public class DcaeConfig extends BaseSubConfig {
-    private static final String SECTION_MARKER_DCAE = "dcae";
-
-    private static final String PROPERTY_KEY_EVENTRECEIVERURL = "dcaeUrl";
-    //private static final String PROPERTY_KEY_TESTCOLLECTOR = "dcaeTestCollector";
-    private static final String PROPERTY_KEY_USERCREDENTIALS = "dcaeUserCredentials";
-    private static final String PROPERTY_KEY_TIMERPERIOD = "dcaeHeartbeatPeriodSeconds";
-
-    private static final String DEFAULT_VALUE_EVENTRECEIVERURL = "off";
-    @SuppressWarnings("unused")
-    private static final String DEFAULT_VALUE_TESTCOLLECTOR = "no";
-    private static final String DEFAULT_VALUE_USERCREDENTIALS = "admin:admin";
-    private static final int DEFAULT_VALUE_TIMERPERIOD = 120;
-
-    private static DcaeConfig dcaeConfig = null; // Singleton of configuration data
-
-    private String eventReceiverUrl;
-    private String userCredentials;
-    private Integer timerPeriodSeconds;
-
-    private DcaeConfig() {
-        super();
-        this.eventReceiverUrl = DEFAULT_VALUE_EVENTRECEIVERURL;
-        this.userCredentials = DEFAULT_VALUE_USERCREDENTIALS;
-        this.timerPeriodSeconds = DEFAULT_VALUE_TIMERPERIOD;
-    }
-
-    private DcaeConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    private DcaeConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-
-        super(config, configHandler, SECTION_MARKER_DCAE);
-
-        this.eventReceiverUrl = this.getString(PROPERTY_KEY_EVENTRECEIVERURL, DEFAULT_VALUE_EVENTRECEIVERURL);
-        this.userCredentials = this.getString(PROPERTY_KEY_USERCREDENTIALS, DEFAULT_VALUE_USERCREDENTIALS);
-        this.timerPeriodSeconds = this.getInt(PROPERTY_KEY_TIMERPERIOD, DEFAULT_VALUE_TIMERPERIOD);
-        if (save) {
-            config.setProperty(SECTION_MARKER_DCAE + "." + PROPERTY_KEY_EVENTRECEIVERURL, this.eventReceiverUrl);
-            config.setProperty(SECTION_MARKER_DCAE + "." + PROPERTY_KEY_USERCREDENTIALS, this.userCredentials);
-            config.setProperty(SECTION_MARKER_DCAE + "." + PROPERTY_KEY_TIMERPERIOD, this.timerPeriodSeconds);
-
-            this.save();
-        }
-    }
-
-    /*
-     * Setter
-     */
-
-    public void setEventReceiverUrl(String eventReveicerUrl) {
-        this.eventReceiverUrl = eventReveicerUrl;
-    }
-
-    public void setUserCredentials(String userCredentials) {
-        this.userCredentials = userCredentials;
-    }
-
-
-
-    public void setTimerPeriodSeconds(Integer timerPeriodSeconds) {
-        this.timerPeriodSeconds = timerPeriodSeconds;
-    }
-
-    /*
-     * Getter
-     */
-
-    public String getEventReveicerUrl() {
-        return eventReceiverUrl;
-    }
-
-    public String getUserCredentials() {
-        return userCredentials;
-    }
-
-
-    public Integer getTimerPeriodSeconds() {
-        return timerPeriodSeconds;
-    }
-
-    @Override
-    public String toString() {
-        return "DcaeConfig [eventReceiverUrl=" + eventReceiverUrl + ", userCredentials=" + userCredentials
-                + ", timerPeriodSeconds=" + timerPeriodSeconds + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (eventReceiverUrl == null ? 0 : eventReceiverUrl.hashCode());
-        result = prime * result + (timerPeriodSeconds == null ? 0 : timerPeriodSeconds.hashCode());
-        result = prime * result + (userCredentials == null ? 0 : userCredentials.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        DcaeConfig other = (DcaeConfig) obj;
-        if (eventReceiverUrl == null) {
-            if (other.eventReceiverUrl != null) {
-                return false;
-            }
-        } else if (!eventReceiverUrl.equals(other.eventReceiverUrl)) {
-            return false;
-        }
-        if (timerPeriodSeconds == null) {
-            if (other.timerPeriodSeconds != null) {
-                return false;
-            }
-        } else if (!timerPeriodSeconds.equals(other.timerPeriodSeconds)) {
-            return false;
-        }
-        if (userCredentials == null) {
-            if (other.userCredentials != null) {
-                return false;
-            }
-        } else if (!userCredentials.equals(other.userCredentials)) {
-            return false;
-        }
-        return true;
-    }
-
-     /*-------------------------------------
-     * static Functions
-     */
-
-    public static DcaeConfig getDefaultConfiguration() {
-        return new DcaeConfig();
-    }
-
-    public static DcaeConfig getDcae(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (dcaeConfig == null) {
-            try {
-                dcaeConfig = new DcaeConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                dcaeConfig = DcaeConfig.getDefaultConfiguration();
-            }
-        }
-        return dcaeConfig;
-    }
-
-    public static boolean isInstantiated() {
-        return dcaeConfig != null;
-    }
-
-    public static DcaeConfig reload() {
-        if (dcaeConfig == null) {
-            return null;
-        }
-        DcaeConfig tmpConfig;
-        try {
-            tmpConfig = new DcaeConfig(dcaeConfig.getConfig(), dcaeConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = DcaeConfig.getDefaultConfiguration();
-        }
-        dcaeConfig = tmpConfig;
-        return dcaeConfig;
-    }
-
-    public static void clear() {
-        dcaeConfig=null;
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DmConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DmConfig.java
deleted file mode 100644
index c62a8eca6..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/DmConfig.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import java.util.EnumMap;
-import java.util.Map;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitorProblems;
-
-/**
- * Configuration of devicemonitor, section [devicemonitor]
- *   SeverityConnectionlossNeOAM=minor
- *   SeverityConnectionlossOAM=major
- *   SeverityConnectionlossMediator=critical
- */
-public class DmConfig extends BaseSubConfig{
-
-    private static final String SECTION_MARKER_TA = "devicemonitor";
-    private static final String PROPERTY_KEY_PREFIX_Severity = "Severity";
-
-    private static DmConfig dmConfig = null;
-
-    private Map<DeviceMonitorProblems, InternalSeverity> severty = new EnumMap<>(DeviceMonitorProblems.class);
-
-    /*
-     * Constructor
-     */
-    private DmConfig() {
-        super();
-    }
-
-    public DmConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    public DmConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-
-        super(config, configHandler, SECTION_MARKER_TA);
-
-        for (DeviceMonitorProblems problem : DeviceMonitorProblems.values()) {
-        	severty.put(problem, readProperty(problem));
-        }
-
-        if (save) {
-            for (DeviceMonitorProblems problem : DeviceMonitorProblems.values()) {
-            	configSetPropertyp(config, problem, severty.get(problem));
-            }
-            this.save();
-        }
-    }
-
-	public InternalSeverity getSeverity(DeviceMonitorProblems problem) {
-		return severty.get(problem);
-	}
-
-    public static DmConfig getDefaultConfiguration() {
-        DmConfig c = new DmConfig();
-        for (DeviceMonitorProblems problem : DeviceMonitorProblems.values()) {
-        	c.severty.put(problem, InternalSeverity.Major);
-        }
-        return c;
-    }
-    public static boolean isInstantiated() {
-        return dmConfig != null;
-    }
-
-    public static DmConfig getDmConfig(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (dmConfig == null) {
-            try {
-                dmConfig = new DmConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                dmConfig = DmConfig.getDefaultConfiguration();
-            }
-        }
-        return dmConfig;
-    }
-
-    public static DmConfig reload() {
-        if (dmConfig == null) {
-            return null;
-        }
-        DmConfig tmpConfig;
-        try {
-            tmpConfig = new DmConfig(dmConfig.getConfig(), dmConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = DmConfig.getDefaultConfiguration();
-        }
-        dmConfig = tmpConfig;
-        return dmConfig;
-    }
-
-    public static void clear() {
-        dmConfig=null;
-    }
-
-    /*
-     * Private Helper functions
-     */
-    private static String getPropertyName(DeviceMonitorProblems problem) {
-    	return PROPERTY_KEY_PREFIX_Severity+problem.name();
-    }
-
-    private static void configSetPropertyp(IniConfigurationFile config, DeviceMonitorProblems problem, InternalSeverity value) {
-        config.setProperty(SECTION_MARKER_TA + "."+getPropertyName(problem), value.getValueAsString());
-    }
-
-    private InternalSeverity readProperty(DeviceMonitorProblems problem) {
-    	return InternalSeverity.valueOfString(getString(getPropertyName(problem), InternalSeverity.Major.getValueAsString()));
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/EsConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/EsConfig.java
deleted file mode 100644
index bdfbf655d..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/EsConfig.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Environment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-
-public class EsConfig extends BaseSubConfig {
-
-    public static final String SECTION_MARKER_ES = "es";
-    public static final String ESDATATYPENAME = "database";
-    private static final String EMPTY = "empty";
-    private static final String PROPERTY_KEY_CLUSTER = "esCluster";
-    private static final String PROPERTY_KEY_ARCHIVE_INTERVAL = "esArchiveCheckIntervalSeconds";
-    private static final String PROPERTY_KEY_ARCHIVE_LIMIT = "esArchiveLifetimeSeconds";
-
-    private static final String DEFAULT_VALUE_CLUSTER = "";
-    /**
-     * check db data in this interval [in seconds]
-     * 0 deactivated
-     */
-    private static final long DEFAULT_ARCHIVE_INTERVAL_SEC = 0;
-    /**
-     * keep data for this time [in seconds]
-     * 30 days
-     */
-    private static final long DEFAULT_ARCHIVE_LIMIT_SEC = 60 * 60 * 24 * 30;
-
-    private static EsConfig esConfig;
-
-    private String cluster;
-    private String host;
-    private String node;
-    private String index;
-    private long archiveCheckIntervalSeconds;
-    private long archiveLifetimeSeconds;
-
-    private EsConfig() {
-        super();
-        this.host = EMPTY;
-        this.node = EMPTY;
-        this.index = EMPTY;
-        this.cluster = DEFAULT_VALUE_CLUSTER;
-        this.archiveCheckIntervalSeconds = DEFAULT_ARCHIVE_INTERVAL_SEC;
-        this.archiveLifetimeSeconds = DEFAULT_ARCHIVE_LIMIT_SEC;
-    }
-
-    public EsConfig cloneWithIndex(String _index) {
-        EsConfig c = new EsConfig();
-        c.index = _index;
-        c.host = this.host;
-        c.node = this.node;
-        c.cluster = this.cluster;
-        c.archiveCheckIntervalSeconds = this.archiveCheckIntervalSeconds;
-        c.archiveLifetimeSeconds = this.archiveLifetimeSeconds;
-        return c;
-    }
-
-    public static String getESDATATYPENAME() {
-        return ESDATATYPENAME;
-    }
-
-    public String getCluster() {
-        return cluster;
-    }
-
-    public void setCluster(String cluster) {
-        this.cluster = cluster;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getNode() {
-        return node;
-    }
-
-    public void setNode(String node) {
-        this.node = node;
-    }
-
-    public String getIndex() {
-        return index;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public long getArchiveCheckIntervalSeconds() {
-        return this.archiveCheckIntervalSeconds;
-    }
-
-    public void setArchiveCheckIntervalSeconds(long x) {
-        this.archiveCheckIntervalSeconds = x;
-    }
-
-    public long getArchiveLifetimeSeconds() {
-        return this.archiveLifetimeSeconds;
-    }
-
-    public void setArchiveLimit(long x) {
-        this.archiveLifetimeSeconds = x;
-    }
-
-    @Override
-    public String toString() {
-        return "EsConfig [cluster=" + cluster + ", host=" + host + ", node=" + node + ", index=" + index + "]";
-    }
-
-    public EsConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    public EsConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-
-        super(config, configHandler, SECTION_MARKER_ES);
-        String clustername = Environment.getVar("$HOSTNAME");
-
-        String c = this.getString(PROPERTY_KEY_CLUSTER, clustername);
-        if (c != null && c.startsWith("$")) {
-            c = Environment.getVar(c);
-        }
-        this.cluster = c;
-        this.node = String.format("%s%s", this.cluster, "n1");
-        this.host = "localhost";
-        this.archiveCheckIntervalSeconds = this.getLong(PROPERTY_KEY_ARCHIVE_INTERVAL, DEFAULT_ARCHIVE_INTERVAL_SEC);
-        this.archiveLifetimeSeconds = this.getLong(PROPERTY_KEY_ARCHIVE_LIMIT, DEFAULT_ARCHIVE_LIMIT_SEC);
-
-        if (save) {
-            config.setProperty(SECTION_MARKER_ES + "." + PROPERTY_KEY_CLUSTER, this.cluster);
-            config.setProperty(SECTION_MARKER_ES + "." + PROPERTY_KEY_ARCHIVE_INTERVAL, this.archiveCheckIntervalSeconds);
-            config.setProperty(SECTION_MARKER_ES + "." + PROPERTY_KEY_ARCHIVE_LIMIT, this.archiveLifetimeSeconds);
-            this.save();
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (cluster == null ? 0 : cluster.hashCode());
-        result = prime * result + (host == null ? 0 : host.hashCode());
-        result = prime * result + (index == null ? 0 : index.hashCode());
-        result = prime * result + (node == null ? 0 : node.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        EsConfig other = (EsConfig) obj;
-        if (cluster == null) {
-            if (other.cluster != null) {
-                return false;
-            }
-        } else if (!cluster.equals(other.cluster)) {
-            return false;
-        }
-        if (host == null) {
-            if (other.host != null) {
-                return false;
-            }
-        } else if (!host.equals(other.host)) {
-            return false;
-        }
-        if (index == null) {
-            if (other.index != null) {
-                return false;
-            }
-        } else if (!index.equals(other.index)) {
-            return false;
-        }
-        if (node == null) {
-            if (other.node != null) {
-                return false;
-            }
-        } else if (!node.equals(other.node)) {
-            return false;
-        }
-        if (archiveCheckIntervalSeconds != other.archiveCheckIntervalSeconds) {
-            return false;
-        }
-        if (archiveLifetimeSeconds != other.archiveLifetimeSeconds) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public void save() {
-        this.getConfig().setProperty(SECTION_MARKER_ES + "." + PROPERTY_KEY_CLUSTER, this.cluster);
-        super.save();
-    }
-
-    public static boolean isInstantiated() {
-        return esConfig != null;
-    }
-
-    public static EsConfig getDefaultConfiguration() {
-        return new EsConfig();
-    }
-
-    public static EsConfig getEs(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (esConfig == null) {
-            try {
-                esConfig = new EsConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                esConfig = EsConfig.getDefaultConfiguration();
-            }
-        }
-        return esConfig;
-    }
-
-    public static EsConfig reload() {
-        if (esConfig == null) {
-            return null;
-        }
-        EsConfig tmpConfig;
-        try {
-            tmpConfig = new EsConfig(esConfig.getConfig(), esConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = EsConfig.getDefaultConfiguration();
-        }
-        esConfig = tmpConfig;
-        return esConfig;
-    }
-
-    public static void clear() {
-        esConfig = null;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/PmConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/PmConfig.java
deleted file mode 100644
index d710efed2..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/PmConfig.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Environment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-
-public class PmConfig extends BaseSubConfig {
-
-    private static final String SECTION_MARKER_PM = "pm";
-    private static final String PROPERTY_KEY_ENABLED = "pmEnabled";
-    private static final String PROPERTY_KEY_CLUSTER = "pmCluster";
-
-    private static final boolean DEFAULT_VALUE_ENABLED = true;
-    private static final String DEFAULT_VALUE_CLUSTER = "";
-    private static PmConfig pmConfig;
-
-    private boolean enabled;
-
-    public static final String ESDATATYPENAME = "database";
-
-    private static final String EMPTY = "empty";
-
-    private String cluster;
-    private String host;
-    private String node;
-
-    public static String getESDATATYPENAME() {
-        return ESDATATYPENAME;
-    }
-
-    public String getCluster() {
-        return cluster;
-    }
-
-    public void setCluster(String cluster) {
-        this.cluster = cluster;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getNode() {
-        return node;
-    }
-
-    public void setNode(String node) {
-        this.node = node;
-    }
-
-    public boolean isPerformanceManagerEnabled() {
-        return this.enabled;
-    }
-
-    public PmConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    public PmConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-
-        super(config, configHandler, SECTION_MARKER_PM);
-        String clustername = Environment.getVar("$HOSTNAME");
-
-        this.enabled = this.getBoolean(PROPERTY_KEY_ENABLED, DEFAULT_VALUE_ENABLED);
-        String c = this.getString(PROPERTY_KEY_CLUSTER, clustername);
-        if (c != null && c.startsWith("$")) {
-            c = Environment.getVar(c);
-        }
-        this.cluster = c;
-        this.node = String.format("%s%s", this.cluster, "n1");
-        this.host = "localhost";
-
-        if (save) {
-            config.setProperty(SECTION_MARKER_PM + "." + PROPERTY_KEY_ENABLED, this.enabled);
-            config.setProperty(SECTION_MARKER_PM + "." + PROPERTY_KEY_CLUSTER, this.cluster);
-
-            this.save();
-        }
-    }
-
-    private PmConfig() {
-        super();
-        this.cluster = EMPTY;
-        this.host = EMPTY;
-        this.node = EMPTY;
-        this.enabled = DEFAULT_VALUE_ENABLED;
-    }
-
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (cluster == null ? 0 : cluster.hashCode());
-        result = prime * result + (enabled ? 1231 : 1237);
-        result = prime * result + (host == null ? 0 : host.hashCode());
-        result = prime * result + (node == null ? 0 : node.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PmConfig other = (PmConfig) obj;
-        if (cluster == null) {
-            if (other.cluster != null) {
-                return false;
-            }
-        } else if (!cluster.equals(other.cluster)) {
-            return false;
-        }
-        if (enabled != other.enabled) {
-            return false;
-        }
-        if (host == null) {
-            if (other.host != null) {
-                return false;
-            }
-        } else if (!host.equals(other.host)) {
-            return false;
-        }
-        if (node == null) {
-            if (other.node != null) {
-                return false;
-            }
-        } else if (!node.equals(other.node)) {
-            return false;
-        }
-        return true;
-    }
-
-    public static PmConfig getDefaultConfiguration() {
-        PmConfig c = new PmConfig();
-        c.enabled = DEFAULT_VALUE_ENABLED;
-        c.cluster = DEFAULT_VALUE_CLUSTER;
-        return c;
-    }
-
-    @Override
-    public String toString() {
-        return "PmConfig [enabled=" + enabled + ", cluster=" + cluster + ", host=" + host + ", node=" + node + "]";
-    }
-
-    public static boolean isInstantiated() {
-        return pmConfig != null;
-    }
-
-    public static PmConfig getPm(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (pmConfig == null) {
-            try {
-                pmConfig = new PmConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                pmConfig = PmConfig.getDefaultConfiguration();
-            }
-        }
-        return pmConfig;
-    }
-
-    public static PmConfig reload() {
-        if (pmConfig == null) {
-            return null;
-        }
-        PmConfig tmpConfig;
-        try {
-            tmpConfig = new PmConfig(pmConfig.getConfig(), pmConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = PmConfig.getDefaultConfiguration();
-        }
-        pmConfig = tmpConfig;
-        return pmConfig;
-    }
-
-    public static void clear() {
-        pmConfig=null;
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/ToggleAlarmConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/ToggleAlarmConfig.java
deleted file mode 100644
index da2f10a75..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/ToggleAlarmConfig.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.BaseSubConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.ISubConfigHandler;
-
-public class ToggleAlarmConfig extends BaseSubConfig{
-
-    private static final String SECTION_MARKER_TA = "toggleAlarmFilter";
-    private static final String PROPERTY_KEY_ENABLED = "taEnabled";
-    private static final String PROPERTY_KEY_DELAY = "taDelay";
-
-    private static final boolean DEFAULT_VALUE_ENABLED = true;
-    private static final long DEFAULT_VALUE_DELAY = 3000;  //in ms
-    private static ToggleAlarmConfig taConfig;
-    private boolean enabled;
-    private long delay;
-
-    public boolean isEnabled() {
-        return this.enabled;
-    }
-    public long getDelay() {
-        return this.delay;
-    }
-    private ToggleAlarmConfig() {
-        super();
-        this.enabled = DEFAULT_VALUE_ENABLED;
-        this.delay=DEFAULT_VALUE_DELAY;
-    }
-    public ToggleAlarmConfig(IniConfigurationFile config, ISubConfigHandler configHandler) throws ConfigurationException {
-        this(config, configHandler, true);
-    }
-
-    public ToggleAlarmConfig(IniConfigurationFile config, ISubConfigHandler configHandler, boolean save)
-            throws ConfigurationException {
-
-        super(config, configHandler, SECTION_MARKER_TA);
-
-        this.enabled = this.getBoolean(PROPERTY_KEY_ENABLED, DEFAULT_VALUE_ENABLED);
-        this.delay = this.getLong(PROPERTY_KEY_DELAY,DEFAULT_VALUE_DELAY);
-        if (save) {
-            config.setProperty(SECTION_MARKER_TA + "." + PROPERTY_KEY_ENABLED, this.enabled);
-            config.setProperty(SECTION_MARKER_TA + "." + PROPERTY_KEY_DELAY, this.delay);
-
-            this.save();
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (delay ^ delay >>> 32);
-        result = prime * result + (enabled ? 1231 : 1237);
-        return result;
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        ToggleAlarmConfig other = (ToggleAlarmConfig) obj;
-        if (delay != other.delay) {
-            return false;
-        }
-        if (enabled != other.enabled) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "ToggleAlarmConfig [enabled=" + enabled + ", delay=" + delay + "]";
-    }
-
-    public static ToggleAlarmConfig getDefaultConfiguration() {
-        ToggleAlarmConfig c = new ToggleAlarmConfig();
-        c.enabled = DEFAULT_VALUE_ENABLED;
-        c.delay = DEFAULT_VALUE_DELAY;
-        return c;
-    }
-    public static boolean isInstantiated() {
-        return taConfig != null;
-    }
-
-    public static ToggleAlarmConfig getTa(IniConfigurationFile config, ISubConfigHandler configHandler) {
-        if (taConfig == null) {
-            try {
-                taConfig = new ToggleAlarmConfig(config, configHandler);
-            } catch (ConfigurationException e) {
-                taConfig = ToggleAlarmConfig.getDefaultConfiguration();
-            }
-        }
-        return taConfig;
-    }
-
-    public static ToggleAlarmConfig reload() {
-        if (taConfig == null) {
-            return null;
-        }
-        ToggleAlarmConfig tmpConfig;
-        try {
-            tmpConfig = new ToggleAlarmConfig(taConfig.getConfig(), taConfig.getConfigHandler(), false);
-        } catch (ConfigurationException e) {
-            tmpConfig = ToggleAlarmConfig.getDefaultConfiguration();
-        }
-        taConfig = tmpConfig;
-        return taConfig;
-    }
-
-    public static void clear() {
-        taConfig=null;
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ConfigFileObserver.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ConfigFileObserver.java
deleted file mode 100644
index daa572a63..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ConfigFileObserver.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.FileWatchdog;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.IniConfigurationFile.ConfigurationException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConfigFileObserver extends FileWatchdog {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigFileObserver.class);
-
-    private final List<IConfigChangedListener> mConfigChangedHandlers = new ArrayList<>();
-    private final IniConfigurationFile mConfig;
-
-    public ConfigFileObserver(String filename, long pollIntervallMs, IniConfigurationFile mConfig) {
-        super(filename);
-        this.setDelay(pollIntervallMs);
-        this.mConfig = mConfig;
-    }
-
-    @Override
-    protected void doOnChange() {
-
-        LOG.debug("property file has changed");
-        try {
-            mConfig.reLoad();
-            // push event to all listeners
-            for (IConfigChangedListener listener : this.mConfigChangedHandlers) {
-                listener.onConfigChanged();
-            }
-        } catch (ConfigurationException e) {
-            LOG.warn("error reloading config: " + e.getMessage());
-        }
-    }
-
-    public void registerConfigChangedListener(@Nonnull IConfigChangedListener l) {
-        if (!this.mConfigChangedHandlers.contains(l)) {
-            this.mConfigChangedHandlers.add(l);
-        }
-    }
-
-    public void unregisterConfigChangedListener(IConfigChangedListener l) {
-        this.mConfigChangedHandlers.remove(l);
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderImpl.java
new file mode 100644
index 000000000..88854dbd1
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderImpl.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.HtAssert;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.NetconfEventListenerHandler12;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DcaeForwarderImpl implements DcaeForwarderInternal, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfEventListenerHandler12.class);
+
+    private final @Nullable ProviderClient aotsmClient;
+    private final ProviderClient dcaeProvider;
+    private final MaintenanceService maintenanceService;
+
+    public DcaeForwarderImpl(@Nullable ProviderClient aotsmClient, @Nullable ProviderClient dcaeProvider,
+            @NonNull MaintenanceService maintenanceService) {
+        super();
+
+        HtAssert.nonnull(maintenanceService);
+        this.aotsmClient = aotsmClient;
+        this.dcaeProvider = dcaeProvider;
+        this.maintenanceService = maintenanceService;
+    }
+
+    @Override
+	@SuppressWarnings("null")
+    public void sendProblemNotificationUsingMaintenanceFilter(String nodeId, ProblemNotificationXml notificationXml) {
+        if (!this.maintenanceService.isONFObjectInMaintenance(nodeId, notificationXml.getObjectId(),
+                notificationXml.getProblem())) {
+            if (dcaeProvider != null) {
+                this.dcaeProvider.sendProblemNotification(nodeId, notificationXml);
+            }
+            if (this.aotsmClient != null) {
+                this.aotsmClient.sendProblemNotification(nodeId, notificationXml);
+            }
+        } else {
+            LOG.debug("Notification will not be sent to external services. Device " + nodeId
+                    + " is in maintenance mode");
+        }
+    }
+
+    @Override
+	public void sendProblemNotification(String nodeId, ProblemNotificationXml notificationXml) {
+        //to prevent push alarms on reconnect
+        //=> only pushed alarms are forwared to dcae
+        //dcaeProvider.sendProblemNotification(nodeName, notificationXml);
+        if(aotsmClient!=null) {
+            aotsmClient.sendProblemNotification(nodeId, notificationXml);
+        }
+
+    }
+
+    @Override
+    public void close() throws Exception {
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderInternal.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderInternal.java
new file mode 100644
index 000000000..68f1ac369
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeForwarderInternal.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DcaeForwarder;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+
+/**
+ * @author herbert
+ *
+ */
+public interface DcaeForwarderInternal extends DcaeForwarder {
+
+    /**
+     * @param oWNKEYNAME
+     * @param notificationXml
+     */
+    void sendProblemNotificationUsingMaintenanceFilter(String oWNKEYNAME, ProblemNotificationXml notificationXml);
+
+    /**
+     * @param nodeName
+     * @param notificationXml
+     */
+    void sendProblemNotification(String nodeName, ProblemNotificationXml notificationXml);
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeMessages.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeMessages.java
index e9da90945..e82e8e965 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeMessages.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeMessages.java
@@ -28,18 +28,18 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
-
-import javax.annotation.Nullable;
+import java.util.Optional;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementRepresentation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.InventoryProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -247,8 +247,14 @@ public class DcaeMessages {
             sb = new StringBuffer();
         }
 
-        ONFCoreNetworkElementRepresentation optionalNe = deviceManager != null ? deviceManager.getNeByMountpoint(mountpointName) : null;
-        InventoryInformation neInventory = optionalNe != null ? optionalNe.getInventoryInformation() : InventoryInformation.getDefault();
+        NetworkElement optionalNe = deviceManager != null ? deviceManager.getNeByMountpoint(mountpointName) : null;
+        InventoryInformation neInventory = InventoryInformation.getDefault();
+        if (optionalNe != null) {
+            Optional<InventoryProvider> inventoryProvider = optionalNe.getService(InventoryProvider.class);
+            if (inventoryProvider.isPresent()) {
+				neInventory = inventoryProvider.get().getInventoryInformation();
+			}
+        }
 
         sb.append("{\n" +
                 "    \"event\": {\n" +
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderClient.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderClient.java
index 0f817323f..6993a14e9 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderClient.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderClient.java
@@ -17,9 +17,9 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DcaeConfig;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.config.DcaeConfig;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
@@ -31,21 +31,23 @@ public class DcaeProviderClient implements AutoCloseable, ProviderClient {
 
     private static final Logger LOG = LoggerFactory.getLogger(DcaeProviderClient.class);
 
-    private final HtDevicemanagerConfiguration htConfig;
+    private final ConfigurationFileRepresentation htConfig;
     private final IConfigChangedListener configChangedListener;
 
-    private final Object lock = new Object();;
+    private final Object lock = new Object();
     private DcaeProviderWorker worker;
+    private DcaeConfig config;
 
-    public DcaeProviderClient(HtDevicemanagerConfiguration cfg, String entityName, DeviceManagerImpl deviceManager) {
+    public DcaeProviderClient(ConfigurationFileRepresentation cfg, String entityName, DeviceManagerImpl deviceManager) {
         LOG.info("Create");
         this.htConfig=cfg;
-        worker = new DcaeProviderWorker(this.htConfig.getDcae(), entityName, deviceManager);
+        this.config = new DcaeConfig(cfg);
+        worker = new DcaeProviderWorker(config, entityName, deviceManager);
         this.configChangedListener = () -> {
             LOG.info("Configuration change. Worker exchanged");
             synchronized(lock) {
                 worker.close();
-                worker = new DcaeProviderWorker(DcaeConfig.reload(), entityName, deviceManager);
+                worker = new DcaeProviderWorker(this.config, entityName, deviceManager);
             }
         };
         this.htConfig.registerConfigChangedListener(configChangedListener );
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderWorker.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderWorker.java
index 17d09ecb2..6293843e8 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderWorker.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeProviderWorker.java
@@ -21,7 +21,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DcaeConfig;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.config.DcaeConfig;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
 import org.slf4j.Logger;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeSenderImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeSenderImpl.java
index 9b386add5..22277a0db 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeSenderImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/DcaeSenderImpl.java
@@ -42,7 +42,7 @@ import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 import java.util.Base64;
 import javax.net.ssl.SSLContext;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.http.BaseHTTPClient;
+import org.onap.ccsdk.features.sdnr.wt.common.http.BaseHTTPClientFromDevicemanager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,7 +69,7 @@ public class DcaeSenderImpl implements DcaeSender {
         if (urlString != null && !urlString.equals("off")) {
             try {
                 this.url = new URL(url);
-                sc = BaseHTTPClient.setupSsl(true);
+                sc = BaseHTTPClientFromDevicemanager.setupSsl(true);
             } catch (KeyManagementException | NoSuchAlgorithmException | UnrecoverableKeyException
                     | CertificateException | KeyStoreException | InvalidKeySpecException | IOException e) {
                 LOG.warn("SSL setup failed: {}", e.getMessage());
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/config/DcaeConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/config/DcaeConfig.java
new file mode 100644
index 000000000..2e4d73acb
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/dcaeconnector/impl/config/DcaeConfig.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.config;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+
+public class DcaeConfig implements Configuration {
+
+    private static final String SECTION_MARKER_DCAE = "dcae";
+
+    private static final String PROPERTY_KEY_EVENTRECEIVERURL = "dcaeUrl";
+    private static final String PROPERTY_KEY_USERCREDENTIALS = "dcaeUserCredentials";
+    private static final String PROPERTY_KEY_TIMERPERIOD = "dcaeHeartbeatPeriodSeconds";
+
+    private static final String DEFAULT_VALUE_EVENTRECEIVERURL = "off";
+    private static final String DEFAULT_VALUE_USERCREDENTIALS = "admin:admin";
+    private static final long DEFAULT_VALUE_TIMERPERIOD = 120;
+
+	private final ConfigurationFileRepresentation configuration;
+
+	public DcaeConfig(ConfigurationFileRepresentation configuration) {
+		this.configuration = configuration;
+    	this.configuration.addSection(SECTION_MARKER_DCAE);
+		defaults();
+    }
+
+    /* ***********************
+     * Getter
+     */
+
+    public String getEventReveicerUrl() {
+		return configuration.getProperty(SECTION_MARKER_DCAE, PROPERTY_KEY_EVENTRECEIVERURL);
+    }
+
+    public String getUserCredentials() {
+		return configuration.getProperty(SECTION_MARKER_DCAE, PROPERTY_KEY_USERCREDENTIALS);
+    }
+
+    public Integer getTimerPeriodSeconds() {
+    	long res = configuration.getPropertyLong(SECTION_MARKER_DCAE, PROPERTY_KEY_TIMERPERIOD).orElse(DEFAULT_VALUE_TIMERPERIOD);
+		return (int)res;
+    }
+
+
+	@Override
+	public String getSectionName() {
+		return SECTION_MARKER_DCAE;
+	}
+
+	@Override
+	public void defaults() {
+		this.configuration.setPropertyIfNotAvailable(SECTION_MARKER_DCAE, PROPERTY_KEY_EVENTRECEIVERURL, DEFAULT_VALUE_EVENTRECEIVERURL);
+		this.configuration.setPropertyIfNotAvailable(SECTION_MARKER_DCAE, PROPERTY_KEY_USERCREDENTIALS, DEFAULT_VALUE_USERCREDENTIALS);
+		this.configuration.setPropertyIfNotAvailable(SECTION_MARKER_DCAE, PROPERTY_KEY_TIMERPERIOD, DEFAULT_VALUE_TIMERPERIOD);
+	}
+
+	@Override
+	public String toString() {
+		return "DcaeConfig [getEventReveicerUrl()=" + getEventReveicerUrl() + ", getUserCredentials()="
+				+ getUserCredentials() + ", getTimerPeriodSeconds()=" + getTimerPeriodSeconds() + ", getSectionName()="
+				+ getSectionName() + "]";
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitor.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitor.java
index dd5ffd40b..f0a477b84 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitor.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitor.java
@@ -17,37 +17,47 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl;
 
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+
 public interface DeviceMonitor extends AutoCloseable {
 
     /**
      * Referesh database by raising all alarms again.
      */
-	void refreshAlarmsInDb();
+    void refreshAlarmsInDb();
 
     /**
      * removeMountpointIndication deregisters a mountpoint for registration services
      * @param mountPointNodeName to deregister
      */
-	void removeMountpointIndication(String mountPointNodeName);
+    void removeMountpointIndication(String mountPointNodeName);
+
+       /**
+        * Notify of device state change to "disconnected"
+        * Mount point supervision
+        * @param mountPointNodeName to deregister
+        */
+    void deviceDisconnectIndication(String mountPointNodeName);
 
-	   /**
-	    * Notify of device state change to "disconnected"
-	    * Mount point supervision
-	    * @param mountPointNodeName to deregister
-	    */
-	void deviceDisconnectIndication(String mountPointNodeName);
+    /**
+     * Notify of device state changes to "connected"
+     * @param mountPointNodeName name of mount point
+     * @param ne to monitor
+     */
+    void deviceConnectMasterIndication(String mountPointNodeName, DeviceMonitoredNe ne);
 
     /**
      * Notify of device state changes to "connected"
      * @param mountPointNodeName name of mount point
      * @param ne to monitor
      */
-	void deviceConnectMasterIndication(String mountPointNodeName, DeviceMonitoredNe ne);
+    void deviceConnectMasterIndication(String mountPointNodeName, NetworkElement ne);
 
     /**
      * Notify of device state changes to "connected" for slave nodes
      * @param mountPointNodeName name of mount point
      */
-	void deviceConnectSlaveIndication(String mountPointNodeName);
+    void deviceConnectSlaveIndication(String mountPointNodeName);
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorEmptyImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorEmptyImpl.java
index ef2af1ae3..4a8eba09e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorEmptyImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorEmptyImpl.java
@@ -17,31 +17,38 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl;
 
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+
 public class DeviceMonitorEmptyImpl implements DeviceMonitor {
 
-	@Override
-	public void refreshAlarmsInDb() {
-	}
+    @Override
+    public void refreshAlarmsInDb() {
+    }
+
+    @Override
+    public void removeMountpointIndication(String mountPointNodeName) {
+    }
 
-	@Override
-	public void removeMountpointIndication(String mountPointNodeName) {
-	}
+    @Override
+    public void deviceConnectMasterIndication(String mountPointNodeName, DeviceMonitoredNe ne) {
+    }
 
-	@Override
-	public void deviceConnectMasterIndication(String mountPointNodeName, DeviceMonitoredNe ne) {
-	}
+    @Override
+    public void deviceDisconnectIndication(String mountPointNodeName) {
+    }
 
-	@Override
-	public void deviceDisconnectIndication(String mountPointNodeName) {
-	}
+    @Override
+    public void deviceConnectSlaveIndication(String mountPointNodeName) {
+    }
 
-	@Override
-	public void deviceConnectSlaveIndication(String mountPointNodeName) {
-	}
+    @Override
+    public void close() throws Exception {
+    }
 
-	@Override
-	public void close() throws Exception {
-	}
+    @Override
+    public void deviceConnectMasterIndication(String mountPointNodeName, NetworkElement ne) {
+    }
 
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorImpl.java
index 0149d6fca..fd2b141df 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorImpl.java
@@ -22,15 +22,18 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl;
 
 import java.util.Enumeration;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DmConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.config.DmConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,16 +68,17 @@ import org.slf4j.LoggerFactory;
  * @author herbert
  */
 
-@SuppressWarnings("deprecation")
 public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(DeviceMonitorImpl.class);
 
     private final ConcurrentHashMap<String, DeviceMonitorTask> queue;
     private final ScheduledExecutorService scheduler;
-    private final ODLEventListener odlEventListener;
+    private final ODLEventListenerHandler odlEventListener;
     @SuppressWarnings("unused")
     private final DataBroker dataBroker; //Future usage
+    private final DmConfig dmConfig;
+    private final DeviceMonitoredNe dummyNe;
 
     /*-------------------------------------------------------------
      * Construction/ destruction of service
@@ -84,14 +88,15 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
      * Basic implementation of devicemonitoring
      * @param odlEventListener as destination for problems
      */
-    public DeviceMonitorImpl(DataBroker dataBroker, ODLEventListener odlEventListener, HtDevicemanagerConfiguration htconfig) {
+    public DeviceMonitorImpl(DataBroker dataBroker, ODLEventListenerHandler odlEventListener, ConfigurationFileRepresentation htconfig) {
         LOG.info("Construct {}", this.getClass().getSimpleName());
 
         this.odlEventListener = odlEventListener;
         this.dataBroker = dataBroker;
+        this.dummyNe = getDummyNe();
 
         htconfig.registerConfigChangedListener(this);
-        DmConfig dmConfig = htconfig.getDmConfig();
+        this.dmConfig = new DmConfig(htconfig);
         setDmConfig(dmConfig);
 
         this.queue = new ConcurrentHashMap<>();
@@ -113,17 +118,16 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
         scheduler.shutdown();
     }
 
-	@Override
-	public void onConfigChanged() {
-        DmConfig cfg = DmConfig.reload();
-        setDmConfig(cfg);
-	}
+    @Override
+    public void onConfigChanged() {
+        setDmConfig(dmConfig);
+    }
 
-	private void setDmConfig(DmConfig dmConfig) {
+    private void setDmConfig(DmConfig dmConfig) {
         for (DeviceMonitorProblems problem : DeviceMonitorProblems.values()) {
-        	problem.setSeverity(dmConfig.getSeverity(problem));
+            problem.setSeverity(dmConfig.getSeverity(problem));
         }
-	}
+    }
 
     /*-------------------------------------------------------------
      * Start/ stop/ update service for Mountpoint
@@ -133,8 +137,15 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
      * Notify of device state changes to "connected" for slave nodes
      * @param mountPointNodeName name of mount point
      */
+    @Override
     synchronized public void deviceConnectSlaveIndication(String mountPointNodeName) {
-        deviceConnectMasterIndication(mountPointNodeName, null);
+        deviceConnectMasterIndication(mountPointNodeName, (DeviceMonitoredNe)null);
+    }
+
+    @Override
+    public void deviceConnectMasterIndication(String mountPointNodeName, NetworkElement networkElement) {
+        Optional<DeviceMonitoredNe> monitoredNe = networkElement.getService(DeviceMonitoredNe.class);
+           deviceConnectMasterIndication(mountPointNodeName, monitoredNe.isPresent() ? monitoredNe.get() : dummyNe);
     }
 
     /**
@@ -142,6 +153,7 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
      * @param mountPointNodeName name of mount point
      * @param ne to monitor
      */
+    @Override
     synchronized public void deviceConnectMasterIndication(String mountPointNodeName, DeviceMonitoredNe ne) {
 
         LOG.debug("ne changes to connected state {}",mountPointNodeName);
@@ -159,6 +171,7 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
     * Mount point supervision
     * @param mountPointNodeName to deregister
     */
+    @Override
     synchronized public void deviceDisconnectIndication(String mountPointNodeName) {
 
         LOG.debug("State changes to not connected state {}",mountPointNodeName);
@@ -175,6 +188,7 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
      * removeMountpointIndication deregisters a mountpoint for registration services
      * @param mountPointNodeName to deregister
      */
+    @Override
     synchronized public void removeMountpointIndication(String mountPointNodeName) {
 
         if (queue.containsKey(mountPointNodeName)) {
@@ -192,6 +206,7 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
     /**
      * Referesh database by raising all alarms again.
      */
+    @Override
     public void refreshAlarmsInDb() {
         synchronized(queue) {
             for (DeviceMonitorTask task : queue.values()) {
@@ -226,4 +241,24 @@ public class DeviceMonitorImpl implements DeviceMonitor, IConfigChangedListener
         return task;
     }
 
+
+    private static DeviceMonitoredNe getDummyNe() {
+        return new DeviceMonitoredNe() {
+
+            @Override
+            public void prepareCheck() {
+                // Do nothing
+            }
+
+            @Override
+            public boolean checkIfConnectionToMediatorIsOk() {
+                return true;
+            }
+
+            @Override
+            public boolean checkIfConnectionToNeIsOk() {
+                return true;
+            }
+        };
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorProblems.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorProblems.java
index 812d4dcf3..1282a41f8 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorProblems.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorProblems.java
@@ -23,17 +23,16 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl;
 
-import javax.annotation.Nullable;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public enum DeviceMonitorProblems {
 
-	/**
-	 * Mountpoint is not connected via NETCONF with NE/Mediator = ssh connection
-	 */
+    /**
+     * Mountpoint is not connected via NETCONF with NE/Mediator = ssh connection
+     */
     connectionLossOAM(InternalSeverity.Major),
 
     /**
@@ -48,22 +47,22 @@ public enum DeviceMonitorProblems {
     connectionLossNeOAM(InternalSeverity.Major);
 
     private static final Logger LOG = LoggerFactory.getLogger(DeviceMonitorProblems.class);
-    InternalSeverity severity;
+    private InternalSeverity severity;
 
     DeviceMonitorProblems(@Nullable InternalSeverity severity) {
-    	if (severity != null) {
-    		this.severity = severity;
-    	}
+        if (severity != null) {
+            this.severity = severity;
+        }
     }
 
-    InternalSeverity getSeverity() {
+    public InternalSeverity getSeverity() {
         return severity;
     }
 
-	public void setSeverity(InternalSeverity severity) {
-		LOG.info("Change severity for {} from {} to {}", name(), this.severity, severity);
-		this.severity=severity;
-	}
+    public void setSeverity(InternalSeverity severity) {
+        LOG.info("Change severity for {} from {} to {}", name(), this.severity, severity);
+        this.severity=severity;
+    }
 
 }
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorTask.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorTask.java
index 04d15cc19..d26f4ac7f 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorTask.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/DeviceMonitorTask.java
@@ -27,12 +27,12 @@ import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +43,7 @@ public class DeviceMonitorTask implements Runnable {
     private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
 
     private final String mountPointName;
-    private final ODLEventListener odlEventListener;
+    private final ODLEventListenerHandler odlEventListener;
     private final Checker checkConnectionToMediator;
     private final Checker checkConnectionToNe;
 
@@ -52,7 +52,7 @@ public class DeviceMonitorTask implements Runnable {
     private ScheduledFuture<?> taskHandle;
     private final Object lockNe = new Object();    //USe top lock access to member ne
     private @Nullable DeviceMonitoredNe ne; //Indication if in status connect or disconnect
-    private @Nonnull Boolean mountpointConnectingStateSupervision; //Indication of mountpoint supervision
+    private @NonNull Boolean mountpointConnectingStateSupervision; //Indication of mountpoint supervision
 
     private final Object lockDisconnectSupervisionTickout = new Object();
     private Integer disconnectSupervisionTickout; //Tickcounter of task ticks for "not connected indication"
@@ -67,7 +67,7 @@ public class DeviceMonitorTask implements Runnable {
      * @param mountPointName to monitor
      * @param odlEventListener to forward problems to
      */
-    public DeviceMonitorTask(String mountPointName, ODLEventListener odlEventListener) {
+    public DeviceMonitorTask(String mountPointName, ODLEventListenerHandler odlEventListener) {
         LOG.debug("Init task {}", DeviceMonitorTask.class.getSimpleName());
 
         //Setup finals
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/config/DmConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/config/DmConfig.java
new file mode 100644
index 000000000..215d8272d
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/devicemonitor/impl/config/DmConfig.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.config;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitorProblems;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
+
+/**
+ * Configuration of devicemonitor, section [devicemonitor]
+ *   SeverityConnectionlossNeOAM=minor
+ *   SeverityConnectionlossOAM=major
+ *   SeverityConnectionlossMediator=critical
+ */
+public class DmConfig implements Configuration {
+
+    private static final String SECTION_MARKER_TA = "devicemonitor";
+
+    private static final String PROPERTY_KEY_PREFIX_Severity = "Severity";
+
+	private final ConfigurationFileRepresentation configuration;
+
+	public DmConfig(ConfigurationFileRepresentation configuration) {
+		this.configuration = configuration;
+    	this.configuration.addSection(SECTION_MARKER_TA);
+		defaults();
+	}
+
+	public InternalSeverity getSeverity(DeviceMonitorProblems problem) {
+		String severityString = configuration.getProperty(SECTION_MARKER_TA, getPropertyName(problem));
+		InternalSeverity result = InternalSeverity.valueOfString(severityString);
+		return result != null ? result : InternalSeverity.Major;
+	}
+
+	@Override
+	public String getSectionName() {
+		return SECTION_MARKER_TA;
+	}
+
+	@Override
+	public void defaults() {
+        for (DeviceMonitorProblems problem : DeviceMonitorProblems.values()) {
+    		configuration.setPropertyIfNotAvailable(SECTION_MARKER_TA, getPropertyName(problem), problem.getSeverity().name());
+        }
+	}
+
+	private String getPropertyName(DeviceMonitorProblems problem) {
+		return PROPERTY_KEY_PREFIX_Severity+problem.name();
+	}
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java
new file mode 100644
index 000000000..d42537650
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ConnectionStatusHousekeepingService.java
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping;
+
+import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.InternalConnectionStatus;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConnectionStatusHousekeepingService implements ClusterSingletonService,AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionStatusHousekeepingService.class);
+
+    private static final long INTERVAL_SECONDS = 30;
+    private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID = InstanceIdentifier
+            .create(NetworkTopology.class)
+            .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
+    private static final ServiceGroupIdentifier IDENT = ServiceGroupIdentifier.create("ConnectionStatusHousekeepingService");
+
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(3);
+    private final DataBroker dataBroker;
+    private final DataProvider dataProvider;
+    private boolean isMaster;
+    private Future<?> taskReference;
+
+    private final Runnable runner = () -> doClean();
+
+    public ConnectionStatusHousekeepingService(DataBroker dataBroker, DataProvider dataProvider) {
+        this.dataBroker = dataBroker;
+        this.dataProvider = dataProvider;
+        this.start();
+    }
+
+    public void start() {
+        if (taskReference != null) {
+            taskReference.cancel(false);
+        }
+        if(!isMaster) {
+            LOG.info("do not start. not the master node");
+            return;
+        }
+        LOG.info("starting scheduler with interval {}", INTERVAL_SECONDS);
+        this.taskReference = this.scheduler.scheduleAtFixedRate(runner, INTERVAL_SECONDS, INTERVAL_SECONDS,
+                TimeUnit.SECONDS);
+    }
+
+    private void doClean() {
+        LOG.debug("start housekeeping");
+        // get all devices from networkelement-connection index
+        try {
+            List<NetworkElementConnectionEntity> list = this.dataProvider.getNetworkElementConnections();
+
+            ConnectionLogStatus dbStatus;
+            ConnectionLogStatus mdsalStatus;
+            String nodeId;
+            if (list == null || list.size() <= 0) {
+                LOG.trace("no items in list.");
+                return;
+            }
+            for (NetworkElementConnectionEntity item : list) {
+
+                // compare with MD-SAL
+                nodeId = item.getNodeId();
+                LOG.trace("check status of {}", nodeId);
+                dbStatus = item.getStatus();
+                mdsalStatus = this.getMDSalConnectionStatus(nodeId);
+                if (mdsalStatus == null) {
+                    LOG.trace("unable to get connection status. jump over");
+                    continue;
+                }
+                // if different then update db
+                if (dbStatus != mdsalStatus) {
+                    LOG.trace("status is inconsistent db={}, mdsal={}. updating db", dbStatus, mdsalStatus);
+                    if(!item.isIsRequired() && mdsalStatus==ConnectionLogStatus.Disconnected) {
+                        this.dataProvider.removeNetworkConnection(nodeId);
+                    }
+                    else {
+                    this.dataProvider.updateNetworkConnectionDeviceType(
+                            new NetworkElementConnectionBuilder().setStatus(mdsalStatus).build(), nodeId);
+                    }
+                } else {
+                    LOG.trace("no difference");
+                }
+
+            }
+        } catch (Exception e) {
+            LOG.warn("problem executing housekeeping task: {}", e);
+        }
+        LOG.debug("finish housekeeping");
+    }
+
+    private ConnectionLogStatus getMDSalConnectionStatus(String nodeId) {
+
+        @SuppressWarnings("null")
+        @NonNull InstanceIdentifier<Node> instanceIdentifier = NETCONF_TOPO_IID.child(Node.class,
+                new NodeKey(new NodeId(nodeId)));
+        FluentFuture<Optional<Node>> optionalNode = this.dataBroker.newReadOnlyTransaction()
+                .read(LogicalDatastoreType.OPERATIONAL, instanceIdentifier);
+        try {
+            Node node = optionalNode.get(5, TimeUnit.SECONDS).get();
+            LOG.debug("node is {}", node);
+            NetconfNode nNode = node.augmentation(NetconfNode.class);
+            LOG.debug("nnode is {}", nNode);
+            if (nNode != null) {
+                return InternalConnectionStatus.statusFromNodeStatus(nNode.getConnectionStatus());
+            }
+        } catch (NoSuchElementException e) {
+            return ConnectionLogStatus.Disconnected;
+        } catch (ExecutionException | InterruptedException | TimeoutException e) {
+            LOG.warn("unable to get node info: {}", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (taskReference != null) {
+            taskReference.cancel(false);
+        }
+        this.scheduler.shutdown();
+    }
+
+     @SuppressWarnings("null")
+        @Override
+        public @NonNull ServiceGroupIdentifier getIdentifier() {
+             return IDENT;
+        }
+
+        @Override
+        public void instantiateServiceInstance() {
+            LOG.info("We take Leadership");
+            this.isMaster=true;
+            this.start();
+        }
+
+        @Override
+        public ListenableFuture<? extends Object> closeServiceInstance() {
+            LOG.info("We lost Leadership");
+            this.isMaster=false;
+            this.start();
+            return Futures.immediateFuture(null);
+        }
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ResyncNetworkElementHouskeepingService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ResyncNetworkElementHouskeepingService.java
new file mode 100644
index 000000000..b9d09afac
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ResyncNetworkElementHouskeepingService.java
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitor;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ResyncNetworkElementHouskeepingService implements ResyncNetworkElementsListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ResyncNetworkElementHouskeepingService.class);
+
+    private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
+            InstanceIdentifier.create(NetworkTopology.class).child(Topology.class,
+                    new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
+
+    // Services to use
+    private final MountPointService mountPointService;
+    private final ODLEventListenerHandler odlEventListenerHandler;
+    private final DataProvider databaseClientEvents;
+    private @Nullable final DeviceMonitor deviceMonitor;
+    private final DeviceManagerImpl deviceManager;
+
+    /** Thread is started to du the clean up action **/
+    private Thread threadDoClearCurrentFaultByNodename;
+    /** Indicate number of refresh activities for log **/
+    private int refreshCounter = 0;
+
+    /**
+     * @param deviceManager to provide devices information
+     * @param mountPointService service
+     * @param odlEventListenerHandler handler for events
+     * @param databaseClientEvents database to clean
+     * @param deviceMonitor devicemonitor
+     */
+    public ResyncNetworkElementHouskeepingService(
+            DeviceManagerImpl deviceManager,
+            MountPointService mountPointService, ODLEventListenerHandler odlEventListenerHandler,
+            DataProvider databaseClientEvents, DeviceMonitor deviceMonitor) {
+        super();
+        this.deviceManager = deviceManager;
+        this.mountPointService = mountPointService;
+        this.odlEventListenerHandler = odlEventListenerHandler;
+        this.databaseClientEvents = databaseClientEvents;
+        this.deviceMonitor = deviceMonitor;
+    }
+
+    /**
+     * Async RPC Interface implementation
+     */
+    @Override
+    public @NonNull List<String> doClearCurrentFaultByNodename(@Nullable List<String> nodeNamesInput)
+            throws IllegalStateException {
+
+        if (this.databaseClientEvents == null) {
+            throw new IllegalStateException("dbEvents service not instantiated");
+        }
+
+        if (threadDoClearCurrentFaultByNodename != null && threadDoClearCurrentFaultByNodename.isAlive()) {
+            throw new IllegalStateException("A clear task is already active");
+        } else {
+
+            // Create list of mountpoints if input is empty, using the content in ES
+            if (nodeNamesInput == null || nodeNamesInput.size() <= 0) {
+                nodeNamesInput = this.databaseClientEvents.getAllNodesWithCurrentAlarms();
+            }
+
+            // Filter all mountpoints from input that were found and are known to this Cluster-node instance of
+            // DeviceManager
+            final List<String> nodeNamesHandled = new ArrayList<>();
+            for (String mountpointName : nodeNamesInput) {
+                LOG.info("Work with mountpoint {}", mountpointName);
+
+                if (odlEventListenerHandler != null && mountpointName.equals(odlEventListenerHandler.getOwnKeyName())) {
+
+                    // SDN Controller related alarms
+                    // -- can not be recreated on all nodes in connected state
+                    // -- would result in a DCAE/AAI Notification
+                    // Conclusion for 1810 Delivery ... not covered by RPC function (See issue #43)
+                    LOG.info("Ignore SDN Controller related alarms for {}", mountpointName);
+                    // this.databaseClientEvents.clearFaultsCurrentOfNode(mountpointName);
+                    // nodeNamesHandled.add(mountpointName);
+
+                } else {
+
+                    if (mountPointService != null) {
+                        InstanceIdentifier<Node> instanceIdentifier =
+                                NETCONF_TOPO_IID.child(Node.class, new NodeKey(new NodeId(mountpointName)));
+                        Optional<MountPoint> optionalMountPoint = mountPointService.getMountPoint(instanceIdentifier);
+
+                        if (!optionalMountPoint.isPresent()) {
+                            LOG.info("Remove Alarms for unknown mountpoint {}", mountpointName);
+                            this.databaseClientEvents.clearFaultsCurrentOfNode(mountpointName);
+                            nodeNamesHandled.add(mountpointName);
+                        } else {
+                            if (deviceManager.getNeByMountpoint(mountpointName) != null) {
+                                LOG.info("At node known mountpoint {}", mountpointName);
+                                nodeNamesHandled.add(mountpointName);
+                            } else {
+                                LOG.info("At node unknown mountpoint {}", mountpointName);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Force a sync
+            deviceMonitor.refreshAlarmsInDb();
+
+            threadDoClearCurrentFaultByNodename = new Thread(() -> {
+                refreshCounter++;
+                LOG.info("Start refresh mountpoint task {}", refreshCounter);
+                // for(String nodeName:nodeNamesOutput) {
+                for (String nodeName : nodeNamesHandled) {
+                    NetworkElement ne = deviceManager.getNeByMountpoint(nodeName);
+                    if (ne != null) {
+                        LOG.info("Refresh mountpoint {}", nodeName);
+                        ne.warmstart();
+                    } else {
+                        LOG.info("Unhandled mountpoint {}", nodeName);
+                    }
+                }
+                LOG.info("End refresh mountpoint task {}", refreshCounter);
+            });
+            threadDoClearCurrentFaultByNodename.start();
+            return nodeNamesHandled;
+        }
+    };
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/ResyncNetworkElementsListener.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ResyncNetworkElementsListener.java
index d202cde40..751d48cda 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/ResyncNetworkElementsListener.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/housekeeping/ResyncNetworkElementsListener.java
@@ -6,21 +6,21 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping;
 
 import java.util.List;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 public interface ResyncNetworkElementsListener
 {
@@ -30,6 +30,6 @@ public interface ResyncNetworkElementsListener
      * @return List with
      * @throws IllegalStateException Illegal state exception
      */
-    public @Nonnull List<String> doClearCurrentFaultByNodename(@Nullable List<String> nodeNamesInput) throws IllegalStateException;
+    public @NonNull List<String> doClearCurrentFaultByNodename(@Nullable List<String> nodeNamesInput) throws IllegalStateException;
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerApiServiceImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerApiServiceImpl.java
index 79b4b056f..9a2b81cbb 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerApiServiceImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerApiServiceImpl.java
@@ -17,12 +17,12 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping.ResyncNetworkElementsListener;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceRPCServiceAPI;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl.MaintenanceServiceImpl;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ClearCurrentFaultByNodenameInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ClearCurrentFaultByNodenameOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ClearCurrentFaultByNodenameOutputBuilder;
@@ -33,6 +33,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicema
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetRequiredNetworkElementKeysInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetRequiredNetworkElementKeysOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetRequiredNetworkElementKeysOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushAttributeChangeNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushAttributeChangeNotificationOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushFaultNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushFaultNotificationOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.SetMaintenanceModeInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.SetMaintenanceModeOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.SetMaintenanceModeOutputBuilder;
@@ -42,31 +46,37 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicema
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.TestMaintenanceModeInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.TestMaintenanceModeOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.TestMaintenanceModeOutputBuilder;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("deprecation")
+import com.google.common.util.concurrent.ListenableFuture;
+
 public class DeviceManagerApiServiceImpl implements DevicemanagerService, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(DevicemanagerService.class);
 
-    private final RpcRegistration<DevicemanagerService> rpcReg;
-
-    private MaintenanceRPCServiceAPI maintenanceService;
-    private ResyncNetworkElementsListener resyncCallbackListener;
+    private final ObjectRegistration<DevicemanagerService> rpcReg;
+    private @Nullable
+    final MaintenanceRPCServiceAPI maintenanceService;
+    private @Nullable
+    final PushNotifications pushNotificationsListener;
+    private @Nullable
+    final ResyncNetworkElementsListener resyncCallbackListener;
+
+    DeviceManagerApiServiceImpl(final RpcProviderService rpcProviderRegistry,
+            MaintenanceServiceImpl maintenanceService, ResyncNetworkElementsListener listener,
+            PushNotifications pushNotificationsListener) {
+        this.maintenanceService = maintenanceService;
+        this.pushNotificationsListener = pushNotificationsListener;
+        this.resyncCallbackListener = listener;
 
-    DeviceManagerApiServiceImpl(final RpcProviderRegistry rpcProviderRegistry) {
         // Register ourselves as the REST API RPC implementation
         LOG.info("Register RPC Service "+DevicemanagerService.class.getSimpleName());
-        this.maintenanceService = null;
-        this.rpcReg = rpcProviderRegistry.addRpcImplementation(DevicemanagerService.class, this);
-    }
-
-    public void setMaintenanceService(MaintenanceServiceImpl maintenanceService2) {
-        this.maintenanceService = maintenanceService2;
+        this.rpcReg = rpcProviderRegistry.registerRpcImplementation(DevicemanagerService.class, this);
     }
 
     @Override
@@ -122,7 +132,7 @@ public class DeviceManagerApiServiceImpl implements DevicemanagerService, AutoCl
     @Override
     public ListenableFuture<RpcResult<SetMaintenanceModeOutput>> setMaintenanceMode(SetMaintenanceModeInput input) {
 
-        LOG.info("RPC Request: setMaintenanceMode input: {}", input.getMountpointName());
+        LOG.info("RPC Request: setMaintenanceMode input: {}", input.getNodeId());
         RpcResultBuilder<SetMaintenanceModeOutput> result;
 
         try {
@@ -194,8 +204,36 @@ public class DeviceManagerApiServiceImpl implements DevicemanagerService, AutoCl
         return result.buildFuture();
     }
 
-    public void setResyncListener(ResyncNetworkElementsListener listener) {
-        this.resyncCallbackListener = listener;
+    @Override
+    public ListenableFuture<RpcResult<PushFaultNotificationOutput>> pushFaultNotification(
+            PushFaultNotificationInput input) {
+        LOG.info("RPC Received fault notification {}", input);
+        RpcResultBuilder<PushFaultNotificationOutput> result;
+        try {
+            pushNotificationsListener.pushFaultNotification(input);
+            result =  RpcResultBuilder.success();
+        } catch (Exception e) {
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, "Exception", e);
+        }
+        return result.buildFuture();
     }
 
+    @Override
+    public ListenableFuture<RpcResult<PushAttributeChangeNotificationOutput>> pushAttributeChangeNotification(
+            PushAttributeChangeNotificationInput input) {
+        LOG.info("RPC Received change notification {}", input);
+        RpcResultBuilder<PushAttributeChangeNotificationOutput> result;
+        try {
+            pushNotificationsListener.pushAttributeChangeNotification(input);
+            result =  RpcResultBuilder.success();
+        } catch (Exception e) {
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, "Exception", e);
+        }
+        return result.buildFuture();
+    }
+
+
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerImpl.java
index e5e3d6e48..d2f489646 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerImpl.java
@@ -17,53 +17,64 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
 
-import com.google.common.base.Optional;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceMonitoredNe;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.FactoryRegistration;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.UnkownDevicemanagerServiceException;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.AaiProviderClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice.ArchiveCleanService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementRepresentation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AkkaConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.EsConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.GeoConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.PmConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeProviderClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitor;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitorEmptyImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.devicemonitor.impl.DeviceMonitorImpl;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping.ConnectionStatusHousekeepingService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.housekeeping.ResyncNetworkElementHouskeepingService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka.AkkaConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo.GeoConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.RpcPushNotificationsHandler;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.NetconfChangeListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.GenericTransactionUtils;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientDummyImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientImpl2;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl.IndexMwtnService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl.IndexUpdateService;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl.MaintenanceServiceImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.PerformanceManagerImpl;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.service.MicrowaveHistoricalPerformanceWriterService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.NotificationsService;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.INetconfAcessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.ClusteredConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketmanagerService;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
@@ -74,15 +85,20 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
 
-@SuppressWarnings("deprecation")
-public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, ResyncNetworkElementsListener {
+/**
+ * Devicemanager
+ * - Handles startup and closedown of network element handlers for netconf session
+ * - Provide common services for network element specific components
+ */
+public class DeviceManagerImpl implements NetconfNetworkElementService, DeviceManagerServiceProvider, NetconfNodeService, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerImpl.class);
     private static final String APPLICATION_NAME = "DeviceManager";
     private static final String MYDBKEYNAMEBASE = "SDN-Controller";
+    private static final String CONFIGURATIONFILE = "etc/devicemanager.properties";
+    public static final long DATABASE_TIMEOUT_MS = 120*1000L;
+
 
     // http://sendateodl:8181/restconf/operational/network-topology:network-topology/topology/topology-netconf
     private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
@@ -92,50 +108,72 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
     private static final String STARTUPLOG_FILENAME = "etc/devicemanager.startup.log";
     // private static final String STARTUPLOG_FILENAME2 = "data/cache/devicemanager.startup.log";
 
-    private DataBroker dataBroker = null;
-    private MountPointService mountPointService = null;
-    private RpcProviderRegistry rpcProviderRegistry = null;
+    // MDSAL Services
+    private DataBroker dataBroker;
+    private MountPointService mountPointService;
+    private RpcProviderService rpcProviderRegistry;
     @SuppressWarnings("unused")
-    private NotificationPublishService notificationPublishService = null;
+    private NotificationPublishService notificationPublishService;
     private ClusterSingletonServiceProvider clusterSingletonServiceProvider;
+    private WebsocketmanagerService websocketmanagerService;
+    private IEntityDataProvider iEntityDataProvider;
 
-    private final ConcurrentHashMap<String, ONFCoreNetworkElementRepresentation> networkElementRepresentations =
-            new ConcurrentHashMap<>();
-    private final ONFCoreNetworkElementRepresentation networkelementLock = ONFCoreNetworkElementFactory.getEmpty("NE-LOCK");
-    private WebSocketServiceClient webSocketService;
-    private HtDatabaseEventsService databaseClientEvents;
-    private ODLEventListener odlEventListener;
+    // Devicemanager common services for network element handler
+    private @Nullable WebSocketServiceClientInternal webSocketService;
+    private ODLEventListenerHandler odlEventListenerHandler;
     private NetconfChangeListener netconfChangeListener;
     private DeviceManagerApiServiceImpl rpcApiService;
-    private @Nullable PerformanceManagerImpl performanceManager = null;
-    private ProviderClient dcaeProviderClient;
-    private ProviderClient aotsMProvider;
-    private @Nullable AaiProviderClient aaiProviderClient = null;
-    private @Nullable DeviceMonitor deviceMonitor = new DeviceMonitorEmptyImpl();
-    private IndexUpdateService updateService;
-    //private IndexConfigService configService; issue#1
-    private IndexMwtnService mwtnService;
-    private HtDatabaseNode htDatabase;
-    private Boolean devicemanagerInitializationOk = false;
+    private PerformanceManagerImpl performanceManager;
+    private DcaeProviderClient dcaeProviderClient;
+    private AaiProviderClient aaiProviderClient;
+    private DcaeForwarderInternal aotsDcaeForwarder;
+    private DeviceMonitor deviceMonitor;
     private MaintenanceServiceImpl maintenanceService;
-    private NotificationDelayService<ProblemNotificationXml> notificationDelayService;
-    private Thread threadDoClearCurrentFaultByNodename = null;
-    private int refreshCounter = 0;
-    private AkkaConfig akkaConfig;
+    private DevicemanagerNotificationDelayService notificationDelayService;
+    private ResyncNetworkElementHouskeepingService resyncNetworkElementHouskeepingService;
     private ArchiveCleanService archiveCleanService;
-    @SuppressWarnings("unused")
-	private ClusterSingletonServiceRegistration cssRegistration;
+    private ConnectionStatusHousekeepingService housekeepingService;
+    private NetconfNodeStateService netconfNodeStateService;
+    private DataProvider dataProvider;
+    private HtDatabaseClient htDatabaseClient;
+    // Handler
+    private RpcPushNotificationsHandler rpcPushNotificationsHandler;
+    private DeviceManagerNetconfConnectHandler forTest;
+    private final TransactionUtils transactionUtils;
+    // Attributes
+    private final Object networkelementLock;
+    private final ConcurrentHashMap<String, NetworkElement> networkElementRepresentations;
+    private final List<MyNetworkElementFactory<? extends NetworkElementFactory>> factoryList;
+    private AkkaConfig akkaConfig;
+    private ClusterSingletonServiceRegistration cssRegistration;
+    private ClusterSingletonServiceRegistration cssRegistration2;
+    private Boolean devicemanagerInitializationOk;
 
     // Blueprint 1
     public DeviceManagerImpl() {
         LOG.info("Creating provider for {}", APPLICATION_NAME);
+        this.devicemanagerInitializationOk = false;
+        this.factoryList = new CopyOnWriteArrayList<>();
+        this.networkelementLock = new Object();
+        this.networkElementRepresentations = new ConcurrentHashMap<>();
+        this.transactionUtils = new GenericTransactionUtils();
+
+        this.dataBroker = null;
+        this.mountPointService = null;
+        this.rpcProviderRegistry = null;
+        this.notificationPublishService = null;
+        this.clusterSingletonServiceProvider = null;
+        this.websocketmanagerService = null;
+        this.iEntityDataProvider = null;
+
+        this.webSocketService = null;
     }
 
     public void setDataBroker(DataBroker dataBroker) {
         this.dataBroker = dataBroker;
     }
 
-    public void setRpcProviderRegistry(RpcProviderRegistry rpcProviderRegistry) {
+    public void setRpcProviderRegistry(RpcProviderService rpcProviderRegistry) {
         this.rpcProviderRegistry = rpcProviderRegistry;
     }
 
@@ -147,161 +185,173 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         this.mountPointService = mountPointService;
     }
     public void setClusterSingletonService(ClusterSingletonServiceProvider clusterSingletonService) {
-    	this.clusterSingletonServiceProvider = clusterSingletonService;
+        this.clusterSingletonServiceProvider = clusterSingletonService;
     }
-    public void init() {
+    public void setNetconfNodeStateService(NetconfNodeStateService netconfNodeStateService) {
+        this.netconfNodeStateService = netconfNodeStateService;
+    }
+    public void setWebsocketmanagerService(WebsocketmanagerService websocketmanagerService) {
+        this.websocketmanagerService = websocketmanagerService;
+    }
+    public void setEntityDataProvider(IEntityDataProvider iEntityDataProvider) {
+        this.iEntityDataProvider = iEntityDataProvider;
+    }
+
+    public void init() throws Exception {
 
         LOG.info("Session Initiated start {}", APPLICATION_NAME);
+        this.iEntityDataProvider.setReadyStatus(false);
 
-        // Start RPC Service
-        this.rpcApiService = new DeviceManagerApiServiceImpl(rpcProviderRegistry);
-        // Get configuration
-        HtDevicemanagerConfiguration config = HtDevicemanagerConfiguration.getConfiguration();
-        try {
-            this.akkaConfig = AkkaConfig.load();
-            LOG.debug("akka.conf loaded: " + akkaConfig.toString());
-        } catch (Exception e1) {
-            this.akkaConfig = null;
-            LOG.warn("problem loading akka.conf: " + e1.getMessage());
-        }
-        GeoConfig geoConfig = null;
-        if (akkaConfig != null && akkaConfig.isCluster()) {
-            LOG.info("cluster mode detected");
-            if (GeoConfig.fileExists()) {
-                try {
-                    LOG.debug("try to load geoconfig");
-                    geoConfig = GeoConfig.load();
-                } catch (Exception err) {
-                    LOG.warn("problem loading geoconfig: " + err.getMessage());
-                }
-            } else {
-                LOG.debug("no geoconfig file found");
-            }
-        } else {
-            LOG.info("single node mode detected");
-        }
+        // Register network element factories and related init functions
+        registerMyNetworkElementFactory(new ONFCoreNetworkElementFactory(), (a,b,c) -> initONFCoremodel(a,b,(ONFCoreNetworkElementRepresentation)c));
+        //registerMyNetworkElementFactory(new ORanNetworkElementFactory(), (a,b,c) -> initORan(a,b,(ONFCoreNetworkElementRepresentation)c));
+        //registerMyNetworkElementFactory(new NtsNetworkElementFactory(), (a,b,c) -> initNts(a,b,(ONFCoreNetworkElementRepresentation)c));
+        //registerMyNetworkElementFactory(new GRanNetworkElementFactory(), (a,b,c) -> initGRan(a,b,(ONFCoreNetworkElementRepresentation)c));
+
+        this.dataProvider = iEntityDataProvider.getDataProvider();        // Get configuration
 
-        this.notificationDelayService = new NotificationDelayService<>(config);
+        ConfigurationFileRepresentation config = new ConfigurationFileRepresentation(CONFIGURATIONFILE);
 
-        EsConfig dbConfig = config.getEs();
+        this.akkaConfig = loadClusterConfiguration();
+        this.notificationDelayService = new DevicemanagerNotificationDelayService(config);
+
+        EsConfig dbConfig = new EsConfig(config);
         LOG.debug("esConfig=" + dbConfig.toString());
         // Start database
-        htDatabase = HtDatabaseNode.start(dbConfig, akkaConfig, geoConfig);
-        if (htDatabase == null) {
-            LOG.error("Can only run with local database. Stop initialization of devicemanager.");
-        } else {
-            // init Database Values only if singleNode or clusterMember=1
-            if (akkaConfig == null || akkaConfig.isClusterAndFirstNode()) {
-                // Create DB index if not existing and if database is running
-                try {
-                    //this.configService = new IndexConfigService(htDatabase);issue#1
-                    this.mwtnService = new IndexMwtnService(htDatabase);
-                } catch (Exception e) {
-                    LOG.warn("Can not start ES access clients to provide database index config, mwtn. ", e);
-                }
-            }
-            // start service for device maintenance service
-            this.maintenanceService = new MaintenanceServiceImpl(htDatabase);
-
-            // Websockets
-            try {
-                this.webSocketService = new WebSocketServiceClientImpl2(rpcProviderRegistry);
-            } catch (Exception e) {
-                LOG.error("Can not start websocket service. Loading mock class.", e);
-                this.webSocketService = new WebSocketServiceClientDummyImpl();
-            }
-            // DCAE
-            this.dcaeProviderClient = new DcaeProviderClient(config, dbConfig.getCluster(), this);
+        // TODO Remove this database client
+        this.htDatabaseClient = new HtDatabaseClient(dbConfig.getHosts());
+        this.htDatabaseClient.waitForYellowStatus(DATABASE_TIMEOUT_MS);
 
-            this.aaiProviderClient = new AaiProviderClient(config, this);
-            // EM
-            EsConfig emConfig = dbConfig.cloneWithIndex("sdnevents");
+        // start service for device maintenance service
+        this.maintenanceService = new MaintenanceServiceImpl(htDatabaseClient);
 
-            if (emConfig == null) {
-                LOG.warn("No configuration available. Don't start event manager");
-            } else {
-                this.databaseClientEvents = new HtDatabaseEventsService(htDatabase);
+        // Websockets
+        try {
+            this.webSocketService = new WebSocketServiceClientImpl2(websocketmanagerService);
+        } catch (Exception e) {
+            LOG.error("Can not start websocket service. Loading mock class.", e);
+            this.webSocketService = new WebSocketServiceClientDummyImpl();
+        }
+        // DCAE
+        this.dcaeProviderClient = new DcaeProviderClient(config, dbConfig.getCluster(), this);
+
+        this.aaiProviderClient = new AaiProviderClient(config, this);
+        // EM
+        String myDbKeyNameExtended = MYDBKEYNAMEBASE + "-" + dbConfig.getCluster();
+
+        this.aotsDcaeForwarder = new DcaeForwarderImpl(null, dcaeProviderClient, maintenanceService);
+        this.rpcPushNotificationsHandler = new RpcPushNotificationsHandler(webSocketService,
+                dataProvider, aotsDcaeForwarder);
+        this.odlEventListenerHandler = new ODLEventListenerHandler(myDbKeyNameExtended, webSocketService,
+                dataProvider, aotsDcaeForwarder);
+        this.archiveCleanService = new ArchiveCleanService(config, dataProvider);
+        this.housekeepingService = new ConnectionStatusHousekeepingService(this.dataBroker,
+                dataProvider);
+        this.cssRegistration = this.clusterSingletonServiceProvider
+                .registerClusterSingletonService(this.archiveCleanService);
+        this.cssRegistration2 = this.clusterSingletonServiceProvider
+                .registerClusterSingletonService(this.housekeepingService);
+        // PM
+        this.performanceManager = new PerformanceManagerImpl(60, new MicrowaveHistoricalPerformanceWriterService(htDatabaseClient), config);
+
+        // DM
+        // DeviceMonitor has to be available before netconfSubscriptionManager is
+        // configured
+        LOG.debug("start DeviceMonitor Service");
+        this.deviceMonitor = new DeviceMonitorImpl(dataBroker, odlEventListenerHandler, config);
+
+        // ResyncNetworkElementHouskeepingService
+        this.resyncNetworkElementHouskeepingService = new ResyncNetworkElementHouskeepingService(
+                this, mountPointService, odlEventListenerHandler,
+                dataProvider, deviceMonitor);
+
+        // RPC Service for specific services
+        // Start RPC Service
+        LOG.debug("start rpc service");
+        this.rpcApiService = new DeviceManagerApiServiceImpl(rpcProviderRegistry, maintenanceService,
+                resyncNetworkElementHouskeepingService, rpcPushNotificationsHandler);
 
-                String myDbKeyNameExtended = MYDBKEYNAMEBASE + "-" + dbConfig.getCluster();
+        // netconfSubscriptionManager should be the last one because this is a callback
+        // service
+        LOG.debug("start NetconfSubscriptionManager Service");
+        // this.netconfSubscriptionManager = new
+        // NetconfSubscriptionManagerOfDeviceManager(this, dataBroker);
+        // this.netconfSubscriptionManager.register();
+        this.netconfChangeListener = new NetconfChangeListener(this, dataBroker);
+        this.netconfChangeListener.register();
 
-                this.odlEventListener = new ODLEventListener(myDbKeyNameExtended, webSocketService,
-                        databaseClientEvents, dcaeProviderClient, aotsMProvider, maintenanceService);
-            }
-            this.archiveCleanService = new ArchiveCleanService(config, databaseClientEvents, mwtnService);
-            this.cssRegistration = this.clusterSingletonServiceProvider.registerClusterSingletonService(this.archiveCleanService);
-            // PM
-            PmConfig configurationPM = config.getPm();
-            LOG.info("Performance manager configuration: {}", configurationPM);
-            if (!configurationPM.isPerformanceManagerEnabled()) {
-
-                LOG.info("No configuration available. Don't start performance manager");
-            } else {
-                @Nullable
-                MicrowaveHistoricalPerformanceWriterService databaseClientHistoricalPerformance;
-                databaseClientHistoricalPerformance = new MicrowaveHistoricalPerformanceWriterService(htDatabase);
-                this.performanceManager = new PerformanceManagerImpl(60, databaseClientHistoricalPerformance);
-            }
+        this.forTest = new DeviceManagerNetconfConnectHandler(netconfNodeStateService);
+
+        writeToEventLog(APPLICATION_NAME, "startup", "done");
+        this.devicemanagerInitializationOk = true;
 
-            // DUS (Database update service)
-            LOG.debug("start db update service");
-            this.updateService =
-                    new IndexUpdateService(htDatabase, dbConfig.getHost(), dbConfig.getCluster(), dbConfig.getNode());
-            this.updateService.start();
-
-            // RPC Service for specific services
-            this.rpcApiService.setMaintenanceService(this.maintenanceService);
-            this.rpcApiService.setResyncListener(this);
-            // DM
-            // DeviceMonitor has to be available before netconfSubscriptionManager is
-            // configured
-            LOG.debug("start DeviceMonitor Service");
-            this.deviceMonitor = new DeviceMonitorImpl(dataBroker, odlEventListener, config);
-
-            // netconfSubscriptionManager should be the last one because this is a callback
-            // service
-            LOG.debug("start NetconfSubscriptionManager Service");
-            // this.netconfSubscriptionManager = new
-            // NetconfSubscriptionManagerOfDeviceManager(this, dataBroker);
-            // this.netconfSubscriptionManager.register();
-            this.netconfChangeListener = new NetconfChangeListener(this, dataBroker);
-            this.netconfChangeListener.register();
-
-            this.devicemanagerInitializationOk = true;
-        }
         LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
+        this.iEntityDataProvider.setReadyStatus(true);
+
     }
 
     @Override
-    public void close() throws Exception {
+    public void close() {
         LOG.info("DeviceManagerImpl closing ...");
-
         close(performanceManager);
         close(dcaeProviderClient);
         close(aaiProviderClient);
-        close(aotsMProvider);
         close(deviceMonitor);
-        //close(updateService, configService, mwtnService); issue#1
-        close(updateService, mwtnService);
-        close(htDatabase);
+        close(htDatabaseClient);
         close(netconfChangeListener);
         close(maintenanceService);
         close(rpcApiService);
         close(notificationDelayService);
         close(archiveCleanService);
+        close(housekeepingService);
+        close(forTest);
+        close(cssRegistration, cssRegistration2);
         LOG.info("DeviceManagerImpl closing done");
     }
 
+    @Override
+    public @NonNull <L extends NetworkElementFactory> FactoryRegistration<L> registerNetworkElementFactory(@NonNull L factory) {
+        LOG.info("Factory registration {}", factory.getClass().getName());
+        MyNetworkElementFactory<L> myFactory = new MyNetworkElementFactory<>(factory, (a,b,c) -> initDefault(a,b,c));
+        factoryList.add(myFactory);
+        return new FactoryRegistration<L>() {
+
+            @Override
+            public @NonNull L getInstance() {
+                return myFactory.getFactory();
+            }
+
+            @Override
+            public void close() {
+                factoryList.remove(myFactory);
+            }
+
+        };
+    }
+
+    private <L extends NetworkElementFactory> void registerMyNetworkElementFactory(@NonNull L factory,
+            Register<String, MountPoint, NetworkElement> init) {
+        factoryList.add(new MyNetworkElementFactory<>(factory, init));
+    }
+
+
+    @Override
+    public @NonNull DataProvider getDataProvider() {
+        return this.dataProvider;
+    }
 
     /**
      * Used to close all Services, that should support AutoCloseable Pattern
-     *
      * @param toClose
-     * @throws Exception
      */
-    private void close(AutoCloseable... toCloseList) throws Exception {
+    private void close(AutoCloseable... toCloseList) {
         for (AutoCloseable element : toCloseList) {
             if (element != null) {
-                element.close();
+                try {
+                    element.close();
+                } catch (Exception e) {
+                    LOG.warn("Problem during close {}", e);
+                }
             }
         }
     }
@@ -338,105 +388,210 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         if (!isNetconfNodeMaster(nNode)) {
             // Change Devicemonitor-status to connected ... for non master mountpoints.
             deviceMonitor.deviceConnectSlaveIndication(mountPointNodeName);
-		} else {
-
-			InstanceIdentifier<Node> instanceIdentifier = NETCONF_TOPO_IID.child(Node.class,
-					new NodeKey(new NodeId(mountPointNodeName)));
-
-			Optional<MountPoint> optionalMountPoint = null;
-			int timeout = 10000;
-			while (!(optionalMountPoint = mountPointService.getMountPoint(instanceIdentifier)).isPresent()
-					&& timeout > 0) {
-				LOG.info("Event listener waiting for mount point for Netconf device :: Name : {}", mountPointNodeName);
-				sleepMs(1000);
-				timeout -= 1000;
-			}
-
-			if (!optionalMountPoint.isPresent()) {
-				LOG.warn("Event listener timeout while waiting for mount point for Netconf device :: Name : {} ",
-						mountPointNodeName);
-			} else {
-				// Mountpoint is present for sure
-				MountPoint mountPoint = optionalMountPoint.get();
-				// BindingDOMDataBrokerAdapter.BUILDER_FACTORY;
-				LOG.info("Mountpoint with id: {} class {} toString {}", mountPoint.getIdentifier(),
-						mountPoint.getClass().getName(), mountPoint);
-				Optional<DataBroker> optionalNetconfNodeDatabroker = mountPoint.getService(DataBroker.class);
-
-				if (!optionalNetconfNodeDatabroker.isPresent()) {
-					LOG.info("Slave mountpoint {} without databroker", mountPointNodeName);
-				} else {
-
-					// It is master for mountpoint and all data are available.
-					// Make sure that specific mountPointNodeName is handled only once.
-					// be aware that startListenerOnNodeForConnectedState could be called multiple
-					// times for same mountPointNodeName.
-					// networkElementRepresentations contains handled NEs at master node.
-
-					synchronized (networkelementLock) {
-						if (networkElementRepresentations.containsKey(mountPointNodeName)) {
-							LOG.warn("Mountpoint {} already registered. Leave startup procedure.", mountPointNodeName);
-							return;
-						} else {
-							ONFCoreNetworkElementRepresentation result = networkElementRepresentations.put(mountPointNodeName,
-									networkelementLock);
-							if (result != null) {
-								LOG.info("Expected null value was not provided, but {}", result.getMountPointNodeName());
-							}
-						}
-					}
-
-					DataBroker netconfNodeDataBroker = optionalNetconfNodeDatabroker.get();
-					LOG.info("Master mountpoint {}", mountPointNodeName);
-					// getNodeInfoTest(dataBroker);
-
-					// create automatic empty maintenance entry into db before reading and listening
-					// for problems
-					this.maintenanceService.createIfNotExists(mountPointNodeName);
-
-					// Setup microwaveEventListener for Notificationservice
-
-					// MicrowaveEventListener microwaveEventListener = new
-					// MicrowaveEventListener(mountPointNodeName, websocketmanagerService,
-					// xmlMapper, databaseClientEvents);
-					ONFCoreNetworkElementRepresentation ne = ONFCoreNetworkElementFactory.create(mountPointNodeName,
-							dataBroker, webSocketService, databaseClientEvents, instanceIdentifier,
-							netconfNodeDataBroker, dcaeProviderClient, aotsMProvider, maintenanceService,
-							notificationDelayService);
-
-					synchronized (networkelementLock) {
-						ONFCoreNetworkElementRepresentation result = networkElementRepresentations
-								.put(mountPointNodeName, ne);
-						if (result != networkelementLock) {
-							LOG.info("NE list does not provide lock as epxected, but {}.",
-									result.getMountPointNodeName());
-						}
-					}
-					ne.doRegisterMicrowaveEventListener(mountPoint);
-
-					// Register netconf stream
-					registerNotificationStream(mountPointNodeName, mountPoint, "NETCONF");
-
-					// -- Read data from NE
-					ne.initialReadFromNetworkElement();
-
-					sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus());
-
-					if (aaiProviderClient != null) {
-						aaiProviderClient.onDeviceRegistered(mountPointNodeName);
-					}
-					// -- Register NE to performance manager
-					if (performanceManager != null) {
-						performanceManager.registration(mountPointNodeName, ne);
-					}
-
-					deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, ne);
-
-					LOG.info("Starting Event listener on Netconf device :: Name : {} finished", mountPointNodeName);
-				}
-			}
-		}
-	}
+        } else {
+
+            InstanceIdentifier<Node> instanceIdentifier = NETCONF_TOPO_IID.child(Node.class,
+                    new NodeKey(nNodeId));
+
+            Optional<MountPoint> optionalMountPoint = waitForMountpoint(instanceIdentifier, mountPointNodeName);
+
+
+            if (!optionalMountPoint.isPresent()) {
+                LOG.warn("Event listener timeout while waiting for mount point for Netconf device :: Name : {} ",
+                        mountPointNodeName);
+            } else {
+                // Mountpoint is present for sure
+                MountPoint mountPoint = optionalMountPoint.get();
+                // BindingDOMDataBrokerAdapter.BUILDER_FACTORY;
+                LOG.info("Mountpoint with id: {} class {} toString {}", mountPoint.getIdentifier(),
+                        mountPoint.getClass().getName(), mountPoint);
+
+                Optional<DataBroker> optionalNetconfNodeDatabroker = mountPoint.getService(DataBroker.class);
+                if (!optionalNetconfNodeDatabroker.isPresent()) {
+                    LOG.info("Slave mountpoint {} without databroker", mountPointNodeName);
+                } else {
+
+                    // It is master for mountpoint and all data are available.
+                    // Make sure that specific mountPointNodeName is handled only once.
+                    // be aware that startListenerOnNodeForConnectedState could be called multiple
+                    // times for same mountPointNodeName.
+                    // networkElementRepresentations contains handled NEs at master node.
+
+                    synchronized (networkelementLock) {
+                        if (networkElementRepresentations.containsKey(mountPointNodeName)) {
+                            LOG.warn("Mountpoint {} already registered. Leave startup procedure.", mountPointNodeName);
+                            return;
+                        }
+                    }
+                    // update db with connect status
+                    sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
+
+                    DataBroker netconfNodeDataBroker = optionalNetconfNodeDatabroker.get();
+                    LOG.info("Master mountpoint {}", mountPointNodeName);
+                    INetconfAcessor acessor = new NetconfAccessor(nNodeId, nNode, netconfNodeDataBroker, mountPoint, transactionUtils);
+
+                    for (MyNetworkElementFactory<? extends NetworkElementFactory> f : factoryList) {
+                        Optional<NetworkElement> optionalNe = f.getFactory().create(acessor, this);
+                        if (optionalNe.isPresent()) {
+                            f.getInit().register(mountPointNodeName, mountPoint, optionalNe.get());
+                            break; //Use the first provided
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public @NonNull <L extends DeviceManagerService> L getService(Class<L> serviceInterface) throws UnkownDevicemanagerServiceException {
+        if (serviceInterface.isInstance(webSocketService)) {
+            return (L) this.webSocketService;
+        } else if (serviceInterface.isInstance(aotsDcaeForwarder)) {
+            return (L) this.aotsDcaeForwarder;
+        } else if (serviceInterface.isInstance(notificationDelayService)) {
+            return (L) notificationDelayService;
+        }
+        throw new UnkownDevicemanagerServiceException("Unknown service ",serviceInterface);
+    }
+
+    // Deviceinitialization
+
+    @FunctionalInterface
+    interface Register<X, Y, Z> {
+        public void register(X mountPointNodeName, Y mountPoint, Z ne);
+    }
+
+    private class MyNetworkElementFactory<L extends NetworkElementFactory> {
+
+        private final Register<String, MountPoint, NetworkElement> init;
+        private final @NonNull L factory;
+
+        @SuppressWarnings("null")
+        public MyNetworkElementFactory(@NonNull L factory, Register<String, MountPoint, NetworkElement> init) {
+            super();
+            if (init == null || factory == null) {
+                throw new IllegalArgumentException("Null not allowed here.");
+            }
+            this.init = init;
+            this.factory = factory;
+        }
+        public Register<String, MountPoint, NetworkElement> getInit() {
+            return init;
+        }
+        public @NonNull L getFactory() {
+            return factory;
+        }
+    }
+
+    /**
+     * Execute register command, for network element
+     * @param mountPointNodeName  of new network element
+     * @param mountPoint of new network element
+     * @param inNe that needs to register
+     */
+    private void initDefault(String mountPointNodeName, MountPoint mountPoint, NetworkElement inNe) {
+        // sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
+
+        // TODO
+        putToNetworkElementRepresentations(mountPointNodeName, inNe);
+        deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, inNe);
+
+        inNe.register();
+    }
+
+    private void initONFCoremodel(String mountPointNodeName, MountPoint mountPoint,
+            ONFCoreNetworkElementRepresentation ne) {
+        putToNetworkElementRepresentations(mountPointNodeName, ne);
+        // create automatic empty maintenance entry into db before reading and listening
+        // for problems
+        maintenanceService.createIfNotExists(mountPointNodeName);
+
+        // Setup microwaveEventListener for notification service
+        // MicrowaveEventListener microwaveEventListener = new
+        // MicrowaveEventListener(mountPointNodeName, websocketmanagerService,
+        // xmlMapper, databaseClientEvents);
+
+        ne.doRegisterEventListener(mountPoint);
+
+        // Register netconf stream
+        NetconfNotification.registerNotificationStream(mountPointNodeName, mountPoint, "NETCONF");
+
+        // -- Read data from NE
+        ne.initialReadFromNetworkElement();
+
+        if (aaiProviderClient != null) {
+            aaiProviderClient.onDeviceRegistered(mountPointNodeName);
+        }
+        // -- Register NE to performance manager
+        if (performanceManager != null) {
+            performanceManager.registration(mountPointNodeName, ne);
+        }
+
+        deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, (DeviceMonitoredNe)ne);
+
+        LOG.info("Starting Event listener finished. Added Netconf device {}", mountPointNodeName);
+    }
+
+    private void initORan(String mountPointNodeName, MountPoint mountPoint, ONFCoreNetworkElementRepresentation neORan) {
+        // sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
+        putToNetworkElementRepresentations(mountPointNodeName, neORan);
+
+        maintenanceService.createIfNotExists(mountPointNodeName);
+
+        deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, (DeviceMonitoredNe)neORan);
+
+        // -- Read data from NE
+        neORan.initialReadFromNetworkElement();
+        neORan.doRegisterEventListener(mountPoint);
+        NetconfNotification.registerNotificationStream(mountPointNodeName, mountPoint, "NETCONF");
+    }
+
+    private void initNts(String mountPointNodeName, MountPoint mountPoint, ONFCoreNetworkElementRepresentation neNts) {
+        // sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
+        putToNetworkElementRepresentations(mountPointNodeName, neNts);
+        deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, (DeviceMonitoredNe)neNts);
+
+        // -- Read data from NE
+        neNts.initialReadFromNetworkElement();
+    }
+    private void initGRan(String mountPointNodeName, MountPoint mountPoint, ONFCoreNetworkElementRepresentation neGRan) {
+        // sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
+        putToNetworkElementRepresentations(mountPointNodeName, neGRan);
+        deviceMonitor.deviceConnectMasterIndication(mountPointNodeName, (DeviceMonitoredNe)neGRan);
+
+        // -- Read data from NE
+        neGRan.initialReadFromNetworkElement();
+    }
+    /**
+     * @param instanceIdentifier
+     * @param mountPointNodeName
+     * @return
+     */
+    private Optional<MountPoint> waitForMountpoint(InstanceIdentifier<Node> instanceIdentifier,
+            String mountPointNodeName) {
+        Optional<MountPoint> optionalMountPoint = null;
+        int timeout = 10000;
+        while (!(optionalMountPoint = mountPointService.getMountPoint(instanceIdentifier)).isPresent()
+                && timeout > 0) {
+            LOG.info("Event listener waiting for mount point for Netconf device :: Name : {}", mountPointNodeName);
+            sleepMs(1000);
+            timeout -= 1000;
+        }
+        return optionalMountPoint;
+    }
+
+    private void putToNetworkElementRepresentations(String mountPointNodeName, NetworkElement ne) {
+        NetworkElement result;
+        synchronized (networkelementLock) {
+            result = networkElementRepresentations.put(mountPointNodeName, ne);
+        }
+        if (result != null) {
+            LOG.warn("NE list was not empty as expected, but contained {} ", result.getNodeId());
+        } else {
+            odlEventListenerHandler.connectIndication(mountPointNodeName, ne.getDeviceType());
+        }
+    }
 
     /**
      * Mountpoint created or existing. Managed device is actually disconnected from node/ mountpoint.
@@ -450,7 +605,7 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         String mountPointNodeName = nNodeId.getValue();
         ConnectionStatus csts = nNode.getConnectionStatus();
         if (isNetconfNodeMaster(nNode)) {
-        	sendUpdateNotification(mountPointNodeName, csts);
+            sendUpdateNotification(mountPointNodeName, csts,nNode);
         }
 
         // Handling if mountpoint exist. connected -> connecting/UnableToConnect
@@ -470,8 +625,8 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
 
         stopListenerOnNodeForConnectedState(mountPointNodeName);
         deviceMonitor.removeMountpointIndication(mountPointNodeName);
-        if (odlEventListener != null) {
-            odlEventListener.deRegistration(mountPointNodeName);
+        if (odlEventListenerHandler != null) {
+            odlEventListenerHandler.deRegistration(mountPointNodeName);
         }
     }
 
@@ -481,11 +636,10 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
      * @param ne representing the device connected to mountpoint
      */
     private void stopListenerOnNodeForConnectedState( String mountPointNodeName) {
-        ONFCoreNetworkElementRepresentation ne = networkElementRepresentations.remove(mountPointNodeName);
+        NetworkElement ne = networkElementRepresentations.remove(mountPointNodeName);
         if (ne != null) {
             this.maintenanceService.deleteIfNotRequired(mountPointNodeName);
-            int problems = ne.removeAllCurrentProblemsOfNode();
-            LOG.debug("Removed all {} problems from database at deregistration for {}", problems, mountPointNodeName);
+            ne.deregister();
             if (performanceManager != null) {
                 performanceManager.deRegistration(mountPointNodeName);
             }
@@ -495,10 +649,11 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         }
     }
 
-    private void sendUpdateNotification(String mountPointNodeName, ConnectionStatus csts) {
-        LOG.info("enter Non ConnectedState for device :: Name : {} ConnectionStatus {}", mountPointNodeName, csts);
-        if (odlEventListener != null) {
-        	odlEventListener.updateRegistration(mountPointNodeName, ConnectionStatus.class.getSimpleName(), csts != null ? csts.getName() : "null");
+    private void sendUpdateNotification(String mountPointNodeName, ConnectionStatus csts, NetconfNode nNode) {
+        LOG.info("update ConnectedState for device :: Name : {} ConnectionStatus {}", mountPointNodeName, csts);
+        if (odlEventListenerHandler != null) {
+            odlEventListenerHandler.updateRegistration(mountPointNodeName, ConnectionStatus.class.getSimpleName(),
+                    csts != null ? csts.getName() : "null", nNode);
         }
     }
 
@@ -506,44 +661,52 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
      * Handle netconf/mountpoint changes
      */
     @Override
-    public void netconfChangeHandler(Action action, @Nullable ConnectionStatus csts, NodeId nodeId, NetconfNode nNode) {
-
-		ClusteredConnectionStatus ccsts = nNode.getClusteredConnectionStatus();
-		String nodeIdString = nodeId.getValue();
-		if (action == Action.CREATE) {
-	        if (odlEventListener != null) {
-	        	odlEventListener.registration(nodeIdString);
-	        }
-		}
-		boolean isCluster = akkaConfig == null && akkaConfig.isCluster();
-		if (isCluster && ccsts == null) {
-			LOG.debug("NETCONF Node {} {} does not provide cluster status. Stop execution.", nodeIdString, action);
-		} else {
-			switch (action) {
-			case REMOVE:
-				removeMountpointState(nodeId); // Stop Monitor
-				break;
-
-			case UPDATE:
-			case CREATE:
-				if (csts != null) {
-					switch (csts) {
-					case Connected: {
-						startListenerOnNodeForConnectedState(action, nodeId, nNode);
-						break;
-					}
-					case UnableToConnect:
-					case Connecting: {
-						enterNonConnectedState(action, nodeId, nNode);
-						break;
-					}
-					}
-				} else {
-					LOG.debug("NETCONF Node handled with null status for action", action);
-				}
-				break;
-			}
-		}
+    public void netconfNodeChangeHandler(Action action, NodeId nodeId, NetconfNode nNode) {
+
+        @Nullable ConnectionStatus csts = nNode.getConnectionStatus();
+        @Nullable ClusteredConnectionStatus ccsts = nNode.getClusteredConnectionStatus();
+        String nodeIdString = nodeId.getValue();
+
+        LOG.debug("NETCONF Node processing with id {} action {} status {} cluster status {}", nodeId,
+                    action, csts, ccsts);
+
+        boolean isCluster = akkaConfig == null && akkaConfig.isCluster();
+        if (isCluster && ccsts == null) {
+            LOG.debug("NETCONF Node {} {} does not provide cluster status. Stop execution.", nodeIdString, action);
+        } else {
+            switch (action) {
+                case REMOVE:
+                    removeMountpointState(nodeId); // Stop Monitor
+                    break;
+                case CREATE:
+                    if (odlEventListenerHandler != null) {
+                        odlEventListenerHandler.registration(nodeIdString,nNode);
+                    }
+                    createOrUpdateMountpointState(action, csts, nodeId, nNode);
+                    break;
+                case UPDATE:
+                    createOrUpdateMountpointState(action, csts, nodeId, nNode);
+                    break;
+            }
+        }
+    }
+
+    private void createOrUpdateMountpointState(Action action, @Nullable ConnectionStatus csts, NodeId nodeId, NetconfNode nNode) {
+        if (csts != null) {
+            switch (csts) {
+                case Connected: {
+                    startListenerOnNodeForConnectedState(action, nodeId, nNode);
+                    break;
+                }
+                case UnableToConnect:
+                case Connecting: {
+                    enterNonConnectedState(action, nodeId, nNode);
+                    break;
+                }
+            }
+        } else {
+            LOG.debug("NETCONF Node handled with null status for action", action);
+        }
     }
 
     /*-------------------------------------------------------------------------------------------
@@ -554,99 +717,17 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         return this.archiveCleanService;
     }
 
-    public HtDatabaseEventsService getDatabaseClientEvents() {
-        return databaseClientEvents;
+    public DataProvider getDatabaseClientEvents() {
+        return dataProvider;
     }
 
-    public IndexMwtnService getMwtnService() {
-        return mwtnService;
-    }
-
-    /**
-     * Async RPC Interface implementation
-     */
     @Override
-    public @Nonnull List<String> doClearCurrentFaultByNodename(@Nullable List<String> nodeNamesInput)
-            throws IllegalStateException {
-
-        if (this.databaseClientEvents == null) {
-            throw new IllegalStateException("dbEvents service not instantiated");
-        }
-
-        if (threadDoClearCurrentFaultByNodename != null && threadDoClearCurrentFaultByNodename.isAlive()) {
-            throw new IllegalStateException("A clear task is already active");
-        } else {
-
-            // Create list of mountpoints if input is empty, using the content in ES
-            if (nodeNamesInput == null || nodeNamesInput.size() <= 0) {
-                nodeNamesInput = this.databaseClientEvents.getAllNodesWithCurrentAlarms();
-            }
-
-            // Filter all mountpoints from input that were found and are known to this Cluster-node instance of
-            // DeviceManager
-            final List<String> nodeNamesHandled = new ArrayList<>();
-            for (String mountpointName : nodeNamesInput) {
-                LOG.info("Work with mountpoint {}", mountpointName);
-
-                if (odlEventListener != null && mountpointName.equals(odlEventListener.getOwnKeyName())) {
-
-                    // SDN Controller related alarms
-                    // -- can not be recreated on all nodes in connected state
-                    // -- would result in a DCAE/AAI Notification
-                    // Conclusion for 1810 Delivery ... not covered by RPC function (See issue #43)
-                    LOG.info("Ignore SDN Controller related alarms for {}", mountpointName);
-                    // this.databaseClientEvents.clearFaultsCurrentOfNode(mountpointName);
-                    // nodeNamesHandled.add(mountpointName);
-
-                } else {
-
-                    if (mountPointService != null) {
-                        InstanceIdentifier<Node> instanceIdentifier =
-                                NETCONF_TOPO_IID.child(Node.class, new NodeKey(new NodeId(mountpointName)));
-                        Optional<MountPoint> optionalMountPoint = mountPointService.getMountPoint(instanceIdentifier);
-
-                        if (!optionalMountPoint.isPresent()) {
-                            LOG.info("Remove Alarms for unknown mountpoint {}", mountpointName);
-                            this.databaseClientEvents.clearFaultsCurrentOfNode(mountpointName);
-                            nodeNamesHandled.add(mountpointName);
-                        } else {
-                            if (networkElementRepresentations.containsKey(mountpointName)) {
-                                LOG.info("At node known mountpoint {}", mountpointName);
-                                nodeNamesHandled.add(mountpointName);
-                            } else {
-                                LOG.info("At node unknown mountpoint {}", mountpointName);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Force a sync
-            this.deviceMonitor.refreshAlarmsInDb();
-
-            threadDoClearCurrentFaultByNodename = new Thread(() -> {
-                refreshCounter++;
-                LOG.info("Start refresh mountpoint task {}", refreshCounter);
-                // for(String nodeName:nodeNamesOutput) {
-                for (String nodeName : nodeNamesHandled) {
-                    ONFCoreNetworkElementRepresentation ne = networkElementRepresentations.get(nodeName);
-                    if (ne != null) {
-                        LOG.info("Refresh mountpoint {}", nodeName);
-                        ne.initialReadFromNetworkElement();
-                    } else {
-                        LOG.info("Unhandled mountpoint {}", nodeName);
-                    }
-                }
-                LOG.info("End refresh mountpoint task {}", refreshCounter);
-            });
-            threadDoClearCurrentFaultByNodename.start();
-            return nodeNamesHandled;
-        }
-    };
+    public DeviceManagerServiceProvider getServiceProvider() {
+        return this;
+    }
 
     /**
      * Indication if init() of devicemanager successfully done.
-     *
      * @return true if init() was sucessfull. False if not done or not successfull.
      */
     public boolean isDevicemanagerInitializationOk() {
@@ -654,67 +735,25 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
     }
 
     /**
-     * Get initialization status of database.
-     *
-     * @return true if fully initialized false if not
+     * Get NE object. Used by DCAE Service
+     * @param mountpoint mount point name
+     * @return null or NE specific data
      */
-    public boolean isDatabaseInitializationFinished() {
-        return htDatabase == null ? false : htDatabase.getInitialized();
-    }
+    public @Nullable NetworkElement getNeByMountpoint(String mountpoint) {
 
-    /*---------------------------------------------------------------------
-     * Private funtions
-     */
+        return networkElementRepresentations.get(mountpoint);
 
-    /**
-     * Do the stream creation for the device.
-     *
-     * @param mountPointNodeName
-     * @param mountPoint
-     */
-    private void registerNotificationStream(String mountPointNodeName, MountPoint mountPoint, String streamName) {
-
-        final Optional<RpcConsumerRegistry> optionalRpcConsumerService =
-                mountPoint.getService(RpcConsumerRegistry.class);
-        if (optionalRpcConsumerService.isPresent()) {
-            final RpcConsumerRegistry rpcConsumerRegitry = optionalRpcConsumerService.get();
-            final NotificationsService rpcService = rpcConsumerRegitry.getRpcService(NotificationsService.class);
-            if (rpcService == null) {
-                LOG.warn("rpcService is null for mountpoint {}", mountPointNodeName);
-            } else {
-                final CreateSubscriptionInputBuilder createSubscriptionInputBuilder =
-                        new CreateSubscriptionInputBuilder();
-                createSubscriptionInputBuilder.setStream(new StreamNameType(streamName));
-                LOG.info("Event listener triggering notification stream {} for node {}", streamName,
-                        mountPointNodeName);
-                try {
-                    CreateSubscriptionInput createSubscriptionInput = createSubscriptionInputBuilder.build();
-                    if (createSubscriptionInput == null) {
-                        LOG.warn("createSubscriptionInput is null for mountpoint {}", mountPointNodeName);
-                    } else {
-                        rpcService.createSubscription(createSubscriptionInput);
-                    }
-                } catch (NullPointerException e) {
-                    LOG.warn("createSubscription failed");
-                }
-            }
-        } else {
-            LOG.warn("No RpcConsumerRegistry avaialble.");
-        }
+    }
 
+    @Override
+    public void writeToEventLog(String objectId, String msg, String value) {
+        this.odlEventListenerHandler.writeEventLog(objectId, msg, value);
     }
 
-    /**
-     * Get NE object
-     *
-     * @param mountpoint mount point name
-     * @return null or NE specific data
+    /*---------------------------------------------------------------------
+     * Private funtions
      */
-    public @Nullable ONFCoreNetworkElementRepresentation getNeByMountpoint(String mountpoint) {
-
-        return networkElementRepresentations.get(mountpoint);
 
-    }
 
     /* -- LOG related functions -- */
 
@@ -727,11 +766,18 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         return this.akkaConfig == null ? "" : this.akkaConfig.getClusterConfig().getClusterSeedNodeName("abc");
     }
 
-    private boolean isNetconfNodeMaster(NetconfNode nnode) {
+    private boolean isNetconfNodeMaster(NetconfNode nNode) {
         if (isInClusterMode()) {
             LOG.debug("check if me is responsible for node");
-            String masterNodeName = nnode.getClusteredConnectionStatus() == null ? "null"
-                    : nnode.getClusteredConnectionStatus().getNetconfMasterNode();
+            String masterNodeName = null;
+            ClusteredConnectionStatus ccst = nNode.getClusteredConnectionStatus();
+            if (ccst != null) {
+                masterNodeName = ccst.getNetconfMasterNode();
+            }
+            if (masterNodeName == null) {
+                masterNodeName = "null";
+            }
+
             String myNodeName = getClusterNetconfNodeName();
             LOG.debug("sdnMasterNode=" + masterNodeName + " and sdnMyNode=" + myNodeName);
             if (!masterNodeName.equals(myNodeName)) {
@@ -742,6 +788,34 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
         return true;
     }
 
+    private static AkkaConfig loadClusterConfiguration() {
+        AkkaConfig akkaConfigRes;
+        try {
+            akkaConfigRes = AkkaConfig.load();
+            LOG.debug("akka.conf loaded: " + akkaConfigRes.toString());
+        } catch (Exception e1) {
+            akkaConfigRes = null;
+            LOG.warn("problem loading akka.conf: " + e1.getMessage());
+        }
+        @SuppressWarnings("unused")
+        GeoConfig geoConfig = null;
+        if (akkaConfigRes != null && akkaConfigRes.isCluster()) {
+            LOG.info("cluster mode detected");
+            if (GeoConfig.fileExists()) {
+                try {
+                    LOG.debug("try to load geoconfig");
+                    geoConfig = GeoConfig.load();
+                } catch (Exception err) {
+                    LOG.warn("problem loading geoconfig: " + err.getMessage());
+                }
+            } else {
+                LOG.debug("no geoconfig file found");
+            }
+        } else {
+            LOG.info("single node mode detected");
+        }
+        return akkaConfigRes;
+    }
 
     private void sleepMs(int milliseconds) {
         try {
@@ -752,5 +826,4 @@ public class DeviceManagerImpl implements DeviceManagerService, AutoCloseable, R
             Thread.currentThread().interrupt();
         }
     }
-
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
new file mode 100644
index 000000000..2c164d826
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeConnectListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeviceManagerNetconfConnectHandler implements NetconfNodeConnectListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerNetconfConnectHandler.class);
+
+    private ListenerRegistration<DeviceManagerNetconfConnectHandler> registerNetconfNodeConnectListener;
+
+    public DeviceManagerNetconfConnectHandler(@Nullable NetconfNodeStateService netconfNodeStateService) {
+        if (netconfNodeStateService == null) {
+            registerNetconfNodeConnectListener = new ListenerRegistration<DeviceManagerNetconfConnectHandler>() {
+                @Override
+                public void close() {
+                }
+                @Override
+                public @NonNull DeviceManagerNetconfConnectHandler getInstance() {
+                    return DeviceManagerNetconfConnectHandler.this;
+                }
+            };
+        } else {
+			this.registerNetconfNodeConnectListener = netconfNodeStateService.registerNetconfNodeConnectListener(this);
+		}
+    }
+
+    @Override
+    public void onEnterConnected(NodeId nNodeId, NetconfNode netconfNode, DataBroker netconfNodeDataBroker) {
+        LOG.info("onEnterConnected {}", nNodeId);
+        //o-ran-interfaces .. spec for RAN Devices to be used as fingerprint
+    }
+
+    @Override
+    public void onLeaveConnected(NodeId nNodeId) {
+        LOG.info("onLeaveConnected {}", nNodeId);
+    }
+
+    @Override
+    public void close() throws Exception {
+         registerNetconfNodeConnectListener.close();
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DevicemanagerNotificationDelayService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DevicemanagerNotificationDelayService.java
new file mode 100644
index 000000000..25f55046b
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DevicemanagerNotificationDelayService.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayService;
+
+/**
+ * Devicemanager service
+ */
+public class DevicemanagerNotificationDelayService extends NotificationDelayService<ProblemNotificationXml> implements DeviceManagerService {
+
+    public DevicemanagerNotificationDelayService(ConfigurationFileRepresentation htconfig) {
+        super(htconfig);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/LinkIdentifyingObject.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/LinkIdentifyingObject.java
index 7c4f7e102..8c9ca564f 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/LinkIdentifyingObject.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/LinkIdentifyingObject.java
@@ -6,16 +6,16 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
 
 public interface LinkIdentifyingObject {
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/NetconfNodeService.java
index ce34401d8..5ce8a0d69 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/NetconfNodeService.java
@@ -16,18 +16,17 @@
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
-import javax.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 
-public interface DeviceManagerService {
+public interface NetconfNodeService {
 
     public enum Action {
         CREATE,
         REMOVE,
         UPDATE
     }
+
     /**
      * MountpointChangeHandler, called to indicate change to DeviceManager
      * @param action provided
@@ -35,5 +34,5 @@ public interface DeviceManagerService {
      * @param nodeId provided
      * @param nnode provided
      */
-    void netconfChangeHandler(Action action, @Nullable ConnectionStatus csts, NodeId nodeId, NetconfNode nnode);
+	void netconfNodeChangeHandler(Action action, NodeId nodeId, NetconfNode nnode);
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/NetconfNotification.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/NetconfNotification.java
new file mode 100644
index 000000000..ac4b8565e
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/NetconfNotification.java
@@ -0,0 +1,69 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.NotificationsService;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NetconfNotification {
+
+    private static final Logger log = LoggerFactory.getLogger(DeviceManagerImpl.class);
+
+    /**
+     * Do the stream creation for the device.
+     * @param nodeId node-id of device
+     * @param mountpoint information
+     * @param streamName to register
+     */
+    public static void registerNotificationStream(String nodeId, MountPoint mountpoint, String streamName) {
+
+        final Optional<RpcConsumerRegistry> optionalRpcConsumerService =
+                mountpoint.getService(RpcConsumerRegistry.class);
+        if (optionalRpcConsumerService.isPresent()) {
+            final RpcConsumerRegistry rpcConsumerRegitry = optionalRpcConsumerService.get();
+            @Nonnull
+            final NotificationsService rpcService = rpcConsumerRegitry.getRpcService(NotificationsService.class);
+
+            final CreateSubscriptionInputBuilder createSubscriptionInputBuilder = new CreateSubscriptionInputBuilder();
+            createSubscriptionInputBuilder.setStream(new StreamNameType(streamName));
+            log.info("Event listener triggering notification stream {} for node {}", streamName, nodeId);
+            try {
+                CreateSubscriptionInput createSubscriptionInput = createSubscriptionInputBuilder.build();
+                if (createSubscriptionInput == null) {
+                    log.warn("createSubscriptionInput is null for mountpoint {}", nodeId);
+                } else {
+                    rpcService.createSubscription(createSubscriptionInput);
+                }
+            } catch (NullPointerException e) {
+                log.warn("createSubscription failed");
+            }
+        } else {
+            log.warn("No RpcConsumerRegistry avaialble.");
+        }
+
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/PushNotifications.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/PushNotifications.java
new file mode 100644
index 000000000..2acefc166
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/PushNotifications.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushAttributeChangeNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushFaultNotificationInput;
+
+public interface PushNotifications {
+
+	void pushAttributeChangeNotification(PushAttributeChangeNotificationInput input);
+
+	void pushFaultNotification(PushFaultNotificationInput input);
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AkkaConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/AkkaConfig.java
index eeccf601f..7e54881ed 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/AkkaConfig.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/AkkaConfig.java
@@ -15,15 +15,16 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import java.io.File;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ClusterConfig;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
 public class AkkaConfig {
 
     @SuppressWarnings("unused")
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/ClusterConfig.java
index 7d3174bce..c6c8c1533 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterConfig.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/ClusterConfig.java
@@ -15,14 +15,18 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka;
 
-import com.typesafe.config.Config;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo.ClusterRoleInfo;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo.ClusterRoleInfoCollection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.typesafe.config.Config;
+
 public class ClusterConfig {
 
     private static final Logger LOG = LoggerFactory.getLogger(ClusterConfig.class);
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterNodeInfo.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/ClusterNodeInfo.java
index 53dcfd102..7bc015fed 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterNodeInfo.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlAkka/ClusterNodeInfo.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterRoleInfo.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/ClusterRoleInfo.java
index fa2a21b6a..9a9793b89 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterRoleInfo.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/ClusterRoleInfo.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterRoleInfoCollection.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/ClusterRoleInfoCollection.java
index 6cb81c2af..089bf33f2 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/util/ClusterRoleInfoCollection.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/ClusterRoleInfoCollection.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo;
 
 import java.util.ArrayList;
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/GeoConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/GeoConfig.java
index ac9c3cb50..25e7fe265 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/config/impl/GeoConfig.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/conf/odlGeo/GeoConfig.java
@@ -15,15 +15,14 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ClusterRoleInfo;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ClusterRoleInfoCollection;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 
 public class GeoConfig {
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/FaultEntityManager.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/FaultEntityManager.java
new file mode 100644
index 000000000..5b7057b81
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/FaultEntityManager.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Fault;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+
+public class FaultEntityManager {
+
+    private static final Pattern pattern = Pattern.compile(".*\\[layerProtocol=(.*)\\]");
+
+    /**
+     * The leading indication for notification or events that are not in the
+     * currentProblem data of the ONF Coremodel
+     */
+    private static final String NOCURRENTPROBLEMINDICATION = "#";
+
+    /**
+     * Specific problems are not moving into current problem list
+     * @param problemName to be verified
+     * @return true if problem is current
+     */
+    public static boolean isManagedAsCurrentProblem(String problemName) {
+        return ! problemName.startsWith(NOCURRENTPROBLEMINDICATION);
+    }
+
+    public static boolean isManagedAsCurrentProblem(Fault problem) {
+        return isManagedAsCurrentProblem(problem.getProblem());
+    }
+
+    /**
+     * Specific problems are not moving into current problem list
+     * @param fault to be verified
+     * @return true if cleared indication
+     */
+    public static boolean isNoAlarmIndication(Fault fault) {
+        InternalSeverity severity = InternalSeverity.valueOf(fault.getSeverity());
+        return severity.isNoAlarmIndication();
+    }
+
+    /**
+     * Create a specific ES id for the current log.
+     * @return a string with the generated ES Id
+     */
+     public static String genSpecificEsId(String nodeName, String objectId, String problemName) {
+
+        String uuId;
+
+        Matcher matcher = pattern.matcher(objectId);
+        if (matcher.matches() && matcher.groupCount() == 1) {
+            uuId = matcher.group(1);
+        } else {
+            uuId = objectId;
+        }
+
+        StringBuffer strBuf = new StringBuffer();
+        strBuf.append(nodeName);
+        strBuf.append("/");
+        strBuf.append(uuId);
+        strBuf.append("/");
+        strBuf.append(problemName);
+        return strBuf.toString();
+    }
+
+    /**
+     * Create Es id
+     * @param fault used to create uuid for faultcurrent
+     * @return String with Id
+     */
+    public static String genSpecificEsId(FaultcurrentEntity fault) {
+        return genSpecificEsId(fault.getNodeId(), fault.getObjectId(), fault.getProblem());
+    }
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDataBaseReaderAndWriter.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/HtDataBaseReaderAndWriter.java
index a742a94b0..919156b20 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtDataBaseReaderAndWriter.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/HtDataBaseReaderAndWriter.java
@@ -15,16 +15,16 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.SearchHit;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.database.DatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.IsEsObject;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +37,7 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
     private static final Logger log = LoggerFactory.getLogger(HtDataBaseReaderAndWriter.class);
 
 
-    private final HtDataBase db;
+    private final DatabaseClient db;
     private final String dataTypeName;
     private final HtMapper<T> mapper;
 
@@ -47,13 +47,16 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
      * @param dataTypeName datatype name
      * @param clazz class of datatype
      */
-    public HtDataBaseReaderAndWriter(HtDataBase db, String dataTypeName, Class<? extends T> clazz) {
+    public HtDataBaseReaderAndWriter(DatabaseClient db, String dataTypeName, Class<? extends T> clazz) {
 
         this.db = db;
         this.dataTypeName = dataTypeName;
         this.mapper = new HtMapper<>( clazz );
 
     }
+    public boolean isExistsIndex() {
+        return this.db.isExistsIndex(this.dataTypeName);
+    }
     /**
      * @return dataTypeName
      */
@@ -81,16 +84,16 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
         int idx = 0;                //Idx for getAll
         int iterateLength = 100;    //Step width for iterate
 
-        SearchHit hits[];
+        List<SearchHit> hits;
         do {
-            hits = db.doReadByQueryJsonData(idx, iterateLength, dataTypeName, query);
-            log.debug("Found: {} elements: {}  Failures: {}",dataTypeName,hits.length, mapper.getMappingFailures());
+            hits = db.doReadByQueryJsonData( dataTypeName, query).getHits();
+            log.debug("Found: {} elements: {}  Failures: {}",dataTypeName,hits.size(), mapper.getMappingFailures());
 
             T object;
-            idx += hits.length;
+            idx += hits.size();
             for (SearchHit hit : hits) {
 
-                object = mapper.getObjectFromJson( hit.getSourceRef() );
+                object = mapper.getObjectFromJson( hit.getSourceAsString() );
 
                 log.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n Failures: {}", hit.getId(), hit.getSourceAsString(), object, mapper.getMappingFailures());
                 if (object != null) {
@@ -100,7 +103,7 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
                     log.warn("Mapp result null Object: {}\n Source: '{}'\n : '", hit.getId(), hit.getSourceAsString());
                 }
             }
-        } while (hits.length == iterateLength); //Do it until end indicated, because less hits than iterateLength allows.
+        } while (hits.size() == iterateLength); //Do it until end indicated, because less hits than iterateLength allows.
 
         return idx;
     }
@@ -158,13 +161,7 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
     public HtDataBaseReaderAndWriter<T> doWrite( Collection<T> list) {
 
         int writeError = 0;
-        String indexName = db.getNetworkIndex();
-
-        log.debug("Write to ES database {}, {} Class: {}  {} elements",indexName,dataTypeName, mapper.getClazz().getSimpleName(), list.size());
-
-        if (indexName == null) {
-            throw new IllegalArgumentException("Missing Index");
-        }
+        log.debug("Write to ES database {} Class: {}  {} elements",dataTypeName, mapper.getClazz().getSimpleName(), list.size());
 
         if (list != null && !list.isEmpty()) {
             for( T s : list ) {
@@ -175,7 +172,6 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
                     }
                 }
             }
-
         }
 
         return this;
@@ -210,36 +206,41 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
      * Get all elements of related type
      * @return all Elements
      */
-    public List<T> doReadAll() {
+    public SearchResult<T> doReadAll() {
         return doReadAll(null);
     }
+
     /**
      * Read all existing objects of a type
      * @param query for the elements
      * @return the list of all objects
      */
-    public List<T> doReadAll(QueryBuilder query) {
 
-        List<T> res = new ArrayList<>();
+    public SearchResult<T> doReadAll(QueryBuilder query) {
+
+        SearchResult<T> res = new SearchResult<>();
         int idx = 0;                //Idx for getAll
         int iterateLength = 100;    //Step width for iterate
 
-        SearchHit hits[];
+        SearchResult<SearchHit> result;
+        List<SearchHit> hits;
         do {
             if(query!=null) {
-                log.trace("read data in {} {} with query {}",db.getNetworkIndex(),dataTypeName,query);
-                hits=db.doReadByQueryJsonData(0, 99999, dataTypeName, query);
+                log.debug("read data in {} with query {}",dataTypeName,query.toJSON());
+                result=db.doReadByQueryJsonData( dataTypeName, query);
             }
             else {
-                hits = db.doReadAllJsonData(idx, iterateLength, dataTypeName);
+                result = db.doReadAllJsonData( dataTypeName);
             }
-            log.debug("Read: {} elements: {}  Failures: {}",dataTypeName,hits.length, mapper.getMappingFailures());
+            hits=result.getHits();
+            log.debug("Read: {} elements: {}  Failures: {}",dataTypeName,hits.size(), mapper.getMappingFailures());
 
             T object;
-            idx += hits.length;
+            idx += result.getHits().size();
             for (SearchHit hit : hits) {
 
-                object = mapper.getObjectFromJson( hit.getSourceRef() );
+//                object = mapper.getObjectFromJson( hit.getSourceRef() );
+                object = mapper.getObjectFromJson( hit.getSourceAsString() );
 
                 log.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n Failures: {}", hit.getId(), hit.getSourceAsString(), object, mapper.getMappingFailures());
                 if (object != null) {
@@ -249,8 +250,8 @@ public class HtDataBaseReaderAndWriter<T extends IsEsObject> {
                     log.warn("Mapp result null Object: {}\n Source: '{}'\n : '", hit.getId(), hit.getSourceAsString());
                 }
             }
-        } while (hits.length == iterateLength); //Do it until end indicated, because less hits than iterateLength allows.
-
+        } while (hits.size() == iterateLength); //Do it until end indicated, because less hits than iterateLength allows.
+        res.setTotal(idx);
         return res;
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtMapper.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/HtMapper.java
index 9d8ddc3ae..dc2e4d768 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/HtMapper.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/HtMapper.java
@@ -15,25 +15,23 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import java.io.IOException;
-import javax.annotation.Nullable;
-
-import org.elasticsearch.common.bytes.BytesReference;
+import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
 /**
  * @author Herbert
  *
  */
 public class HtMapper<T> {
 
-    private static final Logger log = LoggerFactory.getLogger(HtDatabaseClientAbstract.class);
+    private static final Logger log = LoggerFactory.getLogger(HtMapper.class);
 
     private final Class<? extends T> clazz;
 
@@ -42,7 +40,6 @@ public class HtMapper<T> {
 
     private int mappingFailures;
 
-
     public HtMapper(Class<? extends T> clazz) {
 
         this.mappingFailures = 0;
@@ -60,13 +57,14 @@ public class HtMapper<T> {
         return mappingFailures;
     }
 
-    public String objectToJson( T object ) {
+    public String objectToJson(T object) {
         return objectMapperWrite.objectToJson(object);
     }
 
     /**
-     * Do the mapping from Json to class
-     * Block further mapping if there is are to many failures
+     * Do the mapping from Json to class Block further mapping if there is are to
+     * many failures
+     *
      * @param json String with Objects JSON representation
      * @return The Object
      */
@@ -97,14 +95,45 @@ public class HtMapper<T> {
     }
 
     /**
-     * Do the mapping from Json to class
-     * Block further mapping if there is are to many failures
-     * @param json Byte array with JSON Object representation
+     * Do the mapping from Json to class Block further mapping if there is are to
+     * many failures
+     *
+     * @param json String with Objects JSON representation
      * @return The Object
      */
-    public @Nullable T getObjectFromJson(BytesReference json) {
+    public @Nullable T getObjectFromJson(String json) {
+
+        if (json == null) {
+            return null;
+        } else if (mappingFailures < 10) {
+            try {
+                T object = objectMapperRead.readValue(json, clazz);
+                return object;
+            } catch (JsonParseException e) {
+                mappingFailures++;
+                log.warn(e.toString());
+            } catch (JsonMappingException e) {
+                mappingFailures++;
+                log.warn(e.toString());
+            } catch (IOException e) {
+                mappingFailures++;
+                log.warn(e.toString());
+            } catch (Exception e) {
+                mappingFailures++;
+                log.warn(e.toString());
+            }
+        }
+        log.warn("Problems parsing : {} {}", clazz, json);
+        return null;
+    }
+
+    public void setSerializationInclusion(Include incl) {
+        this.objectMapperRead.setSerializationInclusion(incl);
+
+    }
+    public void resetSerializationInclusion() {
+        this.objectMapperRead.setSerializationInclusion(Include.USE_DEFAULTS);
 
-        return json == null ? null : getObjectFromJson(json.toBytes());
 
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/JsonMapperBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/JsonMapperBase.java
index 4a89c9be1..848004b39 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/JsonMapperBase.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/JsonMapperBase.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/service/HtDatabaseEventsService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/service/HtDatabaseEventsService.java
deleted file mode 100644
index 0a38e0f60..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/service/HtDatabaseEventsService.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import javax.annotation.Nonnull;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice.ArchiveCleanProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDataBaseReaderAndWriter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseClientAbstract;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.IndexClientBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElement12Equipment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.EsEventBase;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.EsFaultCurrent;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.EsFaultLog;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment.EsEquipment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment.EsToplevelEquipment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment.ExtendedEquipment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.MwtNotificationBase;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Event service, writing all events into the database into the appropriate index.
- *
- * @author herbert
- */
-public class HtDatabaseEventsService implements ArchiveCleanProvider {
-    private static final Logger LOG = LoggerFactory.getLogger(HtDatabaseEventsService.class);
-
-    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
-
-    ///** Filename in the resources with maven initialized version information  */
-    //private static final String RESOURCENAME = "version.properties"; // could also be a constant
-    ///** Index name to be used */
-    private static final String INDEX = "sdnevents";
-    private static final String MAPPING = "/elasticsearch/index/sdnevents/sdneventsMapping.json";
-
-    private HtDatabaseClientAbstract client;
-    private HtDataBaseReaderAndWriter<EsEventBase> eventRWEventLog;
-    private HtDataBaseReaderAndWriter<EsFaultCurrent> eventRWFaultCurrent;
-    private HtDataBaseReaderAndWriter<EsFaultLog> eventRWFaultLog;
-    private HtDataBaseReaderAndWriter<EsEquipment> eventRWEquipment;
-    private HtDataBaseReaderAndWriter<EsToplevelEquipment> eventRWToplevelEquipment;
-
-
-    // --- Construct and initialize
-
-    public HtDatabaseEventsService(HtDatabaseNode database) {
-
-        LOG.info("Create {} start", HtDatabaseEventsService.class);
-
-        try {
-            // Create control structure
-            IndexClientBuilder clientBuilder = IndexClientBuilder.getBuilder(INDEX).setMappingSettingJsonFileName(MAPPING);
-            client = clientBuilder.create(database);
-            clientBuilder.close();
-
-            eventRWEventLog = new HtDataBaseReaderAndWriter<>(client, EsEventBase.ESDATATYPENAME, EsEventBase.class);
-            eventRWFaultLog = new HtDataBaseReaderAndWriter<>(client, EsFaultLog.ESDATATYPENAME, EsFaultLog.class);
-            eventRWFaultCurrent = new HtDataBaseReaderAndWriter<>(client, EsFaultCurrent.ESDATATYPENAME, EsFaultCurrent.class);
-            eventRWToplevelEquipment = new HtDataBaseReaderAndWriter<>(client, EsToplevelEquipment.ESDATATYPENAME, EsToplevelEquipment.class);
-            eventRWEquipment = new HtDataBaseReaderAndWriter<>(client, EsEquipment.ESDATATYPENAME, EsEquipment.class);
-
-
-        } catch (Exception e) {
-            LOG.error("Can not start database client. Exception: {}", e.getMessage());
-        }
-        LOG.info("Create {} finished. DB Service {} started.", HtDatabaseEventsService.class,  client != null ? "sucessfully" : "not" );
-    }
-
-    // --- Function
-
-    public void writeEventLog(MwtNotificationBase event) {
-        if (client == null) {
-            LOG.debug("No DB, can not write: {}",event.toString());
-            return;
-        }
-
-        LOG.debug("Write event: {}",event.toString());
-        EsEventBase eventBase = new EsEventBase();
-        eventBase.setProblem(event);
-        eventRWEventLog.doWrite(eventBase);
-    }
-
-    public void writeFaultLog(ProblemNotificationXml fault) {
-        if (client == null) {
-            LOG.debug("No DB, can not write: {}",fault.toString());
-            return;
-        }
-
-        LOG.debug("Write fault to faultlog: {}",fault.toString());
-        EsFaultLog eventProblem = new EsFaultLog();
-        eventProblem.setProblem(fault);
-        eventRWFaultLog.doWrite(eventProblem);
-    }
-
-    public void updateFaultCurrent(ProblemNotificationXml fault) {
-        if (client == null) {
-            LOG.debug("No DB, can not write: {}",fault.toString());
-            return;
-        }
-
-        if (!fault.isNotManagedAsCurrentProblem()) {
-            EsFaultCurrent eventProblem = new EsFaultCurrent();
-            eventProblem.setProblem(fault);
-
-            if (eventProblem.isNoAlarmIndication()) {
-                LOG.debug("Remove from currentFaults: {}",fault.toString());
-                eventRWFaultCurrent.doRemove(eventProblem);
-            } else {
-                LOG.debug("Write to currentFaults: {}",fault.toString());
-                eventRWFaultCurrent.doWrite(eventProblem);
-            }
-        } else {
-            LOG.debug("Ingnore for currentFaults: {}",fault.toString());
-        }
-    }
-
-    /**
-     * Remove all entries for one node
-     * @param nodeName contains the mountpointname
-     * @return number of deleted entries
-     */
-    public int clearFaultsCurrentOfNode(String nodeName) {
-        if (client == null) {
-            LOG.debug("No DB, can not delete for node: {}", nodeName);
-            return -1;
-        }
-        LOG.debug("Remove from currentFaults all faults for node: {}", nodeName);
-        return eventRWFaultCurrent.doRemoveByQuery(EsFaultCurrent.getQueryForOneNode(nodeName));
-    }
-
-    /**
-     * Remove all entries for one node
-     * @param nodeName contains the mountpointname
-     * @param objectId of element to be deleted
-     * @return number of deleted entries
-     */
-    public int clearFaultsCurrentOfNodeWithObjectId(String nodeName, String objectId) {
-        if (client == null) {
-            LOG.debug("No DB, can not delete for node: {}", nodeName);
-            return -1;
-        }
-        LOG.debug("Remove from currentFaults all faults for node/objectId: {}/{}", nodeName, objectId);
-        return eventRWFaultCurrent.doRemoveByQuery(EsFaultCurrent.getQueryForOneNodeAndObjectId(nodeName, objectId));
-
-    }
-
-    /**
-     * Deliver list with all mountpoint/node-names in the database.
-     * @return List of all mountpoint/node-names the had active alarms.
-     */
-    public @Nonnull List<String> getAllNodesWithCurrentAlarms() {
-        if (client == null) {
-            LOG.debug("No DB, can not delete for all nodes");
-            return new ArrayList<>();
-        }
-        LOG.debug("Remove from currentFaults faults for all node");
-        List<String> nodeNames = new ArrayList<>();
-
-        for (EsFaultCurrent fault : eventRWFaultCurrent.doReadAll()) {
-            String nodeName = fault.getProblem().getNodeName();
-            if (!nodeNames.contains(nodeName)) {
-                //this.clearFaultsCurrentOfNode(nodeName); -> Function shifted
-                nodeNames.add(nodeName);
-            }
-        }
-        return nodeNames;
-    }
-
-
-    /**
-     * Write inventory to DB
-     * @param equipment all equipment of network element
-     */
-    public void writeInventory(ONFCoreNetworkElement12Equipment equipment) {
-        if (client == null) {
-            LOG.debug("No DB, can not write for mountpoint: {}",equipment.getMountpoint());
-            return;
-        }
-
-        LOG.debug("Write inventory to database for mountpoint: {}",equipment.getMountpoint());
-
-        EsToplevelEquipment esToplevelEquipment = new EsToplevelEquipment();
-        esToplevelEquipment.set(equipment);
-        eventRWToplevelEquipment.doWrite(esToplevelEquipment);
-
-        List<ExtendedEquipment> equipmentList = equipment.getEquipmentList();
-        EsEquipment esEquipment;
-        for (ExtendedEquipment equipment1 : equipmentList) {
-            esEquipment = new EsEquipment();
-            esEquipment.set(equipment.getMountpoint(), equipment1);
-            eventRWEquipment.doWrite(esEquipment);
-        }
-    }
-
-    @Override
-    public int doIndexClean(Date olderAreOutdated) {
-
-        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
-        int removed = 0;
-
-        QueryBuilder queryEventBase = EsEventBase.getQueryForTimeStamp(netconfTimeStamp);
-        removed += eventRWEventLog.doRemoveByQuery(queryEventBase);
-
-        QueryBuilder queryFaultLog = EsFaultLog.getQueryForTimeStamp(netconfTimeStamp);
-        removed += eventRWFaultLog.doRemoveByQuery(queryFaultLog);
-        return removed;
-    }
-
-    @Override
-    public int getNumberOfOldObjects(Date olderAreOutdated) {
-
-        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
-        int numberOfElements = 0;
-
-        QueryBuilder queryEventBase = EsEventBase.getQueryForTimeStamp(netconfTimeStamp);
-        numberOfElements += eventRWEventLog.doReadAll(queryEventBase).size();
-
-        QueryBuilder queryFaultLog = EsFaultLog.getQueryForTimeStamp(netconfTimeStamp);
-        numberOfElements += eventRWFaultLog.doReadAll(queryFaultLog).size();
-
-        return numberOfElements;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsFaultCurrent.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsFaultCurrent.java
deleted file mode 100644
index 97c48f1ff..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsFaultCurrent.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types;
-
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-
-/**
- * Event from Network to be recorded in the database
- *
- */
-
-public class EsFaultCurrent extends EsObject {
-
-    public static final String ESDATATYPENAME = "faultcurrent";
-    //private static final String NOALARM = "NonAlarmed";
-
-    private ProblemNotificationXml faultCurrent;
-
-    public ProblemNotificationXml getProblem() {
-        return faultCurrent;
-    }
-
-    public void setProblem(ProblemNotificationXml fault) {
-        this.faultCurrent = fault;
-        setEsId(fault.genSpecificEsId());
-    }
-
-    public boolean isNoAlarmIndication() {
-        return faultCurrent.getSeverity().isNoAlarmIndication();
-    }
-
-    /**
-     * TODO: termquery to matchquery, termquery with scoring, not exact matching
-     * @param nodeName name of the node
-     * @return query builder
-     */
-    public static QueryBuilder getQueryForOneNode( String nodeName) {
-        return QueryBuilders.termQuery("faultCurrent.nodeName", nodeName);
-    }
-
-    public static QueryBuilder getQueryForOneNodeAndObjectId( String nodeName, String objectId) {
-        BoolQueryBuilder bq = QueryBuilders.boolQuery();
-        bq.must(QueryBuilders.termQuery("faultCurrent.nodeName", nodeName));
-        bq.must(QueryBuilders.termQuery("faultCurrent.objectId", objectId));
-        return bq;
-        //return QueryBuilders.termQuery("faultCurrent.objectId", objectId);
-
-    }
- }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/EsEquipment.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/EsEquipment.java
deleted file mode 100644
index 5c70ad972..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/EsEquipment.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.Equipment;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ManufacturedThing;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.EquipmentInstance;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.EquipmentType;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g.ManufacturerProperties;
-
-public class EsEquipment extends EsObject {
-
-    public static final String ESDATATYPENAME = "inventoryequipment";
-
-    int treeLevel;
-    String parentUuid;
-    String mountpoint;
-    String uuid;
-    List<String> containedHolder;
-    String manufacturerName;
-    String manufacturerIdentifier;
-    String serial;
-    String date;
-    String version;
-    String description;
-    String partTypeId;
-    String modelIdentifier;
-    String typeName;
-
-
-    public EsEquipment set( String mountpoint, ExtendedEquipment extendedEquipment ) {
-
-        Equipment equipment = extendedEquipment.getEquipment();
-
-        this.parentUuid = extendedEquipment.getParentUuid();
-        this.treeLevel = extendedEquipment.getTreeLevel();
-        this.mountpoint = mountpoint;
-        this.uuid = equipment.getUuid().getValue();
-        this.setEsId(this.mountpoint+"/"+this.uuid);
-
-        this.containedHolder = new ArrayList<>();
-        List<ContainedHolder> containedHolderList = equipment.getContainedHolder();
-        if (containedHolderList != null && !containedHolderList.isEmpty()) {
-            for (ContainedHolder containedHolderElement: containedHolderList) {
-                this.containedHolder.add(containedHolderElement.key().getUuid().getValue());
-            }
-        }
-        ManufacturedThing manufacturedThing = equipment.getManufacturedThing();
-        if (manufacturedThing != null) {
-            ManufacturerProperties manufacturedProperties = manufacturedThing.getManufacturerProperties();
-            if (manufacturedProperties != null) {
-                this.manufacturerName = manufacturedProperties.getManufacturerName();
-                this.manufacturerIdentifier = manufacturedProperties.getManufacturerIdentifier();
-            }
-            EquipmentInstance equipmentInstance = manufacturedThing.getEquipmentInstance();
-            if (equipmentInstance != null) {
-                this.serial = equipmentInstance.getSerialNumber();
-                this.date = equipmentInstance.getManufactureDate();
-            }
-            EquipmentType equipmentType = manufacturedThing.getEquipmentType();
-            if (equipmentType != null) {
-                this.version = equipmentType.getVersion();
-                this.description = equipmentType.getDescription();
-                this.partTypeId = equipmentType.getPartTypeIdentifier();
-                this.modelIdentifier = equipmentType.getModelIdentifier();
-                this.typeName = equipmentType.getTypeName();
-            }
-        }
-
-        return this;
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfEventListener12.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/NetconfEventListenerHandler12.java
index ae05da943..e0560cb1e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfEventListener12.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/NetconfEventListenerHandler12.java
@@ -15,26 +15,24 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler;
 
 import java.util.List;
-
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElement12Equipment;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementCallback;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.OnfMicrowaveModelNotification;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayFilter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationDelayedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElement12Equipment;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementCallback;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.OnfMicrowaveModelNotification;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectDeletionNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayFilter;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationDelayedListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,26 +43,23 @@ import org.slf4j.LoggerFactory;
  *
  * @author herbert
  */
-public class NetconfEventListener12 implements OnfMicrowaveModelNotification, NotificationDelayedListener<ProblemNotificationXml> {
+public class NetconfEventListenerHandler12 implements OnfMicrowaveModelNotification, NotificationDelayedListener<ProblemNotificationXml> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(NetconfEventListener12.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfEventListenerHandler12.class);
 
     private final String nodeName;
-    private final WebSocketServiceClient webSocketService;
+    private final WebSocketServiceClientInternal webSocketService;
     //private final WebsocketmanagerService websocketmanagerService;
     //private final XmlMapper xmlMapper;
-    private final HtDatabaseEventsService databaseService;
-    private final ProviderClient dcaeProvider;
-    private final @Nullable ProviderClient aotsmClient;
-
-    private final MaintenanceService maintenanceService;
+    private final DataProvider databaseService;
+    private final DcaeForwarderInternal dcaeForwarder;
 
     private final NotificationDelayFilter<ProblemNotificationXml> delayFilter;
     private final ONFCoreNetworkElementCallback ne;
 
-    public NetconfEventListener12(String nodeName, WebSocketServiceClient webSocketService,
-            HtDatabaseEventsService databaseService, ProviderClient dcaeProvider,@Nullable ProviderClient aotsmClient,
-            MaintenanceService maintenanceService2,NotificationDelayService<ProblemNotificationXml> notificationDelayService,
+    public NetconfEventListenerHandler12(String nodeName, WebSocketServiceClientInternal webSocketService,
+            DataProvider databaseService, DcaeForwarderInternal aotsDcaeForwarder,
+            NotificationDelayService<ProblemNotificationXml> notificationDelayService,
             ONFCoreNetworkElementCallback ne) {
         super();
         this.nodeName = nodeName;
@@ -72,9 +67,7 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
         //this.xmlMapper = xmlMapper;
         this.webSocketService = webSocketService;
         this.databaseService = databaseService;
-        this.dcaeProvider = dcaeProvider;
-        this.aotsmClient = aotsmClient;
-        this.maintenanceService=maintenanceService2;
+        this.dcaeForwarder = aotsDcaeForwarder;
         this.delayFilter=notificationDelayService.getInstance(nodeName, this);//12(nodeName,this);
         this.ne = ne;
     }
@@ -85,8 +78,7 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
 
         ne.notificationFromNeListener(notificationXml);
 
-        databaseService.writeEventLog(notificationXml);
-
+        databaseService.writeEventLog(notificationXml.getEventlogEntity());
         webSocketService.sendViaWebsockets(nodeName, notificationXml);
     }
 
@@ -94,8 +86,7 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
     @Override
     public void onObjectCreationNotification(ObjectCreationNotificationXml notificationXml) {
 
-        databaseService.writeEventLog(notificationXml);
-
+        databaseService.writeEventLog(notificationXml.getEventlogEntity());
         webSocketService.sendViaWebsockets(nodeName, notificationXml);
 
     }
@@ -103,31 +94,22 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotificationXml notificationXml) {
 
-        databaseService.writeEventLog(notificationXml);
-
+        databaseService.writeEventLog(notificationXml.getEventlogEntity());
         webSocketService.sendViaWebsockets(nodeName, notificationXml);
     }
 
     @Override
     public void onProblemNotification(ProblemNotificationXml notificationXml) {
 
-        databaseService.writeFaultLog(notificationXml);
-        databaseService.updateFaultCurrent(notificationXml);
-
-        //ToggleAlarmFilter functionality
-        if(NotificationDelayFilter.isEnabled())
-        {
-            if(notificationXml.getSeverity() == InternalSeverity.NonAlarmed) {
-                delayFilter.clearAlarmNotification(notificationXml.getProblem(), notificationXml);
-            } else {
-                delayFilter.pushAlarmNotification(notificationXml.getProblem(), notificationXml);
-            }
-        }
-        else
-        {
-             this.pushAlarmIfNotInMaintenance(notificationXml);
+        databaseService.writeFaultLog(notificationXml.getFaultlog(SourceType.Netconf));
+        databaseService.updateFaultCurrent(notificationXml.getFaultcurrent());
+
+        // ToggleAlarmFilter functionality
+        if (delayFilter.processNotification(notificationXml.getSeverity() == InternalSeverity.NonAlarmed, notificationXml.getProblem(), notificationXml))
+         {
+            dcaeForwarder.sendProblemNotificationUsingMaintenanceFilter(this.nodeName, notificationXml);
+        // end of ToggleAlarmFilter
         }
-        //end of ToggleAlarmFilter
 
         this.webSocketService.sendViaWebsockets(nodeName, notificationXml);
 
@@ -137,31 +119,12 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
     public void onNotificationDelay(ProblemNotificationXml notificationXml) {
 
         LOG.debug("Got delayed event of type :: {}", ProblemNotificationXml.class.getSimpleName());
-        this.pushAlarmIfNotInMaintenance(notificationXml);
+        dcaeForwarder.sendProblemNotificationUsingMaintenanceFilter(this.nodeName, notificationXml);
 
     }
-    private void pushAlarmIfNotInMaintenance(ProblemNotificationXml notificationXml)
-    {
-         if(!this.maintenanceService.isONFObjectInMaintenance(nodeName, notificationXml.getObjectId(), notificationXml.getProblem()))
-         {
-             this.dcaeProvider.sendProblemNotification(nodeName, notificationXml);
-             if(this.aotsmClient!=null) {
-                this.aotsmClient.sendProblemNotification(nodeName, notificationXml);
-            }
-         }
-         else
-         {
-             LOG.debug("Notification will not be sent to external services. Device "+this.nodeName+" is in maintenance mode");
-         }
-    }
     private void initCurrentProblem(ProblemNotificationXml notificationXml) {
-        databaseService.updateFaultCurrent(notificationXml);
-        //to prevent push alarms on reconnect
-        //=> only pushed alarms are forwared to dcae
-        //dcaeProvider.sendProblemNotification(nodeName, notificationXml);
-        if(aotsmClient!=null) {
-            aotsmClient.sendProblemNotification(this.nodeName, notificationXml);
-        }
+        databaseService.updateFaultCurrent(notificationXml.getFaultcurrent());
+        dcaeForwarder.sendProblemNotification(this.nodeName, notificationXml);
     }
 
     /**
@@ -200,7 +163,12 @@ public class NetconfEventListener12 implements OnfMicrowaveModelNotification, No
      * @param equipment to write
      */
     public void writeEquipment(ONFCoreNetworkElement12Equipment equipment) {
-        databaseService.writeInventory(equipment);
+//        List<ExtendedEquipment> equipmentList = equipment.getEquipmentList();
+//        for (ExtendedEquipment card : equipmentList) {
+//            databaseService.writeInventory(card.getCreateInventoryInput());
+//        }
+        equipment.getEquipmentList().forEach(card -> databaseService.writeInventory(card.getCreateInventoryInput()) );
+
     }
 
  }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/ODLEventListener.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/ODLEventListenerHandler.java
index 4b87b5828..36ac7dca0 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/ODLEventListener.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/ODLEventListenerHandler.java
@@ -15,21 +15,25 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener;
-
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.ProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler;
+
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementBase;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectDeletionNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.ProblemNotification;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,18 +48,16 @@ import org.slf4j.LoggerFactory;
  * @author herbert
  */
 
-public class ODLEventListener {
+public class ODLEventListenerHandler {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListenerHandler.class);
 
     private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
 
     private final String ownKeyName;
-    private final WebSocketServiceClient webSocketService;
-    private final HtDatabaseEventsService databaseService;
-    private final ProviderClient dcaeProvider;
-    private final ProviderClient aotsMProvider;
-    private final MaintenanceService maintenanceService;
+    private final WebSocketServiceClientInternal webSocketService;
+    private final DataProvider databaseService;
+    private final DcaeForwarderInternal aotsDcaeForwarder;
 
     private int eventNumber;
 
@@ -69,24 +71,19 @@ public class ODLEventListener {
      * @param ownKeyName The name of this service, that is used in the database as identification key.
      * @param webSocketService service to direct messages to clients
      * @param databaseService service to write to the database
-     * @param dcaeProvider to deliver problems to
-     * @param maintenanceService2
+     * @param dcaeForwarder to deliver problems to external service
      */
-    @SuppressWarnings("javadoc")
-    public ODLEventListener(String ownKeyName, WebSocketServiceClient webSocketService,
-            HtDatabaseEventsService databaseService, ProviderClient dcaeProvider,
-            @Nullable ProviderClient aotsMProvider, MaintenanceService maintenanceService) {
+    public ODLEventListenerHandler(String ownKeyName, WebSocketServiceClientInternal webSocketService,
+            DataProvider databaseService, DcaeForwarderInternal dcaeForwarder) {
         super();
 
         this.ownKeyName = ownKeyName;
         this.webSocketService = webSocketService;
 
         this.databaseService = databaseService;
-        this.dcaeProvider = dcaeProvider;
-        this.aotsMProvider = aotsMProvider;
+        this.aotsDcaeForwarder = dcaeForwarder;
 
         this.eventNumber = 0;
-        this.maintenanceService = maintenanceService;
 
     }
 
@@ -96,21 +93,36 @@ public class ODLEventListener {
 
     /**
      * A registration of a mountpoint occured, that is in connect state
-     *
-     * @param registrationName Name of the event that is used as key in the database.
+     * @param registrationName of device (mountpoint name)
+     * @param nNode with mountpoint data
      */
-
-    public void registration(String registrationName) {
+    public void registration(String registrationName, NetconfNode nNode) {
 
         ObjectCreationNotificationXml cNotificationXml =
-                new ObjectCreationNotificationXml(ownKeyName, getEventNumberAsString(),
+                new ObjectCreationNotificationXml(ownKeyName, popEvntNumber(),
                         InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()), registrationName);
+        NetworkElementConnectionEntity e = ONFCoreNetworkElementBase.getNetworkConnection(registrationName, nNode);
+        LOG.debug("registration networkelement-connection for {} with status {}", registrationName, e.getStatus());
 
         // Write first to prevent missing entries
-        databaseService.writeEventLog(cNotificationXml);
+        databaseService.updateNetworkConnection22(e, registrationName);
+        databaseService.writeConnectionLog(cNotificationXml.getConnectionlogEntity());
         webSocketService.sendViaWebsockets(registrationName, cNotificationXml);
     }
 
+    /**
+     * After registration
+     * @param mountpointNodeName uuid that is nodeId or mountpointId
+     * @param deviceType according to assessement
+     */
+    public void connectIndication(String mountpointNodeName, NetworkElementDeviceType deviceType) {
+        // Write first to prevent missing entries
+        LOG.debug("updating networkelement-connection devicetype for {} with {}",mountpointNodeName, deviceType);
+        NetworkElementConnectionEntity e = ONFCoreNetworkElementBase.getNetworkConnectionDeviceTpe(deviceType);
+        databaseService.updateNetworkConnectionDeviceType(e, mountpointNodeName);
+
+    }
+
 
     /**
      * A deregistration of a mountpoint occured.
@@ -121,11 +133,12 @@ public class ODLEventListener {
     public void deRegistration(String registrationName) {
 
         ObjectDeletionNotificationXml dNotificationXml =
-                new ObjectDeletionNotificationXml(ownKeyName, getEventNumberAsString(),
+                new ObjectDeletionNotificationXml(ownKeyName, popEvntNumber(),
                         InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()), registrationName);
 
         // Write first to prevent missing entries
-        databaseService.writeEventLog(dNotificationXml);
+        databaseService.removeNetworkConnection(registrationName);
+        databaseService.writeConnectionLog(dNotificationXml.getConnectionlogEntity());
         webSocketService.sendViaWebsockets(registrationName, dNotificationXml);
 
     }
@@ -135,13 +148,16 @@ public class ODLEventListener {
      *
      * @param registrationName Name of the event that is used as key in the database.
      */
-    public void updateRegistration(String registrationName, String attribute, String attributeNewValue) {
+    public void updateRegistration(String registrationName, String attribute, String attributeNewValue, NetconfNode nNode) {
         AttributeValueChangedNotificationXml notificationXml = new AttributeValueChangedNotificationXml(ownKeyName,
-                getEventNumberAsString(), InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()),
+                popEvntNumber(), InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()),
                 registrationName, attribute, attributeNewValue);
-        databaseService.writeEventLog(notificationXml);
-        webSocketService.sendViaWebsockets(registrationName, notificationXml);
+        NetworkElementConnectionEntity e = ONFCoreNetworkElementBase.getNetworkConnection(registrationName, nNode);
+        LOG.debug("updating networkelement-connection for {} with status {}", registrationName, e.getStatus());
 
+        databaseService.updateNetworkConnection22(e, registrationName);
+        databaseService.writeConnectionLog(notificationXml.getConnectionlogEntity());
+        webSocketService.sendViaWebsockets(registrationName, notificationXml);
     }
 
     /**
@@ -153,36 +169,32 @@ public class ODLEventListener {
      */
 
     public void onProblemNotification(String registrationName, String problemName, InternalSeverity problemSeverity) {
-        LOG.debug("Got event of type :: {} or {} or {}", ProblemNotification.class.getSimpleName(),
-                org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ProblemNotification.class
-                        .getSimpleName(),
-                org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ProblemNotification.class
-                        .getSimpleName());
+        LOG.debug("Got event of {} {} {}", registrationName, problemName, problemSeverity);
         // notification
 
         ProblemNotificationXml notificationXml =
                 new ProblemNotificationXml(ownKeyName, registrationName, problemName, problemSeverity,
                         // popEvntNumberAsString(), InternalDateAndTime.TESTPATTERN );
-                        getEventNumberAsString(), InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()));
-
-        databaseService.writeFaultLog(notificationXml);
-        databaseService.updateFaultCurrent(notificationXml);
-
-        if (!maintenanceService.isONFObjectInMaintenance(registrationName, notificationXml.getObjectId(),
-                notificationXml.getProblem())) {
-            dcaeProvider.sendProblemNotification(ownKeyName, notificationXml);
-            if (aotsMProvider != null) {
-                aotsMProvider.sendProblemNotification(ownKeyName, notificationXml, false);// not a nealarm, its a
-            }
-        } // sdncontroller alarm
-        else {
-            LOG.debug("Notification will not be sent to external services. Device " + registrationName
-                    + " is in maintenance mode");
-        }
+                        popEvntNumber(), InternalDateAndTime.valueOf(NETCONFTIME_CONVERTER.getTimeStamp()));
+
+        databaseService.writeFaultLog(notificationXml.getFaultlog(SourceType.Controller));
+        databaseService.updateFaultCurrent(notificationXml.getFaultcurrent());
+
+        aotsDcaeForwarder.sendProblemNotificationUsingMaintenanceFilter(ownKeyName, notificationXml);
 
         webSocketService.sendViaWebsockets(registrationName, notificationXml);
     }
 
+    public void writeEventLog(String objectId, String msg, String value) {
+
+        LOG.debug("Got startComplete");
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(ownKeyName).setTimestamp(new DateAndTime(NETCONFTIME_CONVERTER.getTimeStamp()))
+        .setObjectId(objectId).setAttributeName(msg).setNewValue(value).setCounter(popEvntNumber())
+        .setSourceType(SourceType.Controller);
+        databaseService.writeEventLog(eventlogBuilder.build());
+
+    }
 
     /*---------------------------------------------
      * Handling of ODL Controller events
@@ -212,12 +224,8 @@ public class ODLEventListener {
     /*---------------------------------------------------------------
      * Private
      */
-
-    private String getEventNumberAsString() {
-        return String.valueOf(popEvntNumber());
-    }
-
-    private int popEvntNumber() {
+    private Integer popEvntNumber() {
         return eventNumber++;
     }
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java
new file mode 100644
index 000000000..ff559f859
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/handler/RpcPushNotificationsHandler.java
@@ -0,0 +1,90 @@
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler;
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeForwarderInternal;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.PushNotifications;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.AttributeValueChangedNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.WebSocketServiceClientInternal;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushAttributeChangeNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.PushFaultNotificationInput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RpcPushNotificationsHandler implements PushNotifications {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RpcPushNotificationsHandler.class);
+
+    private static String OWNKEYNAME = "VES";
+    private final WebSocketServiceClientInternal webSocketService;
+    private final DataProvider databaseService;
+    private final DcaeForwarderInternal aotsDcaeForwarder;
+
+    public RpcPushNotificationsHandler(WebSocketServiceClientInternal webSocketService, DataProvider databaseService,
+            DcaeForwarderInternal aotsDcaeForwarder) {
+        super();
+        this.webSocketService = webSocketService;
+        this.databaseService = databaseService;
+        this.aotsDcaeForwarder = aotsDcaeForwarder;
+    }
+
+    @Override
+    public void pushAttributeChangeNotification(PushAttributeChangeNotificationInput input) {
+
+        LOG.debug("Got attribute change event {}", input);
+
+        EventlogBuilder enventlogBuilder = new EventlogBuilder();
+        enventlogBuilder.setSourceType(SourceType.Ves);
+        enventlogBuilder.fieldsFrom(input);
+        EventlogEntity eventlogEntity = enventlogBuilder.build();
+        databaseService.writeEventLog(eventlogEntity);
+        webSocketService.sendViaWebsockets(OWNKEYNAME, new AttributeValueChangedNotificationXml(eventlogEntity));
+
+    }
+
+    @Override
+    public void pushFaultNotification(PushFaultNotificationInput input) {
+
+        LOG.debug("Got fault event {}", input);
+
+        FaultlogBuilder faultlogBuilder = new FaultlogBuilder();
+        faultlogBuilder.setSourceType(SourceType.Ves);
+        faultlogBuilder.fieldsFrom(input);
+        FaultlogEntity faultlogEntity = faultlogBuilder.build();
+        databaseService.writeFaultLog(faultlogEntity);
+
+        FaultcurrentBuilder faultcurrentBuilder = new FaultcurrentBuilder();
+        faultcurrentBuilder.fieldsFrom(input);
+        FaultcurrentEntity faultcurrentEntity = faultcurrentBuilder.build();
+        databaseService.updateFaultCurrent(faultcurrentEntity);
+
+        ProblemNotificationXml notificationXml = new ProblemNotificationXml(faultlogEntity);
+        aotsDcaeForwarder.sendProblemNotificationUsingMaintenanceFilter(OWNKEYNAME, notificationXml);
+        webSocketService.sendViaWebsockets(OWNKEYNAME, notificationXml);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfChangeListener.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfChangeListener.java
index 80aac1ac4..2334bd181 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfChangeListener.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/listener/NetconfChangeListener.java
@@ -18,18 +18,17 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener;
 
 import java.util.Collection;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerService.Action;
-import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.NetconfNodeService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.NetconfNodeService.Action;
+import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.ClusteredConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
@@ -37,7 +36,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
@@ -46,7 +44,6 @@ import org.slf4j.LoggerFactory;
 // 07.09.18 Switched to DataTreeChangeListener from ClusteredDataTreeChangeListener -> DM Service is
 // running at all nodes
 // This is not correct
-@SuppressWarnings("deprecation")
 public class NetconfChangeListener implements ClusteredDataTreeChangeListener<Node>, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(NetconfChangeListener.class);
@@ -56,19 +53,19 @@ public class NetconfChangeListener implements ClusteredDataTreeChangeListener<No
                     .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())))
                     .child(Node.class);
     // Name of ODL controller NETCONF instance
-    private static final String CONTROLLER = "controller-config";
+    private static final NodeId CONTROLLER = new NodeId("controller-config");
 
-    private final DeviceManagerService deviceManagerService;
+    private final NetconfNodeService deviceManagerService;
     private final DataBroker dataBroker;
     private ListenerRegistration<NetconfChangeListener> dlcReg;
 
-    public NetconfChangeListener(DeviceManagerService deviceManagerService, DataBroker dataBroker) {
+    public NetconfChangeListener(NetconfNodeService deviceManagerService, DataBroker dataBroker) {
         this.deviceManagerService = deviceManagerService;
         this.dataBroker = dataBroker;
     }
 
     public void register() {
-        DataTreeIdentifier<Node> treeId = new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, NETCONF_NODE_TOPO_IID);
+        DataTreeIdentifier<Node> treeId = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, NETCONF_NODE_TOPO_IID);
 
         dlcReg = dataBroker.registerDataTreeChangeListener(treeId, this);
     }
@@ -79,8 +76,8 @@ public class NetconfChangeListener implements ClusteredDataTreeChangeListener<No
             dlcReg.close();
         }
     }
-    /*---------------------------------------------------------------------------
-     * Listener
+    /**
+     * Listener function to select the right node from DataObjectModification
      */
     @Override
     public void onDataTreeChanged(Collection<DataTreeModification<Node>> changes) {
@@ -121,13 +118,11 @@ public class NetconfChangeListener implements ClusteredDataTreeChangeListener<No
     }
 
     /*
-     * ---------------------------------------------------------------- Functions to select the right
-     * node from DataObjectModification
+     * ----------------------------------------------------------------
      */
 
     /**
-     * Process event and forward to clients
-     *
+     * Process event and forward to clients if Node is a NetconfNode
      * @param action
      * @param node Basis node
      */
@@ -135,35 +130,26 @@ public class NetconfChangeListener implements ClusteredDataTreeChangeListener<No
 
         NodeId nodeId = null;
         NetconfNode nnode = null;
-        NodeKey nodeKey = null;
 
         try {
             if (node != null) {
-                if ((nodeKey = node.key()) != null) {
-                    nodeId = nodeKey.getNodeId();
-                }
+                nodeId = node.key().getNodeId(); //Never null
                 nnode = node.augmentation(NetconfNode.class);
             }
 
-            if (node == null || nnode == null || nodeId == null || nodeKey == null) {
-            	LOG.warn("Unexpected node {}, netconf node {} or key {} or id {}", node, nnode, nodeKey, nodeId);
+            if (node == null || nnode == null) {
+                LOG.warn("Unexpected node {}, netconf node {} id {}", node, nnode, nodeId);
             } else {
-            	String nodeIdString = nodeId.getValue();
-            	// Do not forward any controller related events to devicemanager
-            	if (nodeIdString.equals(CONTROLLER)) {
-            		LOG.debug("Stop processing for [{}]", nodeIdString);
-            	} else {
-
-            		ClusteredConnectionStatus ccsts = nnode.getClusteredConnectionStatus();
-        			ConnectionStatus csts = nnode.getConnectionStatus();
-          			LOG.debug("NETCONF Node processing with id {} action {} status {} cluster status {}", nodeIdString,
-            					action, csts, ccsts);
-          			// Action forwarded to devicehandler
-           			deviceManagerService.netconfChangeHandler(action, csts, nodeId, nnode);
-            	}
+                // Do not forward any controller related events to devicemanager
+                if (nodeId.equals(CONTROLLER)) {
+                    LOG.debug("Stop processing for [{}]", nodeId);
+                } else {
+                      // Action forwarded to devicehandler
+                       deviceManagerService.netconfNodeChangeHandler(action, nodeId, nnode);
+                }
             }
         } catch (NullPointerException e) {
-        	LOG.warn("Unexpected null .. stop processing.", e);
+            LOG.warn("Unexpected null .. stop processing.", e);
         }
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/GenericTransactionUtils.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/GenericTransactionUtils.java
index 1cfe10f08..ed4278923 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/util/GenericTransactionUtils.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/GenericTransactionUtils.java
@@ -15,29 +15,30 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util;
 
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.FluentFuture;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
 
-@SuppressWarnings("deprecation")
-public final class GenericTransactionUtils {
+public final class GenericTransactionUtils implements TransactionUtils {
     static final Logger LOG = LoggerFactory.getLogger(GenericTransactionUtils.class);
 
     /**
@@ -49,14 +50,15 @@ public final class GenericTransactionUtils {
      * @param iid id to access data
      * @return null or object
      */
+    @Override
     @Nullable
-    public static <T extends DataObject> T readData(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
+    public <T extends DataObject> T readData(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
             InstanceIdentifier<T> iid) {
 
         AtomicBoolean noErrorIndication = new AtomicBoolean();
         AtomicReference<String> statusText = new AtomicReference<>();
 
-        T obj = readDataOptionalWithStatus(dataBroker, dataStoreType, iid, noErrorIndication, statusText);
+        @Nullable T obj = readDataOptionalWithStatus(dataBroker, dataStoreType, iid, noErrorIndication, statusText);
 
         if (!noErrorIndication.get()) {
             LOG.warn("Read transaction for identifier " + iid + " failed with status " + statusText.get());
@@ -76,12 +78,13 @@ public final class GenericTransactionUtils {
      * @param statusIndicator (Output) String with status indications during the read.
      * @return null or object
      */
-    @Nullable
-    public static <T extends DataObject> T readDataOptionalWithStatus(DataBroker dataBroker,
+    @Override
+    @SuppressWarnings("null")
+    public @Nullable <T extends DataObject> T readDataOptionalWithStatus(DataBroker dataBroker,
             LogicalDatastoreType dataStoreType, InstanceIdentifier<T> iid, AtomicBoolean noErrorIndication,
             AtomicReference<String> statusIndicator) {
 
-        T data = null;
+        @Nullable T data = null;
         noErrorIndication.set(false);
 
         statusIndicator.set("Preconditions");
@@ -105,18 +108,17 @@ public final class GenericTransactionUtils {
             LOG.debug("Sending message with retry {} ", retry);
             statusIndicator.set("Create Read Transaction");
 
-            try (ReadOnlyTransaction readTransaction = dataBroker.newReadOnlyTransaction();) {
-                CheckedFuture<Optional<T>, ReadFailedException> od = readTransaction.read(dataStoreType, iid);
+            try (ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction();) {
+                @NonNull FluentFuture<Optional<T>> od = readTransaction.read(dataStoreType, iid);
                 statusIndicator.set("Read done");
                 if (od != null) {
                     statusIndicator.set("Unwrap checkFuture done");
                     Optional<T> optionalData = od.get();
                     if (optionalData != null) {
                         statusIndicator.set("Unwrap optional done");
-                        data = optionalData.orNull();
+                        data = optionalData.orElse(null);
                         statusIndicator.set("Read transaction done");
                         noErrorIndication.set(true);
-                        LOG.debug("Read done with no error. Data:[{}]", data);
                     }
                 }
 
@@ -134,4 +136,5 @@ public final class GenericTransactionUtils {
     }
 
 
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InternalDateAndTime.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java
index cc47362c0..91fed715d 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InternalDateAndTime.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java
@@ -18,9 +18,9 @@
 /**
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.DateAndTime;
 
 /**
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InternalSeverity.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalSeverity.java
index fcdb5e8ef..54b91ad9a 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/internalTypes/InternalSeverity.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalSeverity.java
@@ -19,9 +19,11 @@
  * @author herbert
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util;
 
-import javax.annotation.Nullable;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType;
 
 public enum InternalSeverity {
 
@@ -44,10 +46,8 @@ public enum InternalSeverity {
         return this.name();
     }
 
-    public String toNetconfString()
-    {
-        switch(this)
-        {
+    public String toNetconfString() {
+        switch (this) {
         case NonAlarmed:
             return "non-alarmed";
         case Warning:
@@ -62,6 +62,22 @@ public enum InternalSeverity {
         return "not-specified";
     }
 
+    public SeverityType toDataProviderSeverityType() {
+        switch (this) {
+        case NonAlarmed:
+            return SeverityType.NonAlarmed;
+        case Warning:
+            return SeverityType.Warning;
+        case Minor:
+            return SeverityType.Minor;
+        case Major:
+            return SeverityType.Major;
+        case Critical:
+            return SeverityType.Critical;
+        }
+        return null; //Should never happen
+    }
+
     /**
      * convert ONF 1.2 Severity
      * @param severity as input
@@ -125,27 +141,51 @@ public enum InternalSeverity {
         return null;
     }
 
+
+
     /**
      * convert a text string into Severity
-     * @param severityString with textes non[-]alarmed, warning minor major critical
-     * @return related enum or null
+     * @param severityString with textes: warning minor major critical  non[-]alarmed. (Capital or lowercase)
+     * @return related enum. Unknown oe illegal are converted to NonAlarm
      */
     public static @Nullable InternalSeverity valueOfString(String severityString) {
 
-    	switch( severityString.toLowerCase().trim() ) {
-    	case "non-alarmed":
-    	case "nonalarmed":
-    		return InternalSeverity.NonAlarmed;
-    	case "warning":
-    		return InternalSeverity.Warning;
-    	case "minor":
-    		return InternalSeverity.Minor;
-    	case "major":
-    		return InternalSeverity.Major;
-    	case "critical":
-    		return InternalSeverity.Critical;
-    	}
-    	return null;
+        switch( severityString.toLowerCase().trim() ) {
+        case "warning":
+            return InternalSeverity.Warning;
+        case "minor":
+            return InternalSeverity.Minor;
+        case "major":
+            return InternalSeverity.Major;
+        case "critical":
+            return InternalSeverity.Critical;
+        }
+        return InternalSeverity.NonAlarmed;
 
     }
+
+    /**
+     * Convert to InternalSeverity
+     * @param severity to be converted
+     * @return InternalSeverity, null converted to NonAlarmed
+     */
+    public static InternalSeverity valueOf(@org.eclipse.jdt.annotation.Nullable SeverityType severity) {
+        if (severity != null) {
+            switch (severity) {
+            case NonAlarmed:
+                return InternalSeverity.NonAlarmed;
+            case Warning:
+                return InternalSeverity.Warning;
+            case Minor:
+                return InternalSeverity.Minor;
+            case Major:
+                return InternalSeverity.Major;
+            case Critical:
+                return InternalSeverity.Critical;
+            }
+        }
+        return InternalSeverity.NonAlarmed;
+    }
+
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/AttributeValueChangedNotificationXml.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/AttributeValueChangedNotificationXml.java
index 8ec5903d1..471060c2d 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/AttributeValueChangedNotificationXml.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/AttributeValueChangedNotificationXml.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -19,7 +19,11 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 
 @XmlRootElement(name = "AttributeValueChangedNotification")
 public class AttributeValueChangedNotificationXml extends MwtNotificationBase implements GetEventType {
@@ -45,13 +49,20 @@ public class AttributeValueChangedNotificationXml extends MwtNotificationBase im
      * @param attributeName from ne
      * @param newValue from ne
      */
-    public AttributeValueChangedNotificationXml(String nodeName, String counter, InternalDateAndTime timeStamp, String objectIdRef,
+    public AttributeValueChangedNotificationXml(String nodeName, Integer counter, InternalDateAndTime timeStamp, String objectIdRef,
             String attributeName, String newValue) {
         super(nodeName, counter, timeStamp, objectIdRef);
         this.attributeName = attributeName;
         this.newValue = newValue;
     }
 
+    public AttributeValueChangedNotificationXml(EventlogEntity eventlogEntitiy) {
+        this(eventlogEntitiy.getNodeId(), eventlogEntitiy.getCounter(),
+                InternalDateAndTime.valueOf(eventlogEntitiy.getTimestamp()), eventlogEntitiy.getObjectId(),
+                eventlogEntitiy.getAttributeName(), eventlogEntitiy.getNewValue());
+    }
+
+
     public String getAttributeName() {
         return attributeName;
     }
@@ -65,4 +76,11 @@ public class AttributeValueChangedNotificationXml extends MwtNotificationBase im
         return EVENTTYPE;
     }
 
+    public EventlogEntity getEventlogEntity() {
+        return new EventlogBuilder().setAttributeName(attributeName).setNewValue(newValue)
+                .setCounter(Integer.valueOf(this.getCounter()))
+                .setNodeId(this.getNodeName()).setObjectId(this.getObjectId())
+                .setTimestamp(new DateAndTime(this.getTimeStamp())).setSourceType(SourceType.Netconf).build();
+    }
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
index 149640641..156f9226e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -18,8 +18,14 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nonnull;
 import javax.xml.bind.annotation.XmlElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogEntity;
 
 public class MwtNotificationBase {
 
@@ -28,15 +34,15 @@ public class MwtNotificationBase {
     private String nodeName;
     private String counter;
     private String timeStamp;
-    private String objectId;
+    private @Nonnull String objectId;
 
     public MwtNotificationBase() {
         // For Jaxb
     }
 
-    public MwtNotificationBase(String nodeName, String counter, InternalDateAndTime timeStamp, String objectId) {
+    public MwtNotificationBase(String nodeName, Integer counter, InternalDateAndTime timeStamp, String objectId) {
         this.nodeName = nodeName;
-        this.counter = counter;
+        this.counter = String.valueOf(counter);
         this.timeStamp = timeStamp.getValue();
         this.objectId = objectId;
         if (this.objectId == null) {
@@ -65,6 +71,46 @@ public class MwtNotificationBase {
     }
 
     /**
+     * Provide ConnectionlogEntity type
+     * @return ConnectionlogEntity
+     */
+    public ConnectionlogEntity getConnectionlogEntity() {
+        return new ConnectionlogBuilder()
+                .setNodeId(objectId)
+                .setStatus(getStatus())
+                .setTimestamp(new DateAndTime(timeStamp))
+                .build();
+    }
+
+    /**
+     * Provide connection status for mountpoint log.
+     * TODO Add status disconnected if mountpoint is required, but does not exists.
+     * @return
+     */
+    private ConnectionLogStatus getStatus() {
+
+        if (this instanceof ObjectCreationNotificationXml) {
+            return ConnectionLogStatus.Mounted;
+
+        } else if (this instanceof ObjectDeletionNotificationXml) {
+            return ConnectionLogStatus.Unmounted;
+
+        } else if (this instanceof AttributeValueChangedNotificationXml) {
+            String pnx = ((AttributeValueChangedNotificationXml)this).getNewValue();
+            if (pnx.equals(ConnectionStatus.Connected.getName())) {
+                return ConnectionLogStatus.Connected;
+
+            } else if (pnx.equals(ConnectionStatus.Connecting.getName())) {
+                return ConnectionLogStatus.Connecting;
+
+            } else if (pnx.equals(ConnectionStatus.UnableToConnect.getName())) {
+                return ConnectionLogStatus.UnableToConnect;
+            }
+        }
+        return ConnectionLogStatus.Undefined;
+    }
+
+    /**
      * Type for the Database to document the the same name that is used in the websockets.
      * @return String with type name of child class
      */
@@ -80,4 +126,5 @@ public class MwtNotificationBase {
     }
 
 
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectCreationNotificationXml.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectCreationNotificationXml.java
index b404073b7..a64919fa4 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectCreationNotificationXml.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectCreationNotificationXml.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -18,12 +18,17 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Eventlog;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 
 @XmlRootElement(name = "ObjectCreationNotification")
 public class ObjectCreationNotificationXml extends MwtNotificationBase implements GetEventType {
 
     private static String EVENTTYPE =  "ObjectCreationNotification";
+    private static String ACTION = "creation";
 
     public ObjectCreationNotificationXml() {
 
@@ -36,7 +41,7 @@ public class ObjectCreationNotificationXml extends MwtNotificationBase implement
      * @param timeStamp from ne
      * @param objectIdRef from ne
      */
-    public ObjectCreationNotificationXml(String nodeName, String counter, InternalDateAndTime timeStamp, String objectIdRef) {
+    public ObjectCreationNotificationXml(String nodeName, Integer counter, InternalDateAndTime timeStamp, String objectIdRef) {
         super(nodeName, counter, timeStamp,  objectIdRef);
     }
 
@@ -55,4 +60,11 @@ public class ObjectCreationNotificationXml extends MwtNotificationBase implement
         return EVENTTYPE;
     }
 
+    public Eventlog getEventlogEntity() {
+        return new EventlogBuilder().setAttributeName(ACTION).setNewValue(ACTION)
+                .setCounter(Integer.valueOf(this.getCounter()))
+                .setNodeId(this.getNodeName()).setObjectId(this.getObjectId())
+                .setTimestamp(new DateAndTime(this.getTimeStamp())).setSourceType(SourceType.Netconf).build();
+    }
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectDeletionNotificationXml.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectDeletionNotificationXml.java
index c61a94ac4..2b50411fe 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectDeletionNotificationXml.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ObjectDeletionNotificationXml.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -18,12 +18,17 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Eventlog;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 
 @XmlRootElement(name = "ObjectDeletionNotification")
 public class ObjectDeletionNotificationXml extends MwtNotificationBase implements GetEventType {
 
     private static String EVENTTYPE =  "ObjectDeletionNotification";
+    private static String ACTION = "deletion";
 
     public ObjectDeletionNotificationXml() {
 
@@ -36,7 +41,7 @@ public class ObjectDeletionNotificationXml extends MwtNotificationBase implement
      * @param timeStamp from ne
      * @param objectIdRef from ne
      */
-    public ObjectDeletionNotificationXml(String nodeName, String counter, InternalDateAndTime timeStamp, String objectIdRef) {
+    public ObjectDeletionNotificationXml(String nodeName, Integer counter, InternalDateAndTime timeStamp, String objectIdRef) {
         super(nodeName, counter, timeStamp,  objectIdRef);
     }
 
@@ -58,4 +63,11 @@ public class ObjectDeletionNotificationXml extends MwtNotificationBase implement
         return EVENTTYPE;
     }
 
+    public Eventlog getEventlogEntity() {
+        return new EventlogBuilder().setAttributeName(ACTION).setNewValue(ACTION)
+                .setCounter(Integer.valueOf(this.getCounter()))
+                .setNodeId(this.getNodeName()).setObjectId(this.getObjectId())
+                .setTimestamp(new DateAndTime(this.getTimeStamp())).setSourceType(SourceType.Netconf).build();
+    }
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ProblemNotificationXml.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ProblemNotificationXml.java
index 26757170b..dcb299a8e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ProblemNotificationXml.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/ProblemNotificationXml.java
@@ -18,26 +18,25 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.FaultEntityManager;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Faultcurrent;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Faultlog;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 import org.slf4j.Logger;
 
 @XmlRootElement(name = "ProblemNotification")
 public class ProblemNotificationXml extends MwtNotificationBase implements GetEventType {
 
     private static String EVENTTYPE = "ProblemNotification";
-    private static final Pattern pattern = Pattern.compile(".*\\[layerProtocol=(.*)\\]");
-    /**
-     * The leading indication for notification or events that are not in the
-     * currentProblem data of the ONF Coremodel
-     */
-    private static final String NOCURRENTPROBLEMINDICATION = "#";
 
     @XmlElement(name = "problem")
     private String problem;
@@ -57,16 +56,21 @@ public class ProblemNotificationXml extends MwtNotificationBase implements GetEv
      * @param uuId                    Name of Interface Pac
      * @param problemNameString       Name of the problem
      * @param problemSeverityString   Severitycode of the problem
-     * @param counterString           Counter from device
+     * @param counter                 Counter from device
      * @param internaltimeStampString Timestamp according to internal format.
      */
     public ProblemNotificationXml(String nodeName, String uuId, String problemNameString,
-            InternalSeverity problemSeverityString, String counterString, InternalDateAndTime internaltimeStampString) {
-        super(nodeName, counterString, internaltimeStampString, uuId);
+            InternalSeverity problemSeverityString, Integer counter, InternalDateAndTime internaltimeStampString) {
+        super(nodeName, counter, internaltimeStampString, uuId);
         this.problem = problemNameString;
         this.severity = problemSeverityString;
     }
 
+    public ProblemNotificationXml(FaultlogEntity input) {
+        this(input.getNodeId(), input.getObjectId(), input.getProblem(), InternalSeverity.valueOf(input.getSeverity()),
+                input.getCounter(), InternalDateAndTime.valueOf(input.getTimestamp()));
+    }
+
     public String getProblem() {
         return problem;
     }
@@ -76,35 +80,37 @@ public class ProblemNotificationXml extends MwtNotificationBase implements GetEv
     }
 
     public boolean isNotManagedAsCurrentProblem() {
-        return problem.startsWith(NOCURRENTPROBLEMINDICATION);
+        return ! FaultEntityManager.isManagedAsCurrentProblem(getProblem());
+    }
+
+    public boolean isNoAlarmIndication() {
+        return severity.isNoAlarmIndication();
     }
 
     /**
      * Create a specific ES id for the current log.
-     *
      * @return a string with the generated ES Id
      */
     @JsonIgnore
     public String genSpecificEsId() {
+        return FaultEntityManager.genSpecificEsId(getNodeName(), getObjectId(), getProblem());
+    }
 
-        String uuId;
-
-        Matcher matcher = pattern.matcher(getObjectId());
-        if (matcher.matches() && matcher.groupCount() == 1) {
-            uuId = matcher.group(1);
-        } else {
-            uuId = getObjectId();
-        }
-
-        StringBuffer strBuf = new StringBuffer();
-        strBuf.append(getNodeName());
-        strBuf.append("/");
-        strBuf.append(uuId);
-        strBuf.append("/");
-        strBuf.append(getProblem());
-        return strBuf.toString();
+    @JsonIgnore
+    public Faultlog getFaultlog(SourceType sourceType) {
+        return new FaultlogBuilder().setNodeId(getNodeName()).setCounter(Integer.parseInt(getCounter()))
+                .setObjectId(getObjectId()).setProblem(getProblem()).setSourceType(sourceType)
+                .setSeverity(getSeverity().toDataProviderSeverityType()).setTimestamp(new DateAndTime(getTimeStamp()))
+                .build();
     }
 
+    @JsonIgnore
+    public Faultcurrent getFaultcurrent() {
+        return new FaultcurrentBuilder().setNodeId(getNodeName()).setCounter(Integer.parseInt(getCounter()))
+                .setObjectId(genSpecificEsId()).setProblem(getProblem())
+                .setSeverity(getSeverity().toDataProviderSeverityType()).setTimestamp(new DateAndTime(getTimeStamp()))
+                .build();
+    }
 
     @Override
     public String toString() {
@@ -119,9 +125,10 @@ public class ProblemNotificationXml extends MwtNotificationBase implements GetEv
 
     /**
      * LOG the newly added problems of the interface pac
-     * @param idxStart
-     * @param uuid
-     * @param resultList
+     * @param log of logger
+     * @param uuid as log info
+     * @param resultList with all problems
+     * @param idxStart start of listing till end
      */
     public static void debugResultList(Logger log, String uuid, List<ProblemNotificationXml> resultList, int idxStart) {
         if (log.isDebugEnabled()) {
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientDummyImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientDummyImpl.java
index 90f46ae96..b4dd874b9 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientDummyImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientDummyImpl.java
@@ -17,16 +17,16 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * WrapperMock class for web-socket notifications to the web-socket service.
  */
-public class WebSocketServiceClientDummyImpl implements WebSocketServiceClient {
+public class WebSocketServiceClientDummyImpl implements WebSocketServiceClientInternal {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListenerHandler.class);
 
     public WebSocketServiceClientDummyImpl() {
     }
@@ -35,4 +35,8 @@ public class WebSocketServiceClientDummyImpl implements WebSocketServiceClient {
     public <T extends MwtNotificationBase & GetEventType> void sendViaWebsockets(String nodeName, T notificationXml) {
         LOG.info("Dummy to send websocket event {} for mountpoint {}", notificationXml.getClass().getSimpleName(), nodeName);
     }
+
+    @Override
+    public void close() throws Exception {
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl.java
index af1a32de3..b3c177efa 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -17,16 +17,16 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * WrapperMock class for web-socket notifications to the web-socket service.
  */
-public class WebSocketServiceClientImpl implements WebSocketServiceClient {
+public class WebSocketServiceClientImpl implements WebSocketServiceClientInternal {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListenerHandler.class);
 
     public WebSocketServiceClientImpl() {
     }
@@ -35,4 +35,8 @@ public class WebSocketServiceClientImpl implements WebSocketServiceClient {
     public <T extends MwtNotificationBase & GetEventType> void sendViaWebsockets(String nodeName, T notificationXml) {
         LOG.info("Dummy to send websocket event {} for mountpoint {}", notificationXml.getClass().getSimpleName(), nodeName);
     }
+
+    @Override
+    public void close() throws Exception {
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl2.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl2.java
index c8f769677..ba2a5b18b 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl2.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientImpl2.java
@@ -18,7 +18,7 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import java.util.concurrent.Future;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.listener.ODLEventListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.handler.ODLEventListenerHandler;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventOutput;
@@ -32,24 +32,34 @@ import org.slf4j.LoggerFactory;
  * bundle.
  */
 @SuppressWarnings("deprecation")
-public class WebSocketServiceClientImpl2 implements WebSocketServiceClient {
+public class WebSocketServiceClientImpl2 implements WebSocketServiceClientInternal {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ODLEventListenerHandler.class);
 
     private final WebsocketmanagerService websocketmanagerService;
     private final XmlMapper xmlMapper;
 
     /**
      * Implementation of Websocket notification processor.
-     *
      * @param rpcProviderRegistry to get MDSAL services.
      */
+    @Deprecated
     public WebSocketServiceClientImpl2(RpcProviderRegistry rpcProviderRegistry) {
         super();
         this.websocketmanagerService = rpcProviderRegistry.getRpcService(WebsocketmanagerService.class);
         this.xmlMapper = new XmlMapper();
     }
 
+    /**
+     * New: Implementation of Websocket notification processor.
+     * @param websocketmanagerService2 to be used
+     */
+    public WebSocketServiceClientImpl2(WebsocketmanagerService websocketmanagerService2) {
+        super();
+        this.websocketmanagerService = websocketmanagerService2;
+        this.xmlMapper = new XmlMapper();
+    }
+
     @Override
     public <T extends MwtNotificationBase & GetEventType> void sendViaWebsockets(String nodeName, T notificationXml) {
         LOG.info("Send websocket event {} for mountpoint {}", notificationXml.getClass().getSimpleName(), nodeName);
@@ -66,4 +76,8 @@ public class WebSocketServiceClientImpl2 implements WebSocketServiceClient {
                     nodeName, e.toString());
         }
     }
+
+    @Override
+    public void close() throws Exception {
+    }
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/IsEsObject.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientInternal.java
index 7e9db591d..9b3e674eb 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/database/IsEsObject.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/WebSocketServiceClientInternal.java
@@ -6,32 +6,28 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database;
-
 /**
- * Element is a document in the ES database.
+ *
  */
-public interface IsEsObject {
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.WebSocketServiceClient;
 
-    /**
-     * Set the ES Id
-     * @param id Set the ID, created by ES for this Object
-     */
-    void setEsId( String id );
+/**
+ * Wrapper for forwarding websocket notifications to the websocket service, that is running as container.
+ * @author herbert
+ */
+public interface WebSocketServiceClientInternal extends WebSocketServiceClient, AutoCloseable {
 
-    /**
-     * Get Id content as string that is used in ES
-     * @return Related ID, that was specified by set command.
-     */
-    String getEsId();
+    public <T extends MwtNotificationBase & GetEventType> void sendViaWebsockets(String nodeName, T notificationXml);
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/database/types/EsEventOdluxLog.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/database/types/EsEventOdluxLog.java
deleted file mode 100644
index 14f7d2447..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/database/types/EsEventOdluxLog.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.index.database.types;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-
-/**
- * Event log, used by Odlux client.
- * Not used for writing any data by devicemanager.
- * Type introduced to implement IndexCleanService
- */
-
-public class EsEventOdluxLog extends EsObject {
-
-    public static final String ESDATATYPENAME = "log";
-
-    private static final String LOG_FIELD_TIMESTAMP = "timestamp";
-
-    private String type;
-    private String component;
-    private String message;
-    private String timestamp;
-
-    /**
-     * For jackson
-     */
-    protected EsEventOdluxLog() {
-    }
-    /**
-     * Constructor
-     * @param type string
-     * @param component string
-     * @param message string
-     * @param timestamp string with netconf format string
-     */
-    public EsEventOdluxLog(String type, String component, String message, InternalDateAndTime timestamp) {
-        super();
-        this.type = type;
-        this.component = component;
-        this.message = message;
-        this.timestamp = timestamp.getValue();
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("component")
-    public String getComponent() {
-        return component;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty(LOG_FIELD_TIMESTAMP)
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Query to get older Elements
-     * @param netconfTimeStamp to identify older Elements
-     * @return QueryBuilder for older elements related to timestamp
-     */
-    public static QueryBuilder getQueryForTimeStamp(String netconfTimeStamp) {
-      return new RangeQueryBuilder(LOG_FIELD_TIMESTAMP).lt(netconfTimeStamp);
-    }
-
- }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexMwtnService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexMwtnService.java
deleted file mode 100644
index 4f3469759..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexMwtnService.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl;
-
-import java.util.Date;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice.ArchiveCleanProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDataBaseReaderAndWriter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseClientAbstract;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.IndexClientBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.database.types.EsEventOdluxLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Setup index mwtn in the database
- * @author herbert
- *
- */
-public class IndexMwtnService implements AutoCloseable, ArchiveCleanProvider {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IndexMwtnService.class);
-    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
-
-    /** Index name to be used */
-    public static final String INDEX = "mwtn";
-    /** Location of mapping data **/
-    private static final String MAPPING = "elasticsearch/index/mwtn/mwtnMapping.json";
-    /** Location of configuration data **/
-
-    private final HtDataBaseReaderAndWriter<EsEventOdluxLog> eventRWOdluxLog;
-
-
-    private final HtDatabaseClientAbstract client;
-
-    // --- Construct and initialize
-
-    public IndexMwtnService(HtDatabaseNode database) throws Exception {
-        LOG.info("Create {} start", this.getClass().getSimpleName());
-
-
-        IndexClientBuilder clientBuilder = IndexClientBuilder.getBuilder(INDEX)
-                .setMappingSettingJsonFileName(MAPPING);
-        client = clientBuilder.create(database);
-        clientBuilder.close();
-
-        eventRWOdluxLog = new HtDataBaseReaderAndWriter<>(client, EsEventOdluxLog.ESDATATYPENAME, EsEventOdluxLog.class);
-
-        LOG.info("Create {} finished. DB Service sucessfully started.", this.getClass().getSimpleName());
-    }
-
-    /**
-     * Get client to be used in other services
-     * @return client
-     */
-    public HtDatabaseClientAbstract getClient() {
-        return client;
-    }
-
-    /**
-     * Write into Odlux log, used by client
-     * @param logEntry as test data
-     */
-    public void writeOdluxEventForTestpurpose(EsEventOdluxLog logEntry) {
-        eventRWOdluxLog.doWrite(logEntry);
-    }
-
-
-    @Override
-    public void close() throws Exception {
-        if (client != null) {
-            client.close();
-        }
-    }
-
-    @Override
-    public int doIndexClean(Date olderAreOutdated) {
-
-        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
-
-        QueryBuilder queryOdluxLog = EsEventOdluxLog.getQueryForTimeStamp(netconfTimeStamp);
-        int removed = eventRWOdluxLog.doRemoveByQuery(queryOdluxLog);
-        return removed;
-
-    }
-
-    @Override
-    public int getNumberOfOldObjects(Date olderAreOutdated) {
-
-        String netconfTimeStamp = NETCONFTIME_CONVERTER.getTimeStampAsNetconfString(olderAreOutdated);
-        int numberOfElements = 0;
-
-        QueryBuilder queryOdluxLog = EsEventOdluxLog.getQueryForTimeStamp(netconfTimeStamp);
-        numberOfElements += eventRWOdluxLog.doReadAll(queryOdluxLog).size();
-
-        return numberOfElements;
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexUpdateService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexUpdateService.java
deleted file mode 100644
index 4af48922e..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/index/impl/IndexUpdateService.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseUpdateFile;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseWebAPIClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseUpdateFile.EsUpdateObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseUpdateFile.FileReadCallback;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IndexUpdateService implements AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IndexUpdateService.class);
-
-    private static final String FILENAME = "etc/elasticsearch_update.zip";
-
-    private final HtDatabaseWebAPIClient webClient;
-
-    private final boolean autoremove=true;
-
-    @SuppressWarnings("unused")
-    private ScheduledFuture<?> taskHandle;
-    private final ScheduledExecutorService scheduler;
-    @SuppressWarnings("unused")
-    private final HtDatabaseNode database;
-
-    private final FileReadCallback onReadUpdateFile = new FileReadCallback()
-    {
-        @Override
-        public void read(EsUpdateObject obj,String filename) {
-            try {
-                IndexUpdateService.this.webClient.sendRequest(obj.Uri, obj.Method, obj.Body);
-                LOG.info("run database update file {}", filename);
-            } catch (IOException e) {
-                LOG.warn("problem for request {}", obj.Uri);
-            }
-        }
-
-        @Override
-        public void onerror(String filename,IOException e) {
-            LOG.warn("problem reading content file {} : {}", filename, e.getMessage());
-        }
-
-    };
-    private final Runnable checkForUpdateTask = () -> {
-        File f=new File(FILENAME);
-        if(f.exists())
-        {
-            LOG.debug("found update file {}", f.getAbsolutePath());
-            try {
-                HtDatabaseUpdateFile updateFile=new HtDatabaseUpdateFile(FILENAME);
-                if(updateFile.readFiles(onReadUpdateFile))
-                {
-                    LOG.info("update successful");
-                }
-                updateFile.close();
-                if(IndexUpdateService.this.autoremove)
-                {
-                    boolean res = f.delete();
-                    LOG.debug("autodelete updatefile done {}", res);
-                }
-
-            } catch (IOException e) {
-                LOG.warn("problem with update file: {}", e.getMessage());
-            }
-        }
-    };
-
-
-
-    public IndexUpdateService(HtDatabaseNode database, String esNodeserverName, String esClusterName, String esNodeName) {
-        this.database = database;
-        this.webClient = new HtDatabaseWebAPIClient();
-        this.scheduler = Executors.newSingleThreadScheduledExecutor();
-    }
-    public void start()
-    {
-        this.taskHandle = this.scheduler.scheduleAtFixedRate(checkForUpdateTask, 0, 30, TimeUnit.SECONDS);
-    }
-    public void stop()
-    {
-        this.scheduler.shutdown();
-    }
-    @Override
-    public void close() throws Exception {
-        stop();
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/MaintenanceService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/MaintenanceService.java
index e9aec4146..dabcfd052 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/MaintenanceService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/MaintenanceService.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilter.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilter.java
deleted file mode 100644
index 46b434217..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilter.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types;
-
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.Collections;
-import java.util.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.Filter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.filter.Definition;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * One filter element to describe a maintenance status for an object referenced by definition.
- * TODO: Merge Filter and ES driven implementation
- */
-public class EsMaintenanceFilter implements Filter {
-
-    private static final Logger LOG = LoggerFactory.getLogger(EsMaintenanceFilter.class);
-
-    private static ZoneId EsMaintenanceFilterTimeZone = ZoneId.of("UTC");
-    //private static DateTimeFormatter FORMAT = DateTimeFormatter.ISO_DATE_TIME;       // "1986-04-08T12:30:00"
-    private static DateTimeFormatter FORMAT = DateTimeFormatter.ISO_OFFSET_DATE_TIME;       // 2011-12-03T10:15:30+01:00
-    private static ZonedDateTime EMPTYDATETIME = ZonedDateTime.ofInstant(Instant.EPOCH, EsMaintenanceFilterTimeZone);
-    private static String EMPTY = "";
-
-    //yang tools
-    @JsonIgnore
-    private final Map<java.lang.Class<? extends Augmentation<Filter>>, Augmentation<Filter>> augmentation = Collections.emptyMap();
-
-    @JsonIgnore
-    private ZonedDateTime start = EMPTYDATETIME;
-    @JsonIgnore
-    private ZonedDateTime end = EMPTYDATETIME;
-
-    private EsMaintenanceFilterDefinition definition = new EsMaintenanceFilterDefinition();
-    private String description = EMPTY;
-
-    // For jackson
-    public EsMaintenanceFilter() {
-    }
-
-    public EsMaintenanceFilter(Filter filter) {
-        setStartAsString(filter.getStartDate());
-        setEndAsString(filter.getEndDate());
-        description = filter.getDescription();
-        definition = new EsMaintenanceFilterDefinition(filter.getDefinition());
-    }
-
-    /*------
-     * start
-     */
-    public ZonedDateTime getStart() {
-        return start;
-    }
-    @JsonGetter("start")
-    public String getStartAsString() {
-        return toString(start);
-    }
-    public void setStart(ZonedDateTime start) {
-        this.start = start;
-    }
-    @JsonSetter("start")
-    public void setStartAsString(String startAsString) {
-        this.start = valueOf(startAsString);
-    }
-
-    /*------
-     * end
-     */
-    public ZonedDateTime getEnd() {
-        return end;
-    }
-    @JsonGetter("end")
-    public String getEndAsString() {
-        return toString(end);
-    }
-    public void setEnd(ZonedDateTime end) {
-        this.end = end;
-    }
-    @JsonSetter("end")
-    public void setEndAsString(String endAsString) {
-        this.end = valueOf(endAsString);
-    }
-
-    /*-----------------
-     * other parameters
-     */
-
-    public EsMaintenanceFilterDefinition getDefinition2() {
-        return definition;
-    }
-    public void setDefinition(EsMaintenanceFilterDefinition definition) {
-        this.definition = definition;
-    }
-    @Override
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * Get the actual time in the Filter time zone.
-     * @return actual Time
-     */
-    public static ZonedDateTime getNow() {
-        return ZonedDateTime.now(EsMaintenanceFilterTimeZone);
-    }
-
-
-    /**
-     * Verify if the filter is active for an object
-     * @param now point of time to verify
-     * @return if the object is covered by filter and now within point of time
-     */
-    public boolean isInMaintenance(String objectIdRef, String problem, ZonedDateTime now) {
-        return definition.appliesToObjectReference(objectIdRef, problem) && isInPeriod(start, end, now);
-    }
-
-    @Override
-    public String toString() {
-        return "EsMaintenanceFilter [start=" + start + ", end=" + end + ", definition=" + definition + ", description="
-                + description + "]";
-    }
-
-    /*---------------------------------------------
-     * YANG tools related functions for interface
-     */
-
-    @Override
-    public Class<? extends DataContainer> getImplementedInterface() {
-        return Filter.class;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <E extends Augmentation<Filter>> E augmentation(Class<E> augmentationType) {
-        return (E) augmentation.get(augmentationType);
-    }
-
-    @Override
-    public Definition getDefinition() {
-        return definition;
-    }
-
-    @Override
-    public String getStartDate() {
-        return getStartAsString();
-    }
-
-    @Override
-    public String getEndDate() {
-        return getEndAsString();
-    }
-
-    /*---------------------------------------------
-     * private static helper functions to verify
-     */
-
-    /**
-     * Compare the if probe is within the range of start and end.
-     * @param start of range
-     * @param end of range
-     * @param probe time to verify
-     * @return boolean result true if (start <= probe <= end)
-     */
-    public static boolean isInPeriod(ZonedDateTime start, ZonedDateTime end, ZonedDateTime probe) {
-          return start.compareTo(end) < 0 && start.compareTo(probe) <= 0 && end.compareTo(probe) >= 0;
-        }
-
-    /**
-     * Convert to time value to String
-     * @param ldt ZonedDateTime format
-     * @return String output
-     */
-    public static String toString(ZonedDateTime ldt) {
-        if(ldt==null) {
-            return "";
-        }
-        return ldt.format(FORMAT);
-    }
-
-    /**
-     * Convert String to time value
-     * @param zoneTimeString with time
-     * @return ZonedDateTime string
-     */
-    public static ZonedDateTime valueOf(String zoneTimeString) {
-        if (zoneTimeString == null || zoneTimeString.isEmpty()) {
-            LOG.warn("Null or empty zoneTimeString");
-            return EMPTYDATETIME;
-        }
-        try {
-            return ZonedDateTime.parse(zoneTimeString, FORMAT);
-        } catch (DateTimeParseException e) {
-            LOG.warn("Can not parse zoneTimeString '{}'",zoneTimeString);
-            return EMPTYDATETIME;
-        }
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilterDefinition.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilterDefinition.java
deleted file mode 100644
index c548a98e2..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceFilterDefinition.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types;
-
-import java.util.Collections;
-import java.util.Map;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.filter.Definition;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class EsMaintenanceFilterDefinition implements Definition {
-
-    private static final Logger LOG = LoggerFactory.getLogger(EsMaintenanceFilterDefinition.class);
-    private static final String ALL = "";
-
-    //yang tools
-    @JsonIgnore
-    private final Map<java.lang.Class<? extends Augmentation<Definition>>, Augmentation<Definition>> augmentation = Collections.emptyMap();
-
-    private String objectIdRef = ALL;
-    private String problem = ALL;
-
-    public EsMaintenanceFilterDefinition() {
-    }
-
-    public EsMaintenanceFilterDefinition(Definition definition) {
-        objectIdRef = definition.getObjectIdRef();
-        problem = definition.getProblem();
-    }
-
-    @Override
-    @JsonProperty("object-id-ref")
-    public String getObjectIdRef() {
-        return objectIdRef;
-    }
-
-    @JsonProperty("object-id-ref")
-    public void setObjectIdRef(String objectIdRef) {
-        this.objectIdRef = objectIdRef == null ? ALL : objectIdRef;
-    }
-
-    @Override
-    @JsonProperty("problem")
-    public String getProblem() {
-        return problem;
-    }
-
-    @JsonProperty("problem")
-    public void setProblem(String pProblem) {
-        this.problem = pProblem == null ? ALL : pProblem;
-    }
-
-    public boolean appliesToObjectReference(String pObjectIdRef, String pProblem) {
-        boolean res = (pObjectIdRef.isEmpty() || pObjectIdRef.contains(pObjectIdRef)) && (pProblem.isEmpty() || pProblem.contains(pProblem));
-        LOG.debug("Check result applies {}: {} {} against: {}",res, pObjectIdRef, pProblem, this);
-        return res;
-    }
-
-    @Override
-    public String toString() {
-        return "EsMaintenanceFilterDefinition [objectIdRef=" + objectIdRef + ", problem=" + problem + "]";
-    }
-
-    @Override
-    public Class<? extends DataContainer> getImplementedInterface() {
-        return Definition.class;
-    }
-
-    @Override
-    public <E extends Augmentation<Definition>> @Nullable E augmentation(Class<E> augmentationType) {
-        return null;
-    }
-
-
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceMode.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceMode.java
deleted file mode 100644
index 456c146b1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/database/types/EsMaintenanceMode.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.MaintenanceModeG;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.Filter;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Database record entry for maintenance mode, as specified. Used for read operations Structure: _id
- * : Contains the mountpoint name, must be specified before read. startTime: String representing
- * Java LocalDateTime with absolute UTC Time endTime: String representing Java LocalDateTime with
- * absolute UTC Time JSON Structure example { "_index": "mwtn_v1", "_type": "maintenancemode",
- * "_id": "LumpiWave-Z3", "_score": 1, "_source": { "node": "LumpiWave-Z3", "filter": [ {
- * "definition": { "object-id-ref": "", "problem": "" }, "description": "", "start":
- * "2018-01-01T10:00+00:00", "end": "2018-10-10T10:00+00:00" }, { "definition": { "object-id-ref":
- * "network-element", "problem": "power-alarm" }, "description": "", "start":
- * "2018-01-01T10:00+00:00", "end": "2018-10-10T10:00+00:00" } ] } },
- *
- * Two filters for all element and one for network-element power-alarm
- */
-
-public class EsMaintenanceMode extends EsObject implements MaintenanceModeG {
-
-    @SuppressWarnings("unused")
-    private static final Logger LOG = LoggerFactory.getLogger(EsMaintenanceMode.class);
-
-    public static final String ESDATATYPENAME = "maintenancemode";
-
-    private static final EsMaintenanceMode NOT_IN_MAINTENANCE = new EsMaintenanceMode("notinmaintenance");
-
-    private String node;
-
-    @JsonDeserialize(as = ArrayList.class)
-    private List<EsMaintenanceFilter> filter;
-
-    private boolean active;
-
-    // for jackson
-    public EsMaintenanceMode() {
-        this.active = false;
-        this.filter = new ArrayList<>();
-    }
-
-    public EsMaintenanceMode(String mountpoint) {
-        this();
-        this.setEsId(mountpoint);
-        this.node = mountpoint;
-    }
-
-    public EsMaintenanceMode(MaintenanceModeG maintenanceModeG) {
-        this.setEsId(maintenanceModeG.getMountpointName());
-        this.node = maintenanceModeG.getNodeName();
-        List<Filter> filters = maintenanceModeG.getFilter();
-        if (filter != null) {
-            for (Filter filterElement : filters) {
-                this.filter.add(new EsMaintenanceFilter(filterElement));
-            }
-        }
-    }
-
-
-    public String getNode() {
-        return node;
-    }
-
-    public void setNode(String node) {
-        this.node = node;
-    }
-
-    public List<EsMaintenanceFilter> getFilter2() {
-        return filter;
-    }
-
-    public void setActive(boolean a) {
-        this.active = a;
-    }
-
-    /**
-     * Replace list with new one.
-     *
-     * @param filterList new filter list
-     */
-    public void setFilter(List<EsMaintenanceFilter> filterList) {
-        this.filter = filterList;
-    }
-
-    /**
-     * Add one filter to internal list
-     *
-     * @param pFilter the Filter
-     */
-    public void addFilter(EsMaintenanceFilter pFilter) {
-        this.filter.add(pFilter);
-    }
-
-    /**
-     * Verify maintenance status
-     *
-     * @param objectIdRef NETCONF object id
-     * @param problem name that was provided
-     * @param now time to verify with
-     * @return true if in maintenance status
-     */
-    public boolean isONFObjectInMaintenance(String objectIdRef, String problem, ZonedDateTime now) {
-        if (!active) {
-            return false;
-        }
-        boolean res = false;
-        if (this != NOT_IN_MAINTENANCE) {
-            for (EsMaintenanceFilter oneFilter : filter) {
-                if (oneFilter.isInMaintenance(objectIdRef, problem, now)) {
-                    res = true;
-                    break;
-                }
-            }
-        }
-        return res;
-    }
-
-    /** Shortcut **/
-    public boolean isONFObjectInMaintenance(String objectIdRef, String problem) {
-        return isONFObjectInMaintenance(objectIdRef, problem, EsMaintenanceFilter.getNow());
-    }
-
-    @Override
-    public String toString() {
-        return "EsMaintenanceMode [node=" + node + ", filter=" + filter + ", active=" + active + "]";
-    }
-
-    public static EsMaintenanceMode getNotInMaintenance() {
-        return NOT_IN_MAINTENANCE;
-    }
-
-    /*---------------------------------------------
-     * yang tools related functions
-     */
-
-    @Override
-    public Class<? extends DataContainer> getImplementedInterface() {
-        return MaintenanceModeG.class;
-    }
-
-    @Override
-    public String getMountpointName() {
-        return this.getEsId();
-    }
-
-    @Override
-    public String getNodeName() {
-        return node;
-    }
-
-    @Override
-    public List<Filter> getFilter() {
-        return filter.isEmpty() ? null : new ArrayList<>(filter);
-    }
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/HtDatabaseMaintenanceService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/HtDatabaseMaintenanceService.java
new file mode 100644
index 000000000..4d0a56fd3
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/HtDatabaseMaintenanceService.java
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.HtAssert;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.database.EsDataObjectReaderWriter2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Entity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HtDatabaseMaintenanceService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(HtDatabaseMaintenanceService.class);
+
+    private final EsDataObjectReaderWriter2<MaintenanceEntity> maintenanceRW;
+    private final EsDataObjectReaderWriter2<NetworkElementConnectionEntity> requiredNeRW;
+
+    HtDatabaseMaintenanceService(@NonNull HtDatabaseClient client) throws ClassNotFoundException {
+        HtAssert.nonnull(client);
+
+        // Create control structure
+        maintenanceRW = new EsDataObjectReaderWriter2<>(client, Entity.Maintenancemode, MaintenanceEntity.class,
+                MaintenanceBuilder.class).setEsIdAttributeName("_id");
+
+        requiredNeRW = new EsDataObjectReaderWriter2<>(client, Entity.NetworkelementConnection,
+                NetworkElementConnectionEntity.class, NetworkElementConnectionBuilder.class)
+                        .setEsIdAttributeName("_id");
+
+    }
+
+    /**
+     * Get existing object for mountpoint to manage maintenance mode
+     * @return Object with configuration
+     */
+    @Nullable MaintenanceEntity getMaintenance(String mountpointId) {
+        MaintenanceEntity deviceMaintenanceMode = null;
+        if (maintenanceRW != null || mountpointId != null) {
+            deviceMaintenanceMode = maintenanceRW.read(mountpointId);
+        }
+        return deviceMaintenanceMode;
+    }
+
+    MaintenanceEntity setMaintenance(MaintenanceEntity m) {
+        if (maintenanceRW != null) {
+           if (maintenanceRW.write(m, m.getNodeId() ) == null) {
+                throw new IllegalArgumentException("Problem writing to database: "+m.getId());
+            }
+           LOG.info("Wrote maintenance object {}", m.toString());
+        }
+        return m;
+    }
+
+    List<MaintenanceEntity> getAll() {
+        return maintenanceRW != null ? maintenanceRW.doReadAll().getHits() : new ArrayList<>();
+    }
+
+    MaintenanceEntity createIfNotExists(String mountpointId) {
+        MaintenanceEntity deviceMaintenanceMode = null;
+        if (maintenanceRW != null) {
+            deviceMaintenanceMode = maintenanceRW.read(mountpointId);
+            if (deviceMaintenanceMode == null) {
+                LOG.debug("creating empty maintenance object in database");
+                deviceMaintenanceMode = MaintenanceCalculator.getDefaultMaintenance(mountpointId);
+                maintenanceRW.write(deviceMaintenanceMode, mountpointId);
+            } else {
+                LOG.debug("maintenance object already exists in database");
+            }
+        } else {
+            LOG.warn("cannot create maintenance obj. db reader/writer is null");
+        }
+        return deviceMaintenanceMode;
+    }
+
+    void deleteIfNotRequired(String mountPointNodeName) {
+
+        if (!this.isRequireNe(mountPointNodeName)) {
+            if (maintenanceRW != null) {
+                LOG.debug("removing maintenance object in database for " + mountPointNodeName);
+                maintenanceRW.remove(mountPointNodeName);
+            } else {
+                LOG.warn("cannot create maintenance obj. db reader/writer is null");
+            }
+        }
+
+    }
+
+
+    // -- Private
+    /**
+     * Check in required ne if entry exists for mountpointNodeName
+     *
+     * @param mountPointNodeName
+     * @return
+     */
+    private boolean isRequireNe(String mountPointNodeName) {
+        NetworkElementConnectionEntity ne = null;
+        if (requiredNeRW != null) {
+            LOG.debug("searching for entry in required-networkelement for " + mountPointNodeName);
+            ne = requiredNeRW.read(mountPointNodeName);
+        } else {
+            LOG.warn("cannot read db. no db reader writer initialized");
+        }
+        return ne != null;
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceCalculator.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceCalculator.java
new file mode 100644
index 000000000..5ee846ee6
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceCalculator.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import javax.annotation.Nonnull;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MaintenanceCalculator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MaintenanceCalculator.class);
+
+    private static ZoneId EsMaintenanceFilterTimeZone = ZoneId.of("UTC");
+    //private static DateTimeFormatter FORMAT = DateTimeFormatter.ISO_DATE_TIME;       // "1986-04-08T12:30:00"
+    private static DateTimeFormatter FORMAT = DateTimeFormatter.ISO_OFFSET_DATE_TIME;       // 2011-12-03T10:15:30+01:00
+    private static ZonedDateTime EMPTYDATETIME = ZonedDateTime.ofInstant(Instant.EPOCH, EsMaintenanceFilterTimeZone);
+
+    /** Intended to be used static **/
+    private MaintenanceCalculator() {
+    }
+
+    /**
+     * Provide default maintenanceinformation for a device
+     * @param mountpointId nodeId of device
+     * @return default data
+     */
+    static MaintenanceEntity getDefaultMaintenance(String mountpointId) {
+
+        DateAndTime now = NetconfTimeStamp.getConverter().getTimeStamp();
+
+        MaintenanceBuilder deviceMaintenanceModeBuilder = new MaintenanceBuilder();
+        deviceMaintenanceModeBuilder.setNodeId(mountpointId).setId(mountpointId);
+        // Use time from mountpoint creation
+        deviceMaintenanceModeBuilder.setDescription("");
+        // Use time from mountpoint creation
+        deviceMaintenanceModeBuilder.setStart(now);
+        deviceMaintenanceModeBuilder.setEnd(now);
+        // Reference to all
+        deviceMaintenanceModeBuilder.setObjectIdRef("");
+        deviceMaintenanceModeBuilder.setProblem("");
+        deviceMaintenanceModeBuilder.setActive(false);
+
+        return deviceMaintenanceModeBuilder.build();
+   }
+
+
+
+    /**
+     * Verify maintenance status
+     * @param maintenance if null false, else according to settings
+     * @param objectIdRef NETCONF object id
+     * @param problem     name that was provided
+     * @param now         time to verify with
+     * @return true if in maintenance status
+     */
+    public static boolean isONFObjectInMaintenance(MaintenanceEntity maintenance, String objectIdRef, String problem,
+            ZonedDateTime now) {
+
+        if (maintenance != null) {
+            Boolean isActive = maintenance.isActive();
+            if (isActive != null && isActive && isInMaintenance(maintenance, objectIdRef, problem, now)) {
+                return true;
+            }
+
+        }
+        return false;
+    }
+
+    /** Shortcut **/
+    public static boolean isONFObjectInMaintenance(MaintenanceEntity maintenance, String objectIdRef, String problem) {
+        return isONFObjectInMaintenance(maintenance, objectIdRef, problem, getNow());
+    }
+
+
+    /*---------------------------------------------
+     * private static helper functions to verify
+     */
+
+    /**
+     * Get the actual time in the Filter time zone.
+     * @return actual Time
+     */
+    private static ZonedDateTime getNow() {
+        return ZonedDateTime.now(EsMaintenanceFilterTimeZone);
+    }
+
+
+    /**
+     * Verify if the filter is active for an object
+     *
+     * @param now point of time to verify
+     * @return if the object is covered by filter and now within point of time
+     */
+    private static boolean isInMaintenance(MaintenanceEntity maintenance, String objectIdRef, String problem, ZonedDateTime now) {
+        return appliesToObjectReference(maintenance, objectIdRef, problem) && isInPeriod(maintenance.getStart(), maintenance.getEnd(), now);
+    }
+
+    /**
+     * Compare the if probe is within the range of start and end.
+     *
+     * @param start of range
+     * @param end   of range
+     * @param probe time to verify
+     * @return boolean result true if (start <= probe <= end)
+     */
+    public static boolean isInPeriod(DateAndTime start, DateAndTime end, ZonedDateTime probe) {
+        ZonedDateTime startZT = valueOf(start.getValue());
+        ZonedDateTime endZT = valueOf(end.getValue());
+        return startZT.compareTo(endZT) < 0 && startZT.compareTo(probe) <= 0 && endZT.compareTo(probe) >= 0;
+    }
+
+    /**
+     * Verify if the definied object is matching to the referenced object
+     * @param definition definition with parameters
+     * @param pObjectIdRef If empty considered as true
+     * @param pProblem if empty considered as true
+     * @return true if if referenced
+     */
+    private static boolean appliesToObjectReference(@Nonnull MaintenanceEntity definition, @Nonnull String pObjectIdRef, @Nonnull String pProblem) {
+        boolean res = (pObjectIdRef.isEmpty() || pObjectIdRef.contains(definition.getObjectIdRef()))
+                && (pProblem.isEmpty() || pProblem.contains(definition.getProblem()));
+        LOG.debug("Check result applies {}: {} {} against: {}", res, pObjectIdRef, pProblem, definition);
+        return res;
+    }
+
+    /**
+     * Convert String to time value
+     * @param zoneTimeString with time
+     * @return ZonedDateTime string
+     */
+    static ZonedDateTime valueOf(String zoneTimeString) {
+        if (zoneTimeString == null || zoneTimeString.isEmpty()) {
+            LOG.warn("Null or empty zoneTimeString");
+            return EMPTYDATETIME;
+        }
+        try {
+            return ZonedDateTime.parse(zoneTimeString, FORMAT);
+        } catch (DateTimeParseException e) {
+            LOG.warn("Can not parse zoneTimeString '{}'",zoneTimeString);
+            return EMPTYDATETIME;
+        }
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceServiceImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceServiceImpl.java
index 1db3433e2..fb306b6cd 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceServiceImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/maintenance/impl/MaintenanceServiceImpl.java
@@ -20,17 +20,12 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsBaseRequireNetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDataBaseReaderAndWriter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseClientAbstract;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl.IndexMwtnService;
+
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceRPCServiceAPI;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.MaintenanceService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types.EsMaintenanceFilter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types.EsMaintenanceFilterDefinition;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types.EsMaintenanceMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.MaintenanceEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetMaintenanceModeInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetMaintenanceModeOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.GetRequiredNetworkElementKeysOutputBuilder;
@@ -48,111 +43,23 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
 
     private static final Logger LOG = LoggerFactory.getLogger(MaintenanceServiceImpl.class);
 
-    /**
-     * Use the Client Index
-     */
-    private HtDataBaseReaderAndWriter<EsMaintenanceMode> maintenanceRW;
-    private HtDataBaseReaderAndWriter<EsBaseRequireNetworkElement> requiredNeRW;
+	private final HtDatabaseMaintenanceService database;
 
-    public MaintenanceServiceImpl(HtDatabaseClientAbstract client) {
+    public MaintenanceServiceImpl(HtDatabaseClient client) throws ClassNotFoundException {
 
         LOG.info("Create {} start", MaintenanceServiceImpl.class);
-
-        try {
-            // Create control structure
-            maintenanceRW = new HtDataBaseReaderAndWriter<>(client, EsMaintenanceMode.ESDATATYPENAME, EsMaintenanceMode.class);
-            requiredNeRW = new HtDataBaseReaderAndWriter<>(client, EsBaseRequireNetworkElement.ESDATATYPENAME, EsBaseRequireNetworkElement.class);
-
-        } catch (Exception e) {
-            LOG.error("Can not start database client. Exception: {}", e.getMessage());
-        }
+        database = new HtDatabaseMaintenanceService(client);
         LOG.info("Create {} finished. DB Service {} started.", MaintenanceServiceImpl.class,  client != null ? "sucessfully" : "not" );
 
     }
 
-    public MaintenanceServiceImpl(HtDatabaseNode database) {
-        this(getDatabaseClient(database));
-    }
-
-    private static HtDatabaseClientAbstract getDatabaseClient(HtDatabaseNode database) {
-        return new HtDatabaseClientAbstract(IndexMwtnService.INDEX,database);
-    }
-
-    /**
-     * Get existing object for mountpoint to manage maintenance mode
-     * @return Object with configuration
-     */
-    private @Nonnull EsMaintenanceMode getMaintenance(String mountpointId)
-    {
-        EsMaintenanceMode deviceMaintenanceMode = null;
-        if (maintenanceRW != null) {
-            deviceMaintenanceMode = maintenanceRW.doRead(mountpointId);
-        }
-
-        return deviceMaintenanceMode == null ? EsMaintenanceMode.getNotInMaintenance() : deviceMaintenanceMode;
-    }
-    /**
-     * Check in required ne if entry exists for mountpointNodeName
-     * @param mountPointNodeName
-     * @return
-     */
-    private boolean isRequireNe(String mountPointNodeName) {
-        EsBaseRequireNetworkElement ne=null;
-        if( requiredNeRW!=null)
-        {
-            LOG.debug("searching for entry in required-networkelement for "+mountPointNodeName);
-            ne = requiredNeRW.doRead(mountPointNodeName);
-        } else {
-            LOG.warn("cannot read db. no db reader writer initialized");
-        }
-        return ne!=null;
-    }
-    public EsMaintenanceMode createIfNotExists(String mountpointId)
-    {
-        EsMaintenanceMode deviceMaintenanceMode = null;
-        if (maintenanceRW != null)
-        {
-             deviceMaintenanceMode = maintenanceRW.doRead(mountpointId);
-             if(deviceMaintenanceMode==null)
-             {
-                 LOG.debug("creating empty maintenance object in database");
-                 deviceMaintenanceMode=new EsMaintenanceMode(mountpointId);
-                 EsMaintenanceFilter filter = new EsMaintenanceFilter();
-                 filter.setDescription("");
-                 filter.setStart(null);
-                 filter.setEnd(null);
-                 EsMaintenanceFilterDefinition definition=new EsMaintenanceFilterDefinition();
-                 definition.setObjectIdRef("");
-                 definition.setProblem("");
-                 filter.setDefinition(definition);
-                 deviceMaintenanceMode.addFilter(filter );
-                 maintenanceRW.doWrite(deviceMaintenanceMode);
-             } else {
-                LOG.debug("maintenance object already exists in database");
-            }
-        } else {
-            LOG.warn("cannot create maintenance obj. db reader/writer is null");
-        }
-
-        return deviceMaintenanceMode;
-    }
-    public void deleteIfNotRequired(String mountPointNodeName) {
-
-        if(!this.isRequireNe(mountPointNodeName))
-        {
-            EsMaintenanceMode deviceMaintenanceMode = new EsMaintenanceMode(mountPointNodeName);
-            if (maintenanceRW != null)
-            {
-                LOG.debug("removing maintenance object in database for "+mountPointNodeName);
-                maintenanceRW.doRemove(deviceMaintenanceMode);
-            } else {
-                LOG.warn("cannot create maintenance obj. db reader/writer is null");
-            }
-        }
-
-    }
-
+	public void createIfNotExists(String mountPointNodeName) {
+		database.createIfNotExists(mountPointNodeName);
+	}
 
+	public void deleteIfNotRequired(String mountPointNodeName) {
+		database.deleteIfNotRequired(mountPointNodeName);
+	}
 
     /*-------------------------------------------------
      * Interface AutoClosable
@@ -168,13 +75,14 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
 
     @Override
     public GetRequiredNetworkElementKeysOutputBuilder getRequiredNetworkElementKeys() {
-        GetRequiredNetworkElementKeysOutputBuilder outputBuilder = new GetRequiredNetworkElementKeysOutputBuilder();
-        List<EsMaintenanceMode> all = maintenanceRW != null ? maintenanceRW.doReadAll() : new ArrayList<>();
+        List<MaintenanceEntity> all = database.getAll();
+
         List<String> mountpointList = new ArrayList<>();
-        for (EsMaintenanceMode oneOfAll : all) {
-            mountpointList.add(oneOfAll.getEsId());
+        for (MaintenanceEntity oneOfAll : all) {
+            mountpointList.add(oneOfAll.getNodeId());
 
         }
+        GetRequiredNetworkElementKeysOutputBuilder outputBuilder = new GetRequiredNetworkElementKeysOutputBuilder();
         outputBuilder.setMountpointNames(mountpointList);
         return outputBuilder;
     }
@@ -182,15 +90,12 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
     @Override
     public ShowRequiredNetworkElementOutputBuilder showRequiredNetworkElement(ShowRequiredNetworkElementInput input) {
         ShowRequiredNetworkElementOutputBuilder outputBuilder = new ShowRequiredNetworkElementOutputBuilder();
-        EsMaintenanceMode maintenanceMode = new EsMaintenanceMode(input.getMountpointName());
-        if (maintenanceRW != null) {
-            maintenanceMode = maintenanceRW.doRead(maintenanceMode);
-        }
+        MaintenanceEntity maintenanceMode = database.getMaintenance(input.getMountpointName());
         if (maintenanceMode != null) {
             RequiredNetworkElementBuilder valueBuilder = new RequiredNetworkElementBuilder();
 
-            valueBuilder.setMountpointName(maintenanceMode.getNode());
-            valueBuilder.setStatus(String.valueOf(maintenanceMode.isONFObjectInMaintenance("","")));
+            valueBuilder.setMountpointName(maintenanceMode.getNodeId());
+            valueBuilder.setStatus(String.valueOf(MaintenanceCalculator.isONFObjectInMaintenance(maintenanceMode, "","")));
             valueBuilder.setDescription("Pretty description here");
             outputBuilder.setRequiredNetworkElement(valueBuilder.build());
         } else {
@@ -201,11 +106,9 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
 
     @Override
     public GetMaintenanceModeOutputBuilder getMaintenanceMode(GetMaintenanceModeInput input) {
-        EsMaintenanceMode maintenanceMode = null;
-        GetMaintenanceModeOutputBuilder outputBuilder;
-        if (maintenanceRW != null) {
-            maintenanceMode = maintenanceRW.doRead(input.getMountpointName());
-        }
+
+    	GetMaintenanceModeOutputBuilder outputBuilder;
+        MaintenanceEntity maintenanceMode = database.getMaintenance(input.getMountpointName());
         if (maintenanceMode != null) {
             outputBuilder = new GetMaintenanceModeOutputBuilder(maintenanceMode);
         } else {
@@ -218,15 +121,11 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
     public SetMaintenanceModeOutputBuilder setMaintenanceMode(SetMaintenanceModeInput input) {
 
         SetMaintenanceModeOutputBuilder outputBuilder = new SetMaintenanceModeOutputBuilder();
-        if (maintenanceRW != null) {
-            EsMaintenanceMode m = new EsMaintenanceMode(input);
-            if (maintenanceRW.doWrite(m) == null) {
-                throw new IllegalArgumentException("Problem writing to database: "+input.getMountpointName());
-            }
-            outputBuilder = new SetMaintenanceModeOutputBuilder(m);
-            LOG.info("Wrote maintenance object {}", m.toString());
-        }
+    	MaintenanceBuilder mb = new MaintenanceBuilder(input);
+    	MaintenanceEntity m = mb.build();
+        database.setMaintenance(m);
         return outputBuilder;
+
     }
 
     @Override
@@ -234,22 +133,23 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
 
         StringBuffer resultString = new StringBuffer();
 
-        EsMaintenanceMode maintenanceMode = getMaintenance(input.getMountpointName());
-
-        TestMaintenanceModeOutputBuilder outputBuilder = new TestMaintenanceModeOutputBuilder(maintenanceMode);
+        MaintenanceEntity maintenanceMode = database.getMaintenance(input.getMountpointName());
 
-        ZonedDateTime now = EsMaintenanceFilter.valueOf(input.getTestDate());
+		ZonedDateTime now = MaintenanceCalculator.valueOf(input.getTestDate());
 
-        resultString.append("In database table: ");
-        resultString.append(!(EsMaintenanceMode.getNotInMaintenance() == maintenanceMode));
-        resultString.append(" Maintenance active: ");
-        resultString.append(maintenanceMode.isONFObjectInMaintenance(input.getObjectIdRef(), input.getProblemName(), now));
-        resultString.append(" at Timestamp: ");
-        resultString.append(now);
+		resultString.append("In database table: ");
+		resultString.append(maintenanceMode != null);
+		resultString.append(" Maintenance active: ");
+		resultString.append(MaintenanceCalculator.isONFObjectInMaintenance(maintenanceMode, input.getObjectIdRef(),
+				input.getProblemName(), now));
+		resultString.append(" at Timestamp: ");
+		resultString.append(now);
+		TestMaintenanceModeOutputBuilder outputBuilder = maintenanceMode != null
+				? new TestMaintenanceModeOutputBuilder(maintenanceMode)
+				: new TestMaintenanceModeOutputBuilder();
+		outputBuilder.setResultString(resultString.toString());
+		return outputBuilder;
 
-        outputBuilder.setResultString(resultString.toString());
-
-        return outputBuilder;
     }
 
     /*-------------------------------------------------
@@ -258,12 +158,10 @@ public class MaintenanceServiceImpl implements MaintenanceService, MaintenanceRP
 
     @Override
     public boolean isONFObjectInMaintenance(String mountpointReference, String objectIdRef, String problem) {
-        EsMaintenanceMode maintenanceMode = getMaintenance(mountpointReference);
-        boolean res = maintenanceMode.isONFObjectInMaintenance(objectIdRef, problem);
+    	MaintenanceEntity maintenanceMode = database.getMaintenance(mountpointReference);
+        boolean res = MaintenanceCalculator.isONFObjectInMaintenance(maintenanceMode, objectIdRef, problem);
         LOG.debug("inMaintenance={} for mountpoint/id/problem:{} {} {} Definition: {}",res, mountpointReference, objectIdRef, problem, this );
         return res;
     }
 
-
-
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/MicrowaveModelPerformanceDataProvider.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/MicrowaveModelPerformanceDataProvider.java
index d6391aabd..c3e4c1e4e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/MicrowaveModelPerformanceDataProvider.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/MicrowaveModelPerformanceDataProvider.java
@@ -1,6 +1,24 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
 
 
 /**
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerImpl.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerImpl.java
index b4c5abd7d..9ad1b2578 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerImpl.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerImpl.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -17,38 +17,51 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl;
 
-import javax.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementRepresentation;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.config.PmConfig;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.service.MicrowaveHistoricalPerformanceWriterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PerformanceManagerImpl implements AutoCloseable {
+public class PerformanceManagerImpl implements DeviceManagerService, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(PerformanceManagerImpl.class);
 
     private @Nullable PerformanceManagerTask task;
 
-    public PerformanceManagerImpl(long seconds, MicrowaveHistoricalPerformanceWriterService databaseService) {
+    public PerformanceManagerImpl(long seconds, MicrowaveHistoricalPerformanceWriterService databaseService, ConfigurationFileRepresentation config) {
 
-        LOG.info("Construct begin {} with {} Seconds",PerformanceManagerImpl.class.getSimpleName(), seconds);
+        LOG.info("Construct {}", PerformanceManagerImpl.class.getSimpleName());
 
-        if (MicrowaveHistoricalPerformanceWriterService.isAvailable(databaseService)) {
+        this.task = null;
+        PmConfig configurationPM = new PmConfig(config);
+        LOG.info("Performance manager configuration: {}", configurationPM);
 
-            LOG.info("Do start of PM task");
-            task = new PerformanceManagerTask(seconds, databaseService);
-            task.start();
-            LOG.info("PM task scheduled");
+        if (!configurationPM.isPerformanceManagerEnabled()) {
+            LOG.info("Don't start performance manager");
 
         } else {
-            LOG.info("Database not available. Do not start PM task");
+            LOG.info("{} Seconds", seconds);
+            if (MicrowaveHistoricalPerformanceWriterService.isAvailable(databaseService)) {
+
+                LOG.info("Start of PM task");
+                task = new PerformanceManagerTask(seconds, databaseService);
+                task.start();
+                LOG.info("PM task scheduled");
+
+            } else {
+                LOG.info("Database not available. Do not start PM task");
+            }
         }
 
-        LOG.info("Construct end {}",PerformanceManagerImpl.class.getSimpleName());
+        LOG.info("Construct end {}", PerformanceManagerImpl.class.getSimpleName());
     }
 
     @Override
-	public void close() {
+    public void close() {
         LOG.info("Close {}", PerformanceManagerImpl.class.getSimpleName());
         if (task != null) {
             task.stop();
@@ -58,15 +71,15 @@ public class PerformanceManagerImpl implements AutoCloseable {
     public void registration(String mountPointNodeName, ONFCoreNetworkElementRepresentation ne) {
         LOG.debug("Register {}",mountPointNodeName);
         if (task != null) {
-			task.registration(mountPointNodeName, ne);
-		}
+            task.registration(mountPointNodeName, ne);
+        }
     }
 
     public void deRegistration(String mountPointNodeName) {
         LOG.debug("Deregister {}",mountPointNodeName);
         if (task != null) {
-			task.deRegistration(mountPointNodeName);
-		}
+            task.deRegistration(mountPointNodeName);
+        }
     }
 
 }
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerTask.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerTask.java
index ef2a0b8db..3d8116816 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerTask.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/PerformanceManagerTask.java
@@ -23,8 +23,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.ONFCoreNetworkElementRepresentation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.ONFCoreNetworkElementRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.service.MicrowaveHistoricalPerformanceWriterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsEventBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/config/PmConfig.java
index 568e01f88..e4d06c6fb 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsEventBase.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/config/PmConfig.java
@@ -15,43 +15,40 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.config;
 
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.MwtNotificationBase;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
 
-/**
- *
- * Event from Network to be recorded in the database
- *
- */
+public class PmConfig implements Configuration {
 
-public class EsEventBase extends EsObject {
+    private static final String SECTION_MARKER_PM = "pm";
 
-    public static final String ESDATATYPENAME = "eventlog";
+    private static final String PROPERTY_KEY_ENABLED = "pmEnabled";
+    private static final String DEFAULT_VALUE_ENABLED = String.valueOf(true);
 
-    private static final String EVENTLOG_FIELD_TIMESTAMP = "event.timeStamp";
 
+	private final ConfigurationFileRepresentation configuration;
 
-    private MwtNotificationBase event;
+	public PmConfig(ConfigurationFileRepresentation configuration) {
+		this.configuration = configuration;
+		this.configuration.addSection(SECTION_MARKER_PM);
+		defaults();
+	}
 
-    public MwtNotificationBase getProblem() {
-        return event;
+    public boolean isPerformanceManagerEnabled() {
+        return configuration.getPropertyBoolean(SECTION_MARKER_PM, PROPERTY_KEY_ENABLED);
     }
 
-    public void setProblem(MwtNotificationBase event) {
-        this.event = event;
-    }
+	@Override
+	public String getSectionName() {
+		return SECTION_MARKER_PM;
+	}
 
-    /**
-     * Query to get older Elements
-     * @param netconfTimeStamp to identify older Elements
-     * @return QueryBuilder for older elements related to timestamp
-     */
-    public static QueryBuilder getQueryForTimeStamp(String netconfTimeStamp) {
-      return new RangeQueryBuilder(EVENTLOG_FIELD_TIMESTAMP).lt(netconfTimeStamp);
-    }
+	@Override
+	public void defaults() {
+		//Add default if not available
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_PM, PROPERTY_KEY_ENABLED, DEFAULT_VALUE_ENABLED);
+	}
 
- }
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/service/MicrowaveHistoricalPerformanceWriterService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/service/MicrowaveHistoricalPerformanceWriterService.java
index 4782f3305..ef57b1088 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/service/MicrowaveHistoricalPerformanceWriterService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/service/MicrowaveHistoricalPerformanceWriterService.java
@@ -17,12 +17,10 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.service;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDataBaseReaderAndWriter;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseClientAbstract;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseNode;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.IndexClientBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.AllPm;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.AllPm;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.HtDataBaseReaderAndWriter;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance24Hours;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformanceLogEntry;
@@ -32,27 +30,20 @@ import org.slf4j.LoggerFactory;
 public class MicrowaveHistoricalPerformanceWriterService {
 
     private static final Logger LOG = LoggerFactory.getLogger(MicrowaveHistoricalPerformanceWriterService.class);
-    private static final String INDEX = "sdnperformance";
-    private static final String MAPPING = "/elasticsearch/index/sdnperformance/sdnperformanceMapping.json";
     private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
 
 
-    private HtDatabaseClientAbstract client;
+    private final HtDatabaseClient client;
     private HtDataBaseReaderAndWriter<EsHistoricalPerformance15Minutes> historicalPerformance15mRW;
     private HtDataBaseReaderAndWriter<EsHistoricalPerformance24Hours> historicalPerformance24hRW;
     private HtDataBaseReaderAndWriter<EsHistoricalPerformanceLogEntry> historicalPerformanceLogRW;
 
-    public MicrowaveHistoricalPerformanceWriterService(HtDatabaseNode database) {
+    public MicrowaveHistoricalPerformanceWriterService(HtDatabaseClient client) {
 
         LOG.info("Create {} start", MicrowaveHistoricalPerformanceWriterService.class);
-
+        this.client = client;
         try {
 
-            IndexClientBuilder clientBuilder =
-                    IndexClientBuilder.getBuilder(INDEX).setMappingSettingJsonFileName(MAPPING);
-            client = clientBuilder.create(database);
-            clientBuilder.close();
-
             historicalPerformance15mRW = new HtDataBaseReaderAndWriter<>(client,
                     EsHistoricalPerformance15Minutes.ESDATATYPENAME, EsHistoricalPerformance15Minutes.class);
             historicalPerformance24hRW = new HtDataBaseReaderAndWriter<>(client,
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceBase.java
index 5f8370f60..544e46cbe 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceBase.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceBase.java
@@ -17,9 +17,9 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.LinkIdentifyingObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.common.database.data.EsObject;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.LinkIdentifyingObject;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
 import org.slf4j.Logger;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceLogEntry.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceLogEntry.java
index ebbf8b435..57872d8af 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceLogEntry.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsHistoricalPerformanceLogEntry.java
@@ -6,9 +6,9 @@
  * =================================================================================================
  * 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
@@ -17,7 +17,7 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types;
 
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
+import org.onap.ccsdk.features.sdnr.wt.common.database.data.EsObject;
 
 /**
  *
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsPerformanceData.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsPerformanceData.java
index d55311164..607d1900a 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsPerformanceData.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/performancemanager/impl/database/types/EsPerformanceData.java
@@ -17,12 +17,9 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType12;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType1211;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ExtendedAirInterfaceHistoricalPerformanceType1211p;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType12;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType1211;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedAirInterfaceHistoricalPerformanceType1211p;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.AirInterfaceHistoricalPerformanceTypeG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.AirInterfacePerformanceTypeG;
@@ -31,6 +28,10 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.r
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class EsPerformanceData {
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayFilter.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayFilter.java
index fecdd3b53..92af68bc0 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayFilter.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayFilter.java
@@ -6,16 +6,16 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter;
 
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -66,6 +66,25 @@ public class NotificationDelayFilter<T> implements AutoCloseable {
     }
 
     /**
+     * If process the notification
+     * @return true if other processing is required, false if not
+     */
+    public boolean processNotification(boolean cleared, String problemName, T notificationXml) {
+        // ToggleAlarmFilter functionality
+        if (NotificationDelayFilter.isEnabled()) {
+            if (cleared) {
+                clearAlarmNotification(problemName, notificationXml);
+            } else {
+                pushAlarmNotification(problemName, notificationXml);
+            }
+            return false;
+        } else {
+            return true;
+        }
+        // end of ToggleAlarmFilter
+    }
+
+    /**
      * Push notification with a specific severity (everything except non-alarmed)
      * @param problemName key
      * @param notification related notification
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayService.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayService.java
index 8ef302afa..a9a04595a 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayService.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayService.java
@@ -15,19 +15,29 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter;
 
 import java.util.HashMap;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.IConfigChangedListener;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.ToggleAlarmConfig;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.filechange.IConfigChangedListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.DeviceManagerService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.conf.ToggleAlarmConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NotificationDelayService<T> implements AutoCloseable, IConfigChangedListener {
+public class NotificationDelayService<T> implements DeviceManagerService, AutoCloseable, IConfigChangedListener {
     private static final Logger LOG = LoggerFactory.getLogger(NotificationDelayService.class);
 
     private final HashMap<String, NotificationDelayFilter<T>> filters;
+    private final ToggleAlarmConfig config;
+
+    public NotificationDelayService(ConfigurationFileRepresentation htconfig) {
+        this.filters = new HashMap<>();
+        htconfig.registerConfigChangedListener(this);
+        config = new ToggleAlarmConfig(htconfig);
+        onConfigChanged();
+    }
 
     public NotificationDelayFilter<T> getInstance(String nodeName, NotificationDelayedListener<T> eventListener) {
         NotificationDelayFilter<T> filter = filters.getOrDefault(nodeName, null);
@@ -40,20 +50,12 @@ public class NotificationDelayService<T> implements AutoCloseable, IConfigChange
         return filter;
     }
 
-    public NotificationDelayService(HtDevicemanagerConfiguration htconfig) {
-        this.filters = new HashMap<>();
-        htconfig.registerConfigChangedListener(this);
-        NotificationDelayFilter.setDelay(htconfig.getToggleAlarm().getDelay());
-        NotificationDelayFilter.setEnabled(htconfig.getToggleAlarm().isEnabled());
+    @Override
+    public void onConfigChanged() {
+        NotificationDelayFilter.setDelay(config.getDelay());
+        NotificationDelayFilter.setEnabled(config.isEnabled());
     }
 
-	@Override
-	public void onConfigChanged() {
-        ToggleAlarmConfig cfg = ToggleAlarmConfig.reload();
-        NotificationDelayFilter.setDelay(cfg.getDelay());
-        NotificationDelayFilter.setEnabled(cfg.isEnabled());
-	}
-
     @Override
     public void close() throws Exception {
         // close all filters
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayedListener.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayedListener.java
index 04276c999..eab541d13 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationDelayedListener.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationDelayedListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter;
 
 public interface NotificationDelayedListener<T> {
 
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationWithServerTimeStamp.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationWithServerTimeStamp.java
index 6631cbedf..1cf32cffc 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/toggleAlarmFilter/NotificationWithServerTimeStamp.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/NotificationWithServerTimeStamp.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter;
 
 public class NotificationWithServerTimeStamp<T2> {
     private final T2 alarmNotification;
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/conf/ToggleAlarmConfig.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/conf/ToggleAlarmConfig.java
new file mode 100644
index 000000000..e7c6c7a2d
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/toggleAlarmFilter/conf/ToggleAlarmConfig.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.conf;
+
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+
+public class ToggleAlarmConfig implements Configuration {
+
+    private static final String SECTION_MARKER_TA = "toggleAlarmFilter";
+
+    private static final String PROPERTY_KEY_ENABLED = "taEnabled";
+    private static final String PROPERTY_KEY_DELAY = "taDelay";
+
+    private static final boolean DEFAULT_VALUE_ENABLED = true;
+    private static final long DEFAULT_VALUE_DELAY = 3000;  //in ms
+
+	private final ConfigurationFileRepresentation configuration;
+
+    public ToggleAlarmConfig(ConfigurationFileRepresentation configuration) {
+		this.configuration = configuration;
+		this.configuration.addSection(SECTION_MARKER_TA);
+		defaults();
+    }
+
+    public boolean isEnabled() {
+        return configuration.getPropertyBoolean(SECTION_MARKER_TA, PROPERTY_KEY_ENABLED);
+    }
+    public long getDelay() {
+        return configuration.getPropertyLong(SECTION_MARKER_TA, PROPERTY_KEY_DELAY).orElse(DEFAULT_VALUE_DELAY);
+    }
+
+	@Override
+	public String getSectionName() {
+		return SECTION_MARKER_TA;
+	}
+
+	@Override
+	public void defaults() {
+		//Add default if not available
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_TA, PROPERTY_KEY_ENABLED, DEFAULT_VALUE_ENABLED);
+		configuration.setPropertyIfNotAvailable(SECTION_MARKER_TA, PROPERTY_KEY_DELAY, DEFAULT_VALUE_DELAY);
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/elasticsearch.yml b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/elasticsearch.yml
deleted file mode 100644
index 896d51616..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/elasticsearch.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-#       Before you set out to tweak and tune the configuration, make sure you
-#       understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please see the documentation for further information on configuration options:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html>
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-cluster.name: $clustername
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-node.name: $nodename
-#
-# Add custom attributes to the node:
-#
-# node.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-# path.data: /path/to/data
-path.data: etc
-path.home: data
-path.plugins: etc/elasticsearch-plugins
-#
-# Path to log files:
-#
-# path.logs: /path/to/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-# bootstrap.mlockall: true
-#
-# Make sure that the `ES_HEAP_SIZE` environment variable is set to about half the memory
-# available on the system and that the owner of the process is allowed to use this limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-# network.host: 192.168.0.1
-network.bind_host: 0.0.0.0
-network.publish_host: $hostname
-#
-# Set a custom port for HTTP:
-#
-# http.port: 9200
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html>
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when new node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-# discovery.zen.ping.unicast.hosts: ["host1", "host2"]
-#
-# Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1):
-#
-# discovery.zen.minimum_master_nodes: 3
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html>
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-# gateway.recover_after_nodes: 3
-#
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-gateway.html>
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Disable starting multiple nodes on a single system:
-#
-# node.max_local_storage_nodes: 1
-#
-# Require explicit names when deleting indices:
-#
-# action.destructive_requires_name: true
-
-# Required for Kibana 4.x support
-index.max_result_window: 2147483647
-#transport.tcp.port: 9301
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/mwtn/mwtnMapping.json b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/mwtn/mwtnMapping.json
deleted file mode 100644
index 614ce2fb5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/mwtn/mwtnMapping.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "settings": {
-       "analysis": {
-          "analyzer": {
-             "standard": {
-                 "type": "whitespace"
-             }
-          }
-       }
-    },
-    "mappings": {
-        "required-networkelement": {
-            "date_detection": false
-        },
-        "maintenancemode": {
-            "date_detection": false
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnevents/sdneventsMapping.json b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnevents/sdneventsMapping.json
deleted file mode 100644
index 83b7ffdaa..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnevents/sdneventsMapping.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "mappings": {
-        "faultlog": {
-            "properties": {
-                "fault": {
-                    "properties": {
-                        "nodeName": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "severity": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "timeStamp": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "problem": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "counter": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "objectId": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-        "faultcurrent": {
-            "properties": {
-                "faultCurrent": {
-                    "properties": {
-                        "nodeName": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "severity": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "timeStamp": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "problem": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "counter": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "objectId": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-        "eventlog": {
-            "properties": {
-                "event": {
-                    "properties": {
-                        "nodeName": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "timeStamp": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "newValue": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "attributeName": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "counter": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        },
-                        "objectId": {
-                            "index": "not_analyzed",
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-
-        "inventorytoplevel": {
-            "properties": {
-                "uuidList": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "mountpoint": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                }
-            }
-        },
-        "inventoryequipment": {
-            "properties": {
-                "date": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "modelIdentifier": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "manufacturerIdentifier": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "typeName": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "description": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "uuid": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "version": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "parentUuid": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "containedHolder": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "mountpoint": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "treeLevel": {
-                    "type": "long"
-                },
-                "partTypeId": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "serial": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                }
-            }
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnperformance/sdnperformanceMapping.json b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnperformance/sdnperformanceMapping.json
deleted file mode 100644
index 92d5ad2fb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/index/sdnperformance/sdnperformanceMapping.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "mappings":
-    {
-        "historicalperformance24h":
-        {
-            "properties":
-            {
-                "node-name":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "time-stamp":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "suspect-interval-flag":
-                {
-                    "type": "boolean"
-                },
-                "scanner-id":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "uuid-interface":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                 "layer-protocol-name": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "granularity-period":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "radio-signal-id": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                }
-            }
-        },
-
-        "historicalperformance15min":
-        {
-            "properties":
-            {
-                "node-name":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "time-stamp":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "suspect-interval-flag":
-                {
-                    "type": "boolean"
-                },
-                "scanner-id":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "uuid-interface":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                 "layer-protocol-name": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "granularity-period":
-                {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "radio-signal-id": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                }
-            }
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/delete-by-query/plugin-descriptor.properties b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/delete-by-query/plugin-descriptor.properties
deleted file mode 100644
index 70b21dcd1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/delete-by-query/plugin-descriptor.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-# Elasticsearch plugin descriptor file
-# This file must exist as 'plugin-descriptor.properties' at
-# the root directory of all plugins.
-#
-# A plugin can be 'site', 'jvm', or both.
-#
-### example site plugin for "foo":
-#
-# foo.zip <-- zip file for the plugin, with this structure:
-#   _site/ <-- the contents that will be served
-#   plugin-descriptor.properties <-- example contents below:
-#
-# site=true
-# description=My cool plugin
-# version=1.0
-#
-### example jvm plugin for "foo"
-#
-# foo.zip <-- zip file for the plugin, with this structure:
-#   <arbitrary name1>.jar <-- classes, resources, dependencies
-#   <arbitrary nameN>.jar <-- any number of jars
-#   plugin-descriptor.properties <-- example contents below:
-#
-# jvm=true
-# classname=foo.bar.BazPlugin
-# description=My cool plugin
-# version=2.0.0-rc1
-# elasticsearch.version=2.0
-# java.version=1.7
-#
-### mandatory elements for all plugins:
-#
-# 'description': simple summary of the plugin
-description=The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.
-#
-# 'version': plugin's version
-version=2.2.0
-#
-# 'name': the plugin name
-name=delete-by-query
-
-### mandatory elements for site plugins:
-#
-# 'site': set to true to indicate contents of the _site/
-#  directory in the root of the plugin should be served.
-site=false
-#
-### mandatory elements for jvm plugins :
-#
-# 'jvm': true if the 'classname' class should be loaded
-#  from jar files in the root directory of the plugin.
-#  Note that only jar files in the root directory are
-#  added to the classpath for the plugin! If you need
-#  other resources, package them into a resources jar.
-jvm=true
-#
-# 'classname': the name of the class to load, fully-qualified.
-classname=org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin
-#
-# 'java.version' version of java the code is built against
-# use the system property java.specification.version
-# version string must be a sequence of nonnegative decimal integers
-# separated by "."'s and may have leading zeros
-java.version=1.7
-#
-# 'elasticsearch.version' version of elasticsearch compiled against
-# You will have to release a new version of the plugin for each new
-# elasticsearch release. This version is checked when the plugin
-# is loaded so Elasticsearch will refuse to start in the presence of
-# plugins with the incorrect elasticsearch.version.
-elasticsearch.version=2.2.0
-#
-### deprecated elements for jvm plugins :
-#
-# 'isolated': true if the plugin should have its own classloader.
-# passing false is deprecated, and only intended to support plugins 
-# that have hard dependencies against each other. If this is
-# not specified, then the plugin is isolated by default.
-isolated=true
-#
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/.jshintrc b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/.jshintrc
deleted file mode 100644
index 757f96929..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/.jshintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"maxerr": 1000,
-
-	"predef": [
-		"exports",
-		"describe",
-		"expect",
-		"it",
-		"beforeEach",
-		"afterEach",
-		"jasmine",
-		"test",
-		"spyOn"
-	],
-
-	"jquery" : true,
-	"browser" : true,
-
-	"curly": true,
-	"debug": false,
-	"devel": true,
-	"eqeqeq": true,
-	"eqnull": true,
-	"expr": true,
-	"forin": false,
-	"immed": false,
-	"latedef": true,
-	"newcap": true,
-	"noarg": true,
-	"noempty": false,
-	"nonew": false,
-	"nomen": false,
-	"plusplus": false,
-	"regexp": false,
-	"undef": true,
-	"sub": true,
-	"white": false,
-	"scripturl": true,
-	"esnext": true
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/Gruntfile.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/Gruntfile.js
deleted file mode 100644
index 11bd171d2..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/Gruntfile.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-module.exports = function(grunt) {
-
-	var fileSets = require("./grunt_fileSets.js");
-
-	// Project configuration.
-	grunt.initConfig({
-		clean: {
-			_site: {
-				src: ['_site']
-			}
-		},
-		concat: {
-			vendorjs: {
-				src: fileSets.vendorJs,
-				dest: '_site/vendor.js'
-			},
-			vendorcss: {
-				src: fileSets.vendorCss,
-				dest: '_site/vendor.css'
-			},
-			appjs: {
-				src: fileSets.srcJs,
-				dest: '_site/app.js'
-			},
-			appcss: {
-				src: fileSets.srcCss,
-				dest: '_site/app.css'
-			}
-		},
-
-		copy: {
-			site_index: {
-				src: 'index.html',
-				dest: '_site/index.html',
-				options: {
-					process: function( src ) {
-						return src.replace(/_site\//g, "");
-					}
-				}
-			},
-			base: {
-				expand: true,
-				cwd: 'src/app/base/',
-				src: [ '*.gif', '*.png', '*.css' ],
-				dest: '_site/base/'
-			},
-			iconFonts: {
-				expand: true,
-				cwd: 'src/vendor/font-awesome/fonts/',
-				src: '**',
-				dest: '_site/fonts'
-			},
-			i18n: {
-				src: 'src/vendor/i18n/i18n.js',
-				dest: '_site/i18n.js'
-			},
-			lang: {
-				expand: true,
-				cwd: 'src/app/lang/',
-				src: '**',
-				dest: '_site/lang/'
-			}
-		},
-
-		jasmine: {
-			task: {
-				src: [ fileSets.vendorJs, 'src/vendor/i18n/i18n.js', 'src/app/lang/en_strings.js', fileSets.srcJs ],
-				options: {
-					specs: 'src/app/**/*Spec.js',
-					helpers: 'test/spec/*Helper.js',
-					display: "short",
-					summary: true
-				}
-			}
-		},
-
-		watch: {
-			"scripts": {
-				files: ['src/**/*', 'test/spec/*' ],
-				tasks: ['default'],
-				options: {
-					spawn: false
-				}
-			},
-			"grunt": {
-				files: [ 'Gruntfile.js' ]
-			}
-		},
-
-		connect: {
-			server: {
-				options: {
-					port: 9100,
-					base: '.',
-					keepalive: true
-				}
-			}
-		}
-
-	});
-
-	grunt.loadNpmTasks('grunt-contrib-clean');
-	grunt.loadNpmTasks('grunt-contrib-concat');
-	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-contrib-connect');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-contrib-jasmine');
-
-	// Default task(s).
-	grunt.registerTask('default', ['clean', 'concat', 'copy', 'jasmine']);
-	grunt.registerTask('server', ['connect:server']);
-	grunt.registerTask('dev', [ 'default', 'watch' ]);
-
-
-};
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/LICENCE b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/LICENCE
deleted file mode 100644
index 5e052c260..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/LICENCE
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/README.textile b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/README.textile
deleted file mode 100644
index 6db8d5b49..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/README.textile
+++ /dev/null
@@ -1,98 +0,0 @@
-h1. elasticsearch-head
-
-h2. A web front end for an Elasticsearch cluster
-
-h3. "http://mobz.github.io/elasticsearch-head":http://mobz.github.io/elasticsearch-head
-
-h2. Installing and Running
-
-There are two main ways of running and installing elasticsearch-head
-
-h4. Running as a plugin of Elasticsearch
-
-* Install elasticsearch-head:
-  - for Elasticsearch 5.x:
-    site plugins are not supported. Run elasticsearch-head "as a standalone server":#running-with-built-in-server
-  - for Elasticsearch 2.x - 4.x:
-    @sudo elasticsearch/bin/plugin install mobz/elasticsearch-head@
-  - for Elasticsearch 1.x:
-    @sudo elasticsearch/bin/plugin -install mobz/elasticsearch-head/1.x@
-  - for Elasticsearch 0.9:
-    @sudo elasticsearch/bin/plugin -install mobz/elasticsearch-head/0.9@
-
-* @open http://localhost:9200/_plugin/head/@
-
-This will automatically download the latest version of elasticsearch-head from github and run it as a plugin within the elasticsearch cluster. In this mode;
-* elasticsearch-head automatically connects to the node that is running it
-
-Note on different Elasticsearch installation path:
-* If you've installed the .deb package, then the plugin executable will be available at @/usr/share/elasticsearch/bin/plugin@.
-* If you've installed Elasticsearch via Homebrew, plugin executable will be available at @/usr/local/Cellar/elasticsearch/(elasticsearch version)/libexec/bin/plugin@.
-
-h4. Running with built in server
-
-* enable "cors":http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-http.html by adding @http.cors.enabled: true@ in elasticsearch configuration. Don't forget to also set @http.cors.allow-origin@ because no origin allowed by default. @http.cors.allow-origin: "*"@ is valid value, however it's considered as a security risk as your cluster is open to cross origin from *anywhere*. Check Elasticsearch documentation on this parameter:  https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-http.html#modules-http
-* @git clone git://github.com/mobz/elasticsearch-head.git@
-* @cd elasticsearch-head@
-* @npm install@
-* @grunt server@
-* @open@ "http://localhost:9100/":http://localhost:9100/
-
-This will start a local webserver running on port 9100 serving elasticsearch-head
-* Best option if you are likely to connect to several different clusters
-
-h4. Alternatives
-
-h5. Running from the filesystem
-
-elastisearch-head is a standalone webapp written in good-ol' html5. This means, you can put it up on any webserver, run it directly from the filesystem, use it on an iPad, or put it on a floppy disk and carry it with you.
-
-h4. URL Parameters
-
-Parameters may be appended to the url to set an initial state eg. @head/index.html?base_uri=http://node-01.example.com:9200@
-
-* @base_uri@ force elasticsearch-head to connect to a particular node.
-* @dashboard@ experimental feature to open elasticsearch-head in a mode suitable for dashboard / radiator. Accepts one parameter @dashboard=cluster@
-* @auth_user@ adds basic auth credentials to http requests ( requires "elasticsearch-http-basic":https://github.com/karussell/elasticsearch-http-basic plugin or a reverse proxy )
-* @auth_password@ basic auth password as above (note: without "additional security layers":http://security.stackexchange.com/questions/988/is-basic-auth-secure-if-done-over-https, passwords are sent over the network *in the clear* )
-
-h4. Contributing
-
-To contribute to elasticsearch-head you will need the following developer tools
-
-# git and a "github":https://github.com/ account
-# "node ( including npm )":http://nodejs.org/download
-# "grunt-cli":http://gruntjs.com/getting-started
-# (to run jasmine tests) "phantomjs":http://phantomjs.org
-
-Then
-
-# create a fork of elasticsearch-head on github
-# clone your fork to your machine
-# @cd elasticsearch-head@
-# @npm install@ # downloads node dev dependencies
-# @grunt dev@ # builds the distribution files, then watches the src directory for changes
-
-Changes to both _site and src directories *must* be committed, to allow people to 
-run elasticsearch-head without running dev tools and follow existing dev patterns, 
-such as indenting with tabs.
-
-h5. Contributing an Internationalisation
-
-
-* Chinese by "darkcount":https://github.com/hangxin1940
-* English (primary) by "Ben Birch":https://twitter.com/mobz
-* French by "David Pilato":https://twitter.com/dadoonet
-* Portuguese by "caiodangelo":https://github.com/caiodangelo
-* Turkish by "Cemre Mengu":https://github.com/cemremengu
-
-To contribute an internationalisation
-
-# Follow "Contributing" instructions above
-# Find your 2-character "ISO 639-1 language code":http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-# edit _site/index.html to add your 2 letter language code to the data-langs attribute of this line @<script src="_site/i18n.js" data-baseDir="_site/lang" data-langs="en,fr,your_lang_here"></script>@
-# make a copy of @src/app/langs/en_strings.js@ prefixed with your language code
-# convert english strings and fragments to your language. "Formatting Rules":http://docs.oracle.com/javase/tutorial/i18n/format/messageintro.html
-# Submit a pull request
-
-!http://mobz.github.com/elasticsearch-head/screenshots/clusterOverview.png(ClusterOverview Screenshot)!
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.css
deleted file mode 100644
index 2fa215229..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.css
+++ /dev/null
@@ -1,704 +0,0 @@
-TABLE.table {
-	border-collapse: collapse;
-}
-
-
-TABLE.table TH {
-	font-weight: normal;
-	text-align: left;
-	vertical-align: middle;
-}
-
-TABLE.table TBODY.striped TR:nth-child(odd) {
-	background: #eee;
-}
-
-TABLE.table H3 {
-	margin: 0;
-	font-weight: bold;
-	font-size: 140%;
-}
-
-.require { color: #a00; }
-
-.uiButton {
-	padding: 0;
-	border: 0;
-	margin: 3px;
-	width: auto;
-	overflow: visible;
-	cursor: pointer;
-	background: transparent;
-}
-
-.uiButton-content {
-	height: 20px;
-	border: 1px solid #668dc6;
-	border-radius: 2px;
-	background: #96c6eb;
-	background: -moz-linear-gradient(top, #96c6eb, #5296c7);
-	background: -webkit-linear-gradient(top, #96c6eb, #5296c7);
-	color: white;
-	font-weight: bold;
-}
-
-.moz .uiButton-content { margin: 0 -2px; }
-
-.uiButton-label {
-		padding: 2px 6px;
-		white-space: nowrap;
-}
-.uiButton:hover .uiButton-content {
-	background: #2777ba;
-	background: -moz-linear-gradient(top, #6aaadf, #2777ba);
-	background: -webkit-linear-gradient(top, #6aaadf, #2777ba);
-}
-.uiButton.active .uiButton-content,
-.uiButton:active .uiButton-content {
-	background: #2575b7;
-	background: -moz-linear-gradient(top, #2576b8, #2575b7);
-	background: -webkit-linear-gradient(top, #2576b8, #2575b7);
-}
-.uiButton.disabled .uiButton-content,
-.uiButton.disabled:active .uiButton-content {
-		border-color: #c6c6c6;
-		color: #999999;
-		background: #ddd;
-		background: -moz-linear-gradient(top, #ddd, #ddd);
-		background: -webkit-linear-gradient(top, #ddd, #ddd);
-}
-
-.uiButton.disabled {
-		cursor: default;
-}
-
-.uiMenuButton {
-	display: inline-block;
-}
-
-.uiMenuButton .uiButton-label {
-	background-image: url('data:image/gif;base64,R0lGODlhDwAPAIABAP///////yH5BAEAAAEALAAAAAAPAA8AAAITjI+py+0P4wG0gmavq1HLD4ZiAQA7');
-	background-position: right 50%;
-	background-repeat: no-repeat;
-	padding-right: 17px;
-	text-align: left;
-}
-
-.uiSplitButton {
-	white-space: nowrap;
-}
-
-.uiSplitButton .uiButton:first-child {
-	margin-right: 0;
-	display: inline-block;
-}
-
-.uiSplitButton .uiButton:first-child .uiButton-content {
-	border-right-width: 1;
-	border-right-color: #5296c7;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.uiSplitButton .uiMenuButton {
-	margin-left: 0;
-}
-
-.uiSplitButton .uiButton:last-child .uiButton-content {
-	border-radius: 2px;
-	border-left-width: 1;
-	border-left-color: #96c6eb;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-	height: 20px;
-}
-
-.uiSplitButton .uiButton:last-child .uiButton-label {
-	padding: 2px 17px 2px 6px;
-	margin-left: -8px;
-}
-
-.uiToolbar {
-	height: 28px;
-	background: #fdfefe;
-	background: -moz-linear-gradient(top, #fdfefe, #eaedef);
-	background: -webkit-linear-gradient(top, #fdfefe, #eaedef);
-	border-bottom: 1px solid #d2d5d7;
-	padding: 3px 10px;
-}
-
-.uiToolbar H2 {
-	display: inline-block;
-	font-size: 120%;
-	margin: 0;
-	padding: 5px 20px 5px 0;
-}
-
-.uiToolbar .uiTextField {
-	display: inline-block;
-}
-
-.uiToolbar .uiTextField INPUT {
-	padding-top: 2px;
-	padding-bottom: 5px;
-}
-#uiModal {
-	background: black;
-}
-
-.uiPanel {
-	box-shadow: -1px 2.5px 4px -3px black, -1px -2.5px 4px -3px black, 3px 2.5px 4px -3px black, 3px -2.5px 4px -3px black;
-	position: absolute;
-	background: #eee;
-	border: 1px solid #666;
-}
-
-.uiPanel-titleBar {
-	text-align: center;
-	font-weight: bold;
-	padding: 2px 0;
-	background: rgba(223, 223, 223, 0.75);
-	background: -moz-linear-gradient(top, rgba(223, 223, 223, 0.75), rgba(193, 193, 193, 0.75), rgba(223, 223, 223, 0.75));
-	background: -webkit-linear-gradient(top, rgba(223, 223, 223, 0.75), rgba(193, 193, 193, 0.75), rgba(223, 223, 223, 0.75));
-	border-bottom: 1px solid #bbb;
-}
-
-.uiPanel-close {
-	cursor: pointer;
-	border: 1px solid #aaa;
-	background: #fff;
-	color: #fff;
-	float: left;
-	height: 10px;
-	left: 3px;
-	line-height: 9px;
-	padding: 1px 0;
-	position: relative;
-	text-shadow: 0 0 1px #000;
-	top: 0px;
-	width: 12px;
-}
-.uiPanel-close:hover {
-	background: #eee;
-}
-
-.uiPanel-body {
-	overflow: auto;
-}
-
-
-.uiInfoPanel {
-	background: rgba(0, 0, 0, 0.75);
-	color: white;
-	border-radius: 8px;
-	padding: 1px;
-}
-.uiInfoPanel .uiPanel-titleBar {
-	background: rgba(74, 74, 74, 0.75);
-	background: -moz-linear-gradient(top, rgba(84, 84, 84, 0.75), rgba(54, 54, 54, 0.75), rgba(64, 64, 64, 0.75));
-	background: -webkit-linear-gradient(top, rgba(84, 84, 84, 0.75), rgba(54, 54, 54, 0.75), rgba(64, 64, 64, 0.75));
-	border-radius: 8px 8px 0 0;
-	padding: 1px 0 2px 0;
-	border-bottom: 0;
-}
-.uiInfoPanel .uiPanel-close {
-	border-radius: 6px;
-	height: 13px;
-	width: 13px;
-	background: #ccc;
-	left: 3px;
-	top: 1px;
-	color: #333;
-	text-shadow: #222 0 0 1px;
-	line-height: 11px;
-	border: 0;
-	padding: 0;
-}
-.uiInfoPanel .uiPanel-close:hover {
-	background: #eee;
-}
-
-.uiInfoPanel .uiPanel-body {
-	background: transparent;
-	padding: 20px;
-	border-radius: 0 0 8px 8px;
-	border: 1px solid #222;
-}
-
-.uiMenuPanel {
-	border: 1px solid #668dc6;
-	position: absolute;
-	background: #96c6eb;
-	color: white;
-}
-
-.uiMenuPanel LI {
-	list-style: none;
-	border-bottom: 1px solid #668dc6;
-}
-
-.uiMenuPanel LI:hover {
-	background: #2575b7;
-}
-
-.uiMenuPanel LI:last-child {
-	border-bottom: 0;
-} 
-
-.uiMenuPanel-label {
-	white-space: nowrap;
-	padding: 2px 10px 2px 10px;
-	cursor: pointer;
-}
-
-.disabled .uiMenuPanel-label {
-	cursor: auto;
-	color: #888;
-}
-
-.uiSelectMenuPanel .uiMenuPanel-label {
-	margin-left: 1em;
-	padding-left: 4px;
-}
-
-.uiSelectMenuPanel .uiMenuPanel-item.selected .uiMenuPanel-label:before {
-	content: "\2713";
-	width: 12px;
-	margin-left: -12px;
-	display: inline-block;
-}
-
-.uiTable TABLE {
-	border-collapse: collapse;
-}
-
-.uiTable-body {
-	overflow-y: scroll;
-	overflow-x: auto;
-}
-
-.uiTable-headers {
-	overflow-x: hidden;
-}
-
-.uiTable-body TD {
-	white-space: nowrap;
-}
-
-.uiTable-body .uiTable-header-row TH,
-.uiTable-body .uiTable-header-row TH DIV {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-.uiTable-body .uiTable-header-cell > DIV {
-	height: 0;
-	overflow: hidden;
-}
-
-.uiTable-headercell-menu {
-	float: right;
-}
-
-.uiTable-tools {
-	padding: 3px 4px;
-	height: 14px;
-}
-
-.uiTable-header-row {
-	background: #ddd;
-	background: -moz-linear-gradient(top, #eee, #ccc);
-	background: -webkit-linear-gradient(top, #eee, #ccc);
-}
-
-.uiTable-headercell-text {
-	margin-right: 20px;
-}
-
-.uiTable-headercell-menu {
-	display: none;
-}
-
-.uiTable-header-row TH {
-	border-right: 1px solid #bbb;
-	padding: 0;
-	text-align: left;
-}
-
-.uiTable-header-row TH > DIV {
-	padding: 3px 4px;
-	border-right: 1px solid #eee;
-}
-
-.uiTable-headerEndCap > DIV {
-	width: 19px;
-}
-
-.uiTable-header-row .uiTable-sort {
-	background: #ccc;
-	background: -moz-linear-gradient(top, #bebebe, #ccc);
-	background: -webkit-linear-gradient(top, #bebebe, #ccc);
-}
-.uiTable-header-row TH.uiTable-sort > DIV {
-	border-right: 1px solid #ccc;
-}
-
-.uiTable-sort .uiTable-headercell-menu {
-	display: block;
-}
-
-.uiTable TABLE TD {
-	border-right: 1px solid transparent;
-	padding: 3px 4px;
-}
-
-.uiTable-body TABLE TR:nth-child(even) {
-	background: #f3f3f3;
-}
-
-.uiTable-body TABLE TR.selected {
-	color: white;
-	background: #6060f1;
-}
-
-DIV.uiJsonPretty-object { font-size: 1.26em; font-family: monospace; }
-UL.uiJsonPretty-object,
-UL.uiJsonPretty-array { margin: 0; padding: 0 0 0 2em; list-style: none; }
-UL.uiJsonPretty-object LI,
-UL.uiJsonPretty-array LI { padding: 0; margin: 0; }
-.expando > SPAN.uiJsonPretty-name:before { content: "\25bc\a0"; color: #555; position: relative; top: 2px; }
-.expando.uiJsonPretty-minimised > SPAN.uiJsonPretty-name:before { content: "\25ba\a0"; top: 0; }
-.uiJsonPretty-minimised > UL SPAN.uiJsonPretty-name:before,
-.expando .uiJsonPretty-minimised > UL SPAN.uiJsonPretty-name:before { content: ""; }
-SPAN.uiJsonPretty-string,
-SPAN.uiJsonPretty-string A { color: green; }
-SPAN.uiJsonPretty-string A { text-decoration: underline;}
-SPAN.uiJsonPretty-number { color: blue; }
-SPAN.uiJsonPretty-null { color: red; }
-SPAN.uiJsonPretty-boolean { color: purple; }
-.expando > .uiJsonPretty-name { cursor: pointer; }
-.expando > .uiJsonPretty-name:hover { text-decoration: underline; }
-.uiJsonPretty-minimised { white-space: nowrap; overflow: hidden; }
-.uiJsonPretty-minimised > UL { opacity: 0.6; }
-.uiJsonPretty-minimised .uiJsonPretty-minimised > UL { opacity: 1; }
-.uiJsonPretty-minimised UL, .uiJsonPretty-minimised LI { display: inline; padding: 0; }
-
-
-.uiJsonPanel SPAN.uiJsonPretty-string { color: #6F6; }
-.uiJsonPanel SPAN.uiJsonPretty-number { color: #66F; }
-.uiJsonPanel SPAN.uiJsonPretty-null { color: #F66; }
-.uiJsonPanel SPAN.uiJsonPretty-boolean { color: #F6F; }
-
-.uiPanelForm-field {
-	display: block;
-	padding: 2px 0;
-	clear: both;
-}
-
-.uiPanelForm-label {
-	float: left;
-	width: 200px;
-	padding: 3px 7px;
-	text-align: right;
-}
-
-.uiSidebarSection-head {
-	background-color: #b9cfff;
-	background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAcCAMAAABifa5OAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAMAUExURQUCFf///wICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVVVVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+vr7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///2Oyy/cAAAACdFJOU/8A5bcwSgAAADxJREFUeNq8zzkOACAMA8Hd/3+agiuRcIsrRopIjArOoLK1QAMNNBCRPkhLyzkn35Bjfd7JR1Nr09NoDACnvgDl1zlzoQAAAABJRU5ErkJggg==');
-	background-repeat: no-repeat;
-	background-position: 2px 5px;
-	margin-bottom: 1px;
-	padding: 3px 3px 3px 17px;
-	cursor: pointer;
-}
-
-.shown > .uiSidebarSection-head {
-	background-position: 2px -13px;
-}
-
-.uiSidebarSection-body {
-	margin-bottom: 3px;
-	display: none;
-}
-
-.uiSidebarSection-help {
-	text-shadow: #228 1px 1px 2px;
-	color: blue;
-	cursor: pointer;
-}
-
-.uiSidebarSection-help:hover {
-	text-decoration: underline;
-}
-
-.uiQueryFilter {
-	width: 350px;
-	padding: 5px;
-	background: #d8e7ff;
-	background: -moz-linear-gradient(left, #d8e7ff, #e8f1ff);
-	background: -webkit-linear-gradient(left, #d8e7ff, #e8f1ff);
-}
-
-.uiQueryFilter DIV.uiQueryFilter-section {
-	margin-bottom: 5px;
-}
-
-.uiQueryFilter HEADER {
-	display: block;
-	font-variant: small-caps;
-	font-weight: bold;
-	margin: 5px 0;
-}
-
-.uiQueryFilter-aliases SELECT {
-	width: 100%;
-}
-
-.uiQueryFilter-booble {
-	cursor: pointer;
-	background: #e8f1ff;
-	border: 1px solid #e8f1ff;
-	border-radius: 5px;
-	padding: 1px 4px;
-	margin-bottom: 1px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.uiQueryFilter-booble.selected {
-	background: #dae3f0;
-	border-top: 1px solid #c8d4e6;
-	border-left: 1px solid #c8d4e6;
-	border-bottom: 1px solid #ffffff;
-	border-right: 1px solid #ffffff;
-}
-
-.uiQueryFilter-filterName {
-	background-color: #cbdfff;
-	margin-bottom: 4px;
-	padding: 3px;
-	cursor: pointer;
-}
-
-.uiQueryFilter-filters INPUT  {
-	width: 300px;
-}
-
-.uiQueryFilter-subMultiFields {
-	padding-left: 10px;
-}
-
-.uiQueryFilter-rangeHintFrom,
-.uiQueryFilter-rangeHintTo {
-	margin: 0;
-	opacity: 0.75;
-}
-.uiBrowser-filter {
-	float: left;
-}
-
-.uiBrowser-table {
-	margin-left: 365px;
-}
-
-.uiAnyRequest-request {
-	float: left;
-	width: 350px;
-	padding: 5px;
-	background: #d8e7ff;
-	background: -moz-linear-gradient(left, #d8e7ff, #e8f1ff);
-	background: -webkit-linear-gradient(left, #d8e7ff, #e8f1ff);
-}
-
-.uiAnyRequest-request INPUT[type=text],
-.uiAnyRequest-request TEXTAREA {
-	width: 340px;
-}
-
-.anyRequest INPUT[name=path] {
-	width: 259px;
-}
-
-.uiAnyRequest-out {
-	margin-left: 365px;
-}
-
-.uiAnyRequest-out P {
-	margin-top: 0;
-}
-
-.uiAnyRequest-jsonErr {
-	color: red;
-}
-
-.uiAnyRequest-history {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	max-height: 100px;
-	overflow-x: hidden;
-	overflow-y: auto;
-}
-
-.uiNodesView TH,
-.uiNodesView TD {
-	vertical-align: top;
-	padding: 2px 20px;
-}
-
-.uiNodesView TH.close,
-.uiNodesView TD.close {
-	color: #888;
-	background: #f2f2f2;
-}
-
-.uiNodesView .uiMenuButton .uiButton-content {
-	padding-right: 3px;
-	border-radius: 8px;
-	height: 14px;
-}
-
-.uiNodesView .uiMenuButton.active .uiButton-content,
-.uiNodesView .uiMenuButton:active .uiButton-content {
-	border-bottom-right-radius: 0px;
-	border-bottom-left-radius: 0px;
-}
-
-.uiNodesView .uiMenuButton .uiButton-label {
-	padding: 0px 17px 0px 7px;
-}
-
-.uiNodesView-hasAlias {
-	text-align: center;
-}
-.uiNodesView-hasAlias.max {
-	border-top-right-radius: 8px;
-	border-bottom-right-radius: 8px;
-}
-.uiNodesView-hasAlias.min {
-	border-top-left-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-.uiNodesView-hasAlias-remove {
-	float: right;
-	font-weight: bold;
-	cursor: pointer;
-}
-
-.uiNodesView TD.uiNodesView-icon {
-	padding: 20px 0px 15px 20px;
-}
-
-.uiNodesView-node:nth-child(odd) {
-	background: #eee;
-}
-
-.uiNodesView-routing {
-	position: relative;
-	min-width: 90px;
-}
-
-.uiNodesView-nullReplica,
-.uiNodesView-replica {
-	box-sizing: border-box;
-	cursor: pointer;
-	float: left;
-	height: 40px;
-	width: 35px;
-	margin: 4px;
-	border: 2px solid #444;
-	padding: 2px;
-	font-size: 32px;
-	line-height: 32px;
-	text-align: center;
-	letter-spacing: -5px;
-	text-indent: -7px;
-}
-
-.uiNodesView-replica.primary {
-	border-width: 4px;
-	line-height: 29px;
-}
-
-.uiNodesView-nullReplica {
-	border-color: transparent;
-}
-
-.uiNodesView-replica.state-UNASSIGNED { background: #eeeeee; color: #999; border-color: #666; float: none; display: inline-block; }
-.uiNodesView-replica.state-INITIALIZING { background: #dddc88; }
-.uiNodesView-replica.state-STARTED { background: #99dd88; }
-.uiNodesView-replica.state-RELOCATING { background: #dc88dd; }
-
-
-.uiClusterConnect-uri {
-	width: 280px;
-}
-
-.uiStructuredQuery {
-	padding: 10px;
-}
-
-.uiStructuredQuery-out {
-	min-height: 30px;
-}
-
-.uiFilterBrowser-row * {
-	margin-right: 0.4em;
-}
-
-.uiFilterBrowser-row BUTTON {
-	height: 22px;
-	position: relative;
-	top: 1px;
-}
-
-.uiHeader {
-	padding: 3px 10px;
-}
-
-.uiHeader-name, .uiHeader-status {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0 10px;
-}
-
-
-.uiApp-header {
-	background: #eee;
-	position: fixed;
-	width: 100%;
-	z-index: 9;
-}
-
-.uiApp-header H1 {
-	margin: -2px 0 -4px 0;
-	float: left;
-	padding-right: 25px;
-}
-
-.uiApp-headerMenu {
-	border-bottom: 1px solid #bbb;
-	padding: 0px 3px;
-	height: 22px;
-}
-
-.uiApp-headerMenu .active {
-	background: white;
-	border-bottom-color: white;
-}
-
-.uiApp-headerMenuItem {
-	border: 1px solid #bbb;
-	padding: 4px 8px 1px ;
-	margin: 2px 1px 0;
-	height: 14px;
-	cursor: pointer;
-}
-
-.uiApp-body {
-	padding: 51px 0px 0px 0px;
-}
-
-.uiApp-headerNewMenuItem {
-	color: blue;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.js
deleted file mode 100644
index 003fd65d5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/app.js
+++ /dev/null
@@ -1,4404 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function() {
-
-	var window = this,
-		$ = jQuery;
-
-	function ns( namespace ) {
-		return (namespace || "").split(".").reduce( function( space, name ) {
-			return space[ name ] || ( space[ name ] = { ns: ns } );
-		}, this );
-	}
-
-	var app = ns("app");
-
-	var acx = ns("acx");
-
-	/**
-	 * object iterator, returns an array with one element for each property of the object
-	 * @function
-	 */
-	acx.eachMap = function(obj, fn, thisp) {
-		var ret = [];
-		for(var n in obj) {
-			ret.push(fn.call(thisp, n, obj[n], obj));
-		}
-		return ret;
-	};
-
-	/**
-	 * augments the first argument with the properties of the second and subsequent arguments
-	 * like {@link $.extend} except that existing properties are not overwritten
-	 */
-	acx.augment = function() {
-		var args = Array.prototype.slice.call(arguments),
-			src = (args.length === 1) ? this : args.shift(),
-			augf = function(n, v) {
-				if(! (n in src)) {
-					src[n] = v;
-				}
-			};
-		for(var i = 0; i < args.length; i++) {
-			$.each(args[i], augf);
-		}
-		return src;
-	};
-
-	/**
-	 * tests whether the argument is an array
-	 * @function
-	 */
-	acx.isArray = $.isArray;
-
-	/**
-	 * tests whether the argument is an object
-	 * @function
-	 */
-	acx.isObject = function (value) {
-		return Object.prototype.toString.call(value) == "[object Object]";
-	};
-
-	/**
-	 * tests whether the argument is a function
-	 * @function
-	 */
-	acx.isFunction = $.isFunction;
-
-	/**
-	 * tests whether the argument is a date
-	 * @function
-	 */
-	acx.isDate = function (value) {
-		return Object.prototype.toString.call(value) == "[object Date]";
-	};
-
-	/**
-	 * tests whether the argument is a regexp
-	 * @function
-	 */
-	acx.isRegExp = function (value) {
-		return Object.prototype.toString.call(value) == "[object RegExp]";
-	};
-
-	/**
-	 * tests whether the value is blank or empty
-	 * @function
-	 */
-	acx.isEmpty = function (value, allowBlank) {
-		return value === null || value === undefined || ((acx.isArray(value) && !value.length)) || (!allowBlank ? value === '' : false);
-	};
-
-	/**
-	 * data type for performing chainable geometry calculations<br>
-	 * can be initialised x,y | {x, y} | {left, top}
-	 */
-	acx.vector = function(x, y) {
-		return new acx.vector.prototype.Init(x, y);
-	};
-
-	acx.vector.prototype = {
-		Init : function(x, y) {
-			x = x || 0;
-			this.y = isFinite(x.y) ? x.y : (isFinite(x.top) ? x.top : (isFinite(y) ? y : 0));
-			this.x = isFinite(x.x) ? x.x : (isFinite(x.left) ? x.left : (isFinite(x) ? x : 0));
-		},
-		
-		add : function(i, j) {
-			var d = acx.vector(i, j);
-			return new this.Init(this.x + d.x, this.y + d.y);
-		},
-		
-		sub : function(i, j) {
-			var d = acx.vector(i, j);
-			return new this.Init(this.x - d.x, this.y - d.y);
-		},
-		
-		addX : function(i) {
-			return new this.Init(this.x + i, this.y);
-		},
-		
-		addY : function(j) {
-			return new this.Init(this.x, this.y + j);
-		},
-
-		mod : function(fn) { // runs a function against the x and y values
-			return new this.Init({x: fn.call(this, this.x, "x"), y: fn.call(this, this.y, "y")});
-		},
-		
-		/** returns true if this is within a rectangle formed by the points p and q */
-		within : function(p, q) {
-			return ( this.x >= ((p.x < q.x) ? p.x : q.x) && this.x <= ((p.x > q.x) ? p.x : q.x) &&
-					this.y >= ((p.y < q.y) ? p.y : q.y) && this.y <= ((p.y > q.y) ? p.y : q.y) );
-		},
-		
-		asOffset : function() {
-			return { top: this.y, left: this.x };
-		},
-		
-		asSize : function() {
-			return { height: this.y, width: this.x };
-		}
-	};
-
-	acx.vector.prototype.Init.prototype = acx.vector.prototype;
-
-	/**
-	 * short cut functions for working with vectors and jquery.
-	 * Each function returns the equivalent jquery value in a two dimentional vector
-	 */
-	$.fn.vSize = function() { return acx.vector(this.width(), this.height()); };
-	$.fn.vOuterSize = function(margin) { return acx.vector(this.outerWidth(margin), this.outerHeight(margin)); };
-	$.fn.vScroll = function() { return acx.vector(this.scrollLeft(), this.scrollTop()); };
-	$.fn.vOffset = function() { return acx.vector(this.offset()); };
-	$.fn.vPosition = function() { return acx.vector(this.position()); };
-	$.Event.prototype.vMouse = function() { return acx.vector(this.pageX, this.pageY); };
-
-	/**
-	 * object extensions (ecma5 compatible)
-	 */
-	acx.augment(Object, {
-		keys: function(obj) {
-			var ret = [];
-			for(var n in obj) if(Object.prototype.hasOwnProperty.call(obj, n)) ret.push(n);
-			return ret;
-		}
-	});
-
-	/**
-	 * Array prototype extensions
-	 */
-	acx.augment(Array.prototype, {
-		'contains' : function(needle) {
-			return this.indexOf(needle) !== -1;
-		},
-
-		// returns a new array consisting of all the members that are in both arrays
-		'intersection' : function(b) {
-			var ret = [];
-			for(var i = 0; i < this.length; i++) {
-				if(b.contains(this[i])) {
-					ret.push(this[i]);
-				}
-			}
-			return ret;
-		},
-		
-		'remove' : function(value) {
-			var i = this.indexOf(value);
-			if(i !== -1) {
-				this.splice(i, 1);
-			}
-		}
-	});
-
-	/**
-	 * String prototype extensions
-	 */
-	acx.augment(String.prototype, {
-		'contains' : function(needle) {
-			return this.indexOf(needle) !== -1;
-		},
-
-		'equalsIgnoreCase' : function(match) {
-			return this.toLowerCase() === match.toLowerCase();
-		},
-
-		'escapeHtml' : function() {
-			return this.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-		},
-
-		'escapeJS' : function() {
-			var meta = {'"':'\\"', '\\':'\\\\', '/':'\\/', '\b':'\\b', '\f':'\\f', '\n':'\\n', '\r':'\\r', '\t':'\\t'},
-				xfrm = function(c) { return meta[c] || "\\u" + c.charCodeAt(0).toString(16).zeroPad(4); };
-			return this.replace(new RegExp('(["\\\\\x00-\x1f\x7f-\uffff])', 'g'), xfrm);
-		},
-
-		'escapeRegExp' : function() {
-			var ret = "", esc = "\\^$*+?.()=|{,}[]-";
-			for ( var i = 0; i < this.length; i++) {
-				ret += (esc.contains(this.charAt(i)) ? "\\" : "") + this.charAt(i);
-			}
-			return ret;
-		},
-		
-		'zeroPad' : function(len) {
-			return ("0000000000" + this).substring(this.length - len + 10);
-		}
-	});
-
-	$.fn.forEach = Array.prototype.forEach;
-
-	// joey / jquery integration
-	$.joey = function( obj ) {
-		return $( window.joey( obj ) );
-	};
-
-	window.joey.plugins.push( function( obj ) {
-		if( obj instanceof jQuery ) {
-			return obj[0];
-		}
-	});
-
-})();
-
-/**
- * base class for creating inheritable classes
- * based on resigs 'Simple Javascript Inheritance Class' (based on base2 and prototypejs)
- * modified with static super and auto config
- * @name Class
- * @constructor
- */
-(function( $, app ){
-
-	var ux = app.ns("ux");
-
-	var initializing = false, fnTest = /\b_super\b/;
-
-	ux.Class = function(){};
-
-	ux.Class.extend = function(prop) {
-		function Class() {
-			if(!initializing) {
-				var args = Array.prototype.slice.call(arguments);
-				this.config = $.extend( function(t) { // automatically construct a config object based on defaults and last item passed into the constructor
-					return $.extend(t._proto && t._proto() && arguments.callee(t._proto()) || {}, t.defaults);
-				} (this) , args.pop() );
-				this.init && this.init.apply(this, args); // automatically run the init function when class created
-			}
-		}
-
-		initializing = true;
-		var prototype = new this();
-		initializing = false;
-		
-		var _super = this.prototype;
-		prototype._proto = function() {
-			return _super;
-		};
-
-		for(var name in prop) {
-			prototype[name] = typeof prop[name] === "function" && typeof _super[name] === "function" && fnTest.test(prop[name]) ?
-				(function(name, fn){
-					return function() { this._super = _super[name]; return fn.apply(this, arguments); };
-				})(name, prop[name]) : prop[name];
-		}
-
-		Class.prototype = prototype;
-		Class.constructor = Class;
-
-		Class.extend = arguments.callee; // make class extendable
-
-		return Class;
-	};
-})( this.jQuery, this.app );
-
-(function( app ) {
-
-	var ut = app.ns("ut");
-
-	ut.option_template = function(v) { return { tag: "OPTION", value: v, text: v }; };
-
-	ut.require_template = function(f) { return f.require ? { tag: "SPAN", cls: "require", text: "*" } : null; };
-
-
-	var sib_prefix = ['B','ki','Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'];
-
-	ut.byteSize_template = function(n) {
-		var i = 0;
-		while( n >= 1000 ) {
-			i++;
-			n /= 1024;
-		}
-		return (i === 0 ? n.toString() : n.toFixed( 3 - parseInt(n,10).toString().length )) + ( sib_prefix[ i ] || "..E" );
-	};
-
-	var sid_prefix = ['','k','M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
-
-	ut.count_template = function(n) {
-		var i = 0;
-		while( n >= 1000 ) {
-			i++;
-			n /= 1000;
-		}
-		return i === 0 ? n.toString() : ( n.toFixed( 3 - parseInt(n,10).toString().length ) + ( sid_prefix[ i ] || "..E" ) );
-	};
-
-})( this.app );
-
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	ux.Observable = ux.Class.extend((function() {
-		return {
-			init: function() {
-				this.observers = {};
-				for( var opt in this.config ) { // automatically install observers that are defined in the configuration
-					if( opt.indexOf( 'on' ) === 0 ) {
-						this.on( opt.substring(2) , this.config[ opt ] );
-					}
-				}
-			},
-			_getObs: function( type ) {
-				return ( this.observers[ type.toLowerCase() ] || ( this.observers[ type.toLowerCase() ] = [] ) );
-			},
-			on: function( type, fn, params, thisp ) {
-				this._getObs( type ).push( { "cb" : fn, "args" : params || [] , "cx" : thisp || this } );
-				return this;
-			},
-			fire: function( type ) {
-				var params = Array.prototype.slice.call( arguments, 1 );
-				this._getObs( type ).slice().forEach( function( ob ) {
-					ob["cb"].apply( ob["cx"], ob["args"].concat( params ) );
-				} );
-				return this;
-			},
-			removeAllObservers: function() {
-				this.observers = {};
-			},
-			removeObserver: function( type, fn ) {
-				var obs = this._getObs( type ),
-					index = obs.reduce( function(p, t, i) { return (t.cb === fn) ? i : p; }, -1 );
-				if(index !== -1) {
-					obs.splice( index, 1 );
-				}
-				return this; // make observable functions chainable
-			},
-			hasObserver: function( type ) {
-				return !! this._getObs( type ).length;
-			}
-		};
-	})());
-
-})( this.app );
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	var extend = ux.Observable.extend;
-	var instance = function() {
-		if( ! ("me" in this) ) {
-			this.me = new this();
-		}
-		return this.me;
-	};
-
-	ux.Singleton = ux.Observable.extend({});
-
-	ux.Singleton.extend = function() {
-		var Self = extend.apply( this, arguments );
-		Self.instance = instance;
-		return Self;
-	};
-
-})( this.app );
-
-(function( $, app ) {
-
-	var ux = app.ns("ux");
-
-	/**
-	 * Provides drag and drop functionality<br>
-	 * a DragDrop instance is created for each usage pattern and then used over and over again<br>
-	 * first a dragObj is defined - this is the jquery node that will be dragged around<br>
-	 * second, the event callbacks are defined - these allow you control the ui during dragging and run functions when successfully dropping<br>
-	 * thirdly drop targets are defined - this is a list of DOM nodes, the constructor works in one of two modes:
-	 * <li>without targets - objects can be picked up and dragged around, dragStart and dragStop events fire</li>
-	 * <li>with targets - as objects are dragged over targets dragOver, dragOut and DragDrop events fire
-	 * to start dragging call the DragDrop.pickup_handler() function, dragging stops when the mouse is released.
-	 * @constructor
-	 * The following options are supported
-	 * <dt>targetSelector</dt>
-	 *   <dd>an argument passed directly to jquery to create a list of targets, as such it can be a CSS style selector, or an array of DOM nodes<br>if target selector is null the DragDrop does Drag only and will not fire dragOver dragOut and dragDrop events</dd>
-	 * <dt>pickupSelector</dt>
-	 *   <dd>a jquery selector. The pickup_handler is automatically bound to matched elements (eg clicking on these elements starts the drag). if pickupSelector is null, the pickup_handler must be manually bound <code>$(el).bind("mousedown", dragdrop.pickup_handler)</code></dd>
-	 * <dt>dragObj</dt>
-	 *   <dd>the jQuery element to drag around when pickup is called. If not defined, dragObj must be set in onDragStart</dd>
-	 * <dt>draggingClass</dt>
-	 *   <dd>the class(es) added to items when they are being dragged</dd>
-	 * The following observables are supported
-	 * <dt>dragStart</dt>
-	 *   <dd>a callback when start to drag<br><code>function(jEv)</code></dd>
-	 * <dt>dragOver</dt>
-	 *   <dd>a callback when we drag into a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragOut</dt>
-	 *   <dd>a callback when we drag out of a target, or when we drop over a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragDrop</dt>
-	 *   <dd>a callback when we drop on a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragStop</dt>
-	 *   <dd>a callback when we stop dragging<br><code>function(jEv)</code></dd>
-	 */
-	ux.DragDrop = ux.Observable.extend({
-		defaults : {
-			targetsSelector : null,
-			pickupSelector:   null,
-			dragObj :         null,
-			draggingClass :   "dragging"
-		},
-
-		init: function(options) {
-			this._super(); // call the class initialiser
-		
-			this.drag_handler = this.drag.bind(this);
-			this.drop_handler = this.drop.bind(this);
-			this.pickup_handler = this.pickup.bind(this);
-			this.targets = [];
-			this.dragObj = null;
-			this.dragObjOffset = null;
-			this.currentTarget = null;
-			if(this.config.pickupSelector) {
-				$(this.config.pickupSelector).bind("mousedown", this.pickup_handler);
-			}
-		},
-
-		drag : function(jEv) {
-			jEv.preventDefault();
-			var mloc = acx.vector( this.lockX || jEv.pageX, this.lockY || jEv.pageY );
-			this.dragObj.css(mloc.add(this.dragObjOffset).asOffset());
-			if(this.targets.length === 0) {
-				return;
-			}
-			if(this.currentTarget !== null && mloc.within(this.currentTarget[1], this.currentTarget[2])) {
-				return;
-			}
-			if(this.currentTarget !== null) {
-				this.fire('dragOut', this.currentTarget[0]);
-				this.currentTarget = null;
-			}
-			for(var i = 0; i < this.targets.length; i++) {
-				if(mloc.within(this.targets[i][1], this.targets[i][2])) {
-					this.currentTarget = this.targets[i];
-					break;
-				}
-			}
-			if(this.currentTarget !== null) {
-				this.fire('dragOver', this.currentTarget[0]);
-			}
-		},
-		
-		drop : function(jEv) {
-			$(document).unbind("mousemove", this.drag_handler);
-			$(document).unbind("mouseup", this.drop_handler);
-			this.dragObj.removeClass(this.config.draggingClass);
-			if(this.currentTarget !== null) {
-				this.fire('dragOut', this.currentTarget[0]);
-				this.fire('dragDrop', this.currentTarget[0]);
-			}
-			this.fire('dragStop', jEv);
-			this.dragObj = null;
-		},
-		
-		pickup : function(jEv, opts) {
-			$.extend(this.config, opts);
-			this.fire('dragStart', jEv);
-			this.dragObj = this.dragObj || this.config.dragObj;
-			this.dragObjOffset = this.config.dragObjOffset || acx.vector(this.dragObj.offset()).sub(jEv.pageX, jEv.pageY);
-			this.lockX = this.config.lockX ? jEv.pageX : 0;
-			this.lockY = this.config.lockY ? jEv.pageY : 0;
-			this.dragObj.addClass(this.config.draggingClass);
-			if(!this.dragObj.get(0).parentNode || this.dragObj.get(0).parentNode.nodeType === 11) { // 11 = document fragment
-				$(document.body).append(this.dragObj);
-			}
-			if(this.config.targetsSelector) {
-				this.currentTarget = null;
-				var targets = ( this.targets = [] );
-				// create an array of elements optimised for rapid collision detection calculation
-				$(this.config.targetsSelector).each(function(i, el) {
-					var jEl = $(el);
-					var tl = acx.vector(jEl.offset());
-					var br = tl.add(jEl.width(), jEl.height());
-					targets.push([jEl, tl, br]);
-				});
-			}
-			$(document).bind("mousemove", this.drag_handler);
-			$(document).bind("mouseup", this.drop_handler);
-			this.drag_handler(jEv);
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	ux.FieldCollection = ux.Observable.extend({
-		defaults: {
-			fields: []	// the collection of fields
-		},
-		init: function() {
-			this._super();
-			this.fields = this.config.fields;
-		},
-		validate: function() {
-			return this.fields.reduce(function(r, field) {
-				return r && field.validate();
-			}, true);
-		},
-		getData: function(type) {
-			return this.fields.reduce(function(r, field) {
-				r[field.name] = field.val(); return r;
-			}, {});
-		}
-	});
-
-})( this.app );
-
-(function( $, app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.Model = ux.Observable.extend({
-		defaults: {
-			data: null
-		},
-		init: function() {
-			this.set( this.config.data );
-		},
-		set: function( key, value ) {
-			if( arguments.length === 1 ) {
-				this._data = $.extend( {}, key );
-			} else {
-				key.split(".").reduce(function( ptr, prop, i, props) {
-					if(i === (props.length - 1) ) {
-						ptr[prop] = value;
-					} else {
-						if( !(prop in ptr) ) {
-							ptr[ prop ] = {};
-						}
-						return ptr[prop];
-					}
-				}, this._data );
-			}
-		},
-		get: function( key ) {
-			return key.split(".").reduce( function( ptr, prop ) {
-				return ( ptr && ( prop in ptr ) ) ? ptr[ prop ] : undefined;
-			}, this._data );
-		},
-	});
-})( this.jQuery, this.app );
-
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.DataSourceInterface = ux.Observable.extend({
-		/*
-		properties
-			meta = { total: 0 },
-			headers = [ { name: "" } ],
-			data = [ { column: value, column: value } ],
-			sort = { column: "name", dir: "desc" }
-		events
-			data: function( DataSourceInterface )
-		 */
-		_getSummary: function(res) {
-			this.summary = i18n.text("TableResults.Summary", res._shards.successful, res._shards.total, res.hits.total, (res.took / 1000).toFixed(3));
-		},
-		_getMeta: function(res) {
-			this.meta = { total: res.hits.total, shards: res._shards, tool: res.took };
-		}
-	});
-
-})( this.app );
-(function( app ) {
-
-	var data = app.ns("data");
-
-	data.ResultDataSourceInterface = data.DataSourceInterface.extend({
-		results: function(res) {
-			this._getSummary(res);
-			this._getMeta(res);
-			this._getData(res);
-			this.sort = {};
-			this.fire("data", this);
-		},
-		_getData: function(res) {
-			var columns = this.columns = [];
-			this.data = res.hits.hits.map(function(hit) {
-				var row = (function(path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(! columns.contains(dpath)) {
-								columns.push(dpath);
-							}
-							row[dpath] = (spec[prop] || "null").toString();
-						}
-					}
-					return row;
-				})([ hit._type ], hit, {});
-				row._source = hit;
-				return row;
-			}, this);
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	/*
-	notes on elasticsearch terminology used in this project
-
-	indices[index] contains one or more
-	types[type] contains one or more
-	documents contain one or more
-	paths[path]
-	each path contains one element of data
-	each path maps to one field
-
-	eg PUT, "/twitter/tweet/1"
-	{
-		user: "mobz",
-		date: "2011-01-01",
-		message: "You know, for browsing elasticsearch",
-		name: {
-			first: "Ben",
-			last: "Birch"
-		}
-	}
-
-	creates
-		1 index: twitter
-				this is the collection of index data
-		1 type: tweet
-				this is the type of document (kind of like a table in sql)
-		1 document: /twitter/tweet/1
-				this is an actual document in the index ( kind of like a row in sql)
-		5 paths: [ ["user"], ["date"], ["message"], ["name","first"], ["name","last"] ]
-				since documents can be heirarchical this maps a path from a document root to a piece of data
-		5 fields: [ "user", "date", "message", "first", "last" ]
-				this is an indexed 'column' of data. fields are not heirarchical
-
-		the relationship between a path and a field is called a mapping. mappings also contain a wealth of information about how es indexes the field
-
-	notes
-	1) a path is stored as an array, the dpath is  <index> . <type> . path.join("."),
-			which can be considered the canonical reference for a mapping
-	2) confusingly, es uses the term index for both the collection of indexed data, and the individually indexed fields
-			so the term index_name is the same as field_name in this sense.
-
-	*/
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	var coretype_map = {
-		"string" : "string",
-		"keyword" : "string",
-		"text" : "string",
-		"byte" : "number",
-		"short" : "number",
-		"long" : "number",
-		"integer" : "number",
-		"float" : "number",
-		"double" : "number",
-		"ip" : "number",
-		"date" : "date",
-		"boolean" : "boolean",
-		"binary" : "binary",
-		"multi_field" : "multi_field"
-	};
-
-	var default_property_map = {
-		"string" : { "store" : "no", "index" : "analysed" },
-		"number" : { "store" : "no", "precision_steps" : 4 },
-		"date" : { "store" : "no", "format" : "dateOptionalTime", "index": "yes", "precision_steps": 4 },
-		"boolean" : { "store" : "no", "index": "yes" },
-		"binary" : { },
-		"multi_field" : { }
-	};
-
-	// parses metatdata from a cluster, into a bunch of useful data structures
-	data.MetaData = ux.Observable.extend({
-		defaults: {
-			state: null // (required) response from a /_cluster/state request
-		},
-		init: function() {
-			this._super();
-			this.refresh(this.config.state);
-		},
-		getIndices: function(alias) {
-			return alias ? this.aliases[alias] : this.indicesList;
-		},
-		// returns an array of strings containing all types that are in all of the indices passed in, or all types
-		getTypes: function(indices) {
-			var indices = indices || [], types = [];
-			this.typesList.forEach(function(type) {
-				for(var i = 0; i < indices.length; i++) {
-					if(! this.indices[indices[i]].types.contains(type))
-						return;
-				}
-				types.push(type);
-			}, this);
-			return types;
-		},
-		refresh: function(state) {
-			// currently metadata expects all like named fields to have the same type, even when from different types and indices
-			var aliases = this.aliases = {};
-			var indices = this.indices = {};
-			var types = this.types = {};
-			var fields = this.fields = {};
-			var paths = this.paths = {};
-
-			function createField( mapping, index, type, path, name ) {
-				var dpath = [ index, type ].concat( path ).join( "." );
-				var field_name = mapping.index_name || path.join( "." );
-				var field = paths[ dpath ] = fields[ field_name ] || $.extend({
-					field_name : field_name,
-					core_type : coretype_map[ mapping.type ],
-					dpaths : []
-				}, default_property_map[ coretype_map[ mapping.type ] ], mapping );
-
-				if (field.type === "multi_field" && typeof field.fields !== "undefined") {
-					for (var subField in field.fields) {
-						field.fields[ subField ] = createField( field.fields[ subField ], index, type, path.concat( subField ), name + "." + subField );
-					}
-				}
-				if (fields.dpaths) {
-					field.dpaths.push(dpath);
-				}
-				return field;
-			}
-			function getFields(properties, type, index, listeners) {
-				(function procPath(prop, path) {
-					for (var n in prop) {
-						if ("properties" in prop[n]) {
-							procPath( prop[ n ].properties, path.concat( n ) );
-						} else {
-							var field = createField(prop[n], index, type, path.concat(n), n);							
-							listeners.forEach( function( listener ) {
-								listener[ field.field_name ] = field;
-							} );
-						}
-					}
-				})(properties, []);
-			}
-			for (var index in state.metadata.indices) {
-				indices[index] = {
-					types : [], fields : {}, paths : {}, parents : {}
-				};
-				indices[index].aliases = state.metadata.indices[index].aliases;
-				indices[index].aliases.forEach(function(alias) {
-					(aliases[alias] || (aliases[alias] = [])).push(index);
-				});
-				var mapping = state.metadata.indices[index].mappings;
-				for (var type in mapping) {
-					indices[index].types.push(type);
-					if ( type in types) {
-						types[type].indices.push(index);
-					} else {
-						types[type] = {
-							indices : [index], fields : {}
-						};
-					}
-					getFields(mapping[type].properties, type, index, [fields, types[type].fields, indices[index].fields]);
-					if ( typeof mapping[type]._parent !== "undefined") {
-						indices[index].parents[type] = mapping[type]._parent.type;
-					}
-				}
-			}
-
-			this.aliasesList = Object.keys(aliases);
-			this.indicesList = Object.keys(indices);
-			this.typesList = Object.keys(types);
-			this.fieldsList = Object.keys(fields);
-		}
-	});
-
-})( this.app );	
-
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.MetaDataFactory = ux.Observable.extend({
-		defaults: {
-			cluster: null // (required) an app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.config.cluster.get("_cluster/state", function(data) {
-				this.metaData = new app.data.MetaData({state: data});
-				this.fire("ready", this.metaData,  { originalData: data }); // TODO originalData needed for legacy ui.FilterBrowser
-			}.bind(this));
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.Query = ux.Observable.extend({
-		defaults: {
-			cluster: null,  // (required) instanceof app.services.Cluster
-			size: 50        // size of pages to return
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.refuid = 0;
-			this.refmap = {};
-			this.indices = [];
-			this.types = [];
-			this.search = {
-				query: { bool: { must: [], must_not: [], should: [] } },
-				from: 0,
-				size: this.config.size,
-				sort: [],
-				aggs: {},
-				version: true
-			};
-			this.defaultClause = this.addClause();
-			this.history = [ this.getState() ];
-		},
-		clone: function() {
-			var q = new data.Query({ cluster: this.cluster });
-			q.restoreState(this.getState());
-			for(var uqid in q.refmap) {
-				q.removeClause(uqid);
-			}
-			return q;
-		},
-		getState: function() {
-			return $.extend(true, {}, { search: this.search, indices: this.indices, types: this.types });
-		},
-		restoreState: function(state) {
-			state = $.extend(true, {}, state || this.history[this.history.length - 1]);
-			this.indices = state.indices;
-			this.types = state.types;
-			this.search = state.search;
-		},
-		getData: function() {
-			return JSON.stringify(this.search);
-		},
-		query: function() {
-			var state = this.getState();
-			this.cluster.post(
-					(this.indices.join(",") || "_all") + "/" + ( this.types.length ? this.types.join(",") + "/" : "") + "_search",
-					this.getData(),
-					function(results) {
-						if(results === null) {
-							alert(i18n.text("Query.FailAndUndo"));
-							this.restoreState();
-							return;
-						}
-						this.history.push(state);
-
-						this.fire("results", this, results);
-					}.bind(this));
-		},
-		loadParents: function(res,metadata){
-			//create data for mget
-			var data = { docs :[] };
-			var indexToTypeToParentIds = {};
-			res.hits.hits.forEach(function(hit) {
-			if (typeof hit.fields != "undefined"){
-				if (typeof hit.fields._parent != "undefined"){
-					var parentType = metadata.indices[hit._index].parents[hit._type];
-					if (typeof indexToTypeToParentIds[hit._index] == "undefined"){
-						indexToTypeToParentIds[hit._index] = new Object();
-					}
-					if (typeof indexToTypeToParentIds[hit._index][hit._type] == "undefined"){
-						indexToTypeToParentIds[hit._index][hit._type] = new Object();
-					}
-					if (typeof indexToTypeToParentIds[hit._index][hit._type][hit.fields._parent] == "undefined"){
-						indexToTypeToParentIds[hit._index][hit._type][hit.fields._parent] = null;
-						data.docs.push({ _index:hit._index, _type:parentType, _id:hit.fields._parent});
-					}
-				}
-			}
-		});
-
-		//load parents
-		var state = this.getState();
-			this.cluster.post("_mget",JSON.stringify(data),
-				function(results) {
-					if(results === null) {
-						alert(i18n.text("Query.FailAndUndo"));
-						this.restoreState();
-						return;
-					}
-					this.history.push(state);
-					var indexToTypeToParentIdToHit = new Object();
-					results.docs.forEach(function(doc) {
-						if (typeof indexToTypeToParentIdToHit[doc._index] == "undefined"){
-						indexToTypeToParentIdToHit[doc._index] = new Object();
-					}
-					
-					if (typeof indexToTypeToParentIdToHit[doc._index][doc._type] == "undefined"){
-						indexToTypeToParentIdToHit[doc._index][doc._type] = new Object();
-					}
-					
-					indexToTypeToParentIdToHit[doc._index][doc._type][doc._id] = doc;
-					});
-					
-					res.hits.hits.forEach(function(hit) {
-						if (typeof hit.fields != "undefined"){
-							if (typeof hit.fields._parent != "undefined"){
-								var parentType = metadata.indices[hit._index].parents[hit._type];
-								hit._parent = indexToTypeToParentIdToHit[hit._index][parentType][hit.fields._parent];
-							}
-						}
-					});
-
-					this.fire("resultsWithParents", this, res);
-				}.bind(this));
-		},
-		setPage: function(page) {
-			this.search.from = this.config.size * (page - 1);
-		},
-		setSort: function(index, desc) {
-			var sortd = {}; sortd[index] = { reverse: !!desc };
-			this.search.sort.unshift( sortd );
-			for(var i = 1; i < this.search.sort.length; i++) {
-				if(Object.keys(this.search.sort[i])[0] === index) {
-					this.search.sort.splice(i, 1);
-					break;
-				}
-			}
-		},
-		setIndex: function(index, add) {
-			if(add) {
-				if(! this.indices.contains(index)) this.indices.push(index);
-			} else {
-				this.indices.remove(index);
-			}
-			this.fire("setIndex", this, { index: index, add: !!add });
-		},
-		setType: function(type, add) {
-			if(add) {
-				if(! this.types.contains(type)) this.types.push(type);
-			} else {
-				this.types.remove(type);
-			}
-			this.fire("setType", this, { type: type, add: !!add });
-		},
-		addClause: function(value, field, op, bool) {
-			bool = bool || "should";
-			op = op || "match_all";
-			field = field || "_all";
-			var clause = this._setClause(value, field, op, bool);
-			var uqid = "q-" + this.refuid++;
-			this.refmap[uqid] = { clause: clause, value: value, field: field, op: op, bool: bool };
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length > 1) {
-				this.removeClause(this.defaultClause);
-			}
-			this.fire("queryChanged", this, { uqid: uqid, search: this.search} );
-			return uqid; // returns reference to inner query object to allow fast updating
-		},
-		removeClause: function(uqid) {
-			var ref = this.refmap[uqid],
-				bool = this.search.query.bool[ref.bool];
-			bool.remove(ref.clause);
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length === 0) {
-				this.defaultClause = this.addClause();
-			}
-		},
-		addAggs: function(aggs) {
-			var aggsId = "f-" + this.refuid++;
-			this.search.aggs[aggsId] = aggs;
-			this.refmap[aggsId] = { aggsId: aggsId, aggs: aggs };
-			return aggsId;
-		},
-		removeAggs: function(aggsId) {
-			delete this.search.aggs[aggsId];
-			delete this.refmap[aggsId];
-		},
-		_setClause: function(value, field, op, bool) {
-			var clause = {}, query = {};
-			if(op === "match_all") {
-			} else if(op === "query_string") {
-				query["default_field"] = field;
-				query["query"] = value;
-			} else if(op === "missing") {
-				op = "constant_score"
-				var missing = {}, filter = {};
-				missing["field"] = field;
-				filter["missing"] = missing
-				query["filter"] = filter;
-			} else {
-				query[field] = value;
-			}
-			clause[op] = query;
-			this.search.query.bool[bool].push(clause);
-			return clause;
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var data = app.ns("data");
-
-	data.QueryDataSourceInterface = data.DataSourceInterface.extend({
-		defaults: {
-			metadata: null, // (required) instanceof app.data.MetaData, the cluster metadata
-			query: null     // (required) instanceof app.data.Query the data source
-		},
-		init: function() {
-			this._super();
-			this.config.query.on("results", this._results_handler.bind(this) );
-			this.config.query.on("resultsWithParents", this._load_parents.bind(this) );
-		},
-		_results_handler: function(query, res) {
-			this._getSummary(res);
-			this._getMeta(res);
-			var sort = query.search.sort[0] || { "_score": { reverse: false }};
-			var sortField = Object.keys(sort)[0];
-			this.sort = { column: sortField, dir: (sort[sortField].reverse ? "asc" : "desc") };
-			this._getData(res, this.config.metadata);
-			this.fire("data", this);
-		},
-		_load_parents: function(query, res) {
-			query.loadParents(res, this.config.metadata);
-		},
-		_getData: function(res, metadata) {
-			var metaColumns = ["_index", "_type", "_id", "_score"];
-			var columns = this.columns = [].concat(metaColumns);
-
-			this.data = res.hits.hits.map(function(hit) {
-				var row = (function(path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(metadata.paths[dpath]) {
-								var field_name = metadata.paths[dpath].field_name;
-								if(! columns.contains(field_name)) {
-									columns.push(field_name);
-								}
-								row[field_name] = (spec[prop] === null ? "null" : spec[prop] ).toString();
-							} else {
-								// TODO: field not in metadata index
-							}
-						}
-					}
-					return row;
-				})([ hit._index, hit._type ], hit._source, {});
-				metaColumns.forEach(function(n) { row[n] = hit[n]; });
-				row._source = hit;
-				if (typeof hit._parent!= "undefined") {
-					(function(prefix, path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(prefix, path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(prefix, path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(metadata.paths[dpath]) {
-								var field_name = metadata.paths[dpath].field_name;
-								var column_name = prefix+"."+field_name;
-								if(! columns.contains(column_name)) {
-									columns.push(column_name);
-								}
-								row[column_name] = (spec[prop] === null ? "null" : spec[prop] ).toString();
-							} else {
-								// TODO: field not in metadata index
-							}
-						}
-					}
-					})(hit._parent._type,[hit._parent._index, hit._parent._type], hit._parent._source, row);
-				}
-				return row;
-			}, this);
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.BoolQuery = ux.Observable.extend({
-		defaults: {
-			size: 50		// size of pages to return
-		},
-		init: function() {
-			this._super();
-			this.refuid = 0;
-			this.refmap = {};
-			this.search = {
-				query: { bool: { must: [], must_not: [], should: [] } },
-				from: 0,
-				size: this.config.size,
-				sort: [],
-				aggs: {}
-			};
-			this.defaultClause = this.addClause();
-		},
-		setSize: function(size) {
-			this.search.size = parseInt( size, 10 );
-		},
-		setPage: function(page) {
-			this.search.from = this.config.size * (page - 1) + 1;
-		},
-		addClause: function(value, field, op, bool) {
-			bool = bool || "should";
-			op = op || "match_all";
-			field = field || "_all";
-			var clause = this._setClause(value, field, op, bool);
-			var uqid = "q-" + this.refuid++;
-			this.refmap[uqid] = { clause: clause, value: value, field: field, op: op, bool: bool };
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length > 1) {
-				this.removeClause(this.defaultClause);
-			}
-			this.fire("queryChanged", this, { uqid: uqid, search: this.search} );
-			return uqid; // returns reference to inner query object to allow fast updating
-		},
-		removeClause: function(uqid) {
-			var ref = this.refmap[uqid],
-				bool = this.search.query.bool[ref.bool];
-			var clauseIdx = bool.indexOf(ref.clause);
-			// Check that this clause hasn't already been removed
-			if (clauseIdx >=0) {
-				bool.splice(clauseIdx, 1);
-			}
-		},
-		_setClause: function(value, field, op, bool) {
-			var clause = {}, query = {};
-			if(op === "match_all") {
-			} else if(op === "query_string") {
-				query["default_field"] = field;
-				query["query"] = value;
-			} else if(op === "missing") {
-				op = "constant_score"
-				var missing = {}, filter = {};
-				missing["field"] = field;
-				filter["missing"] = missing
-				query["filter"] = filter;
-			} else {
-				query[field.substring(field.indexOf(".")+1)] = value;
-			}
-			clause[op] = query;
-			this.search.query.bool[bool].push(clause);
-			return clause;
-		},
-		getData: function() {
-			return JSON.stringify(this.search);
-		}
-	});
-
-})( this.app );
-(function( app ) {
-	
-	var ux = app.ns("ux");
-	var services = app.ns("services");
-
-	services.Preferences = ux.Singleton.extend({
-		init: function() {
-			this._storage = window.localStorage;
-			this._setItem("__version", 1 );
-		},
-		get: function( key ) {
-			return this._getItem( key );
-		},
-		set: function( key, val ) {
-			return this._setItem( key, val );
-		},
-		_getItem: function( key ) {
-			try {
-				return JSON.parse( this._storage.getItem( key ) );
-			} catch(e) {
-				console.warn( e );
-				return undefined;
-			}
-		},
-		_setItem: function( key, val ) {
-			try {
-				return this._storage.setItem( key, JSON.stringify( val ) );
-			} catch(e) {
-				console.warn( e );
-				return undefined;
-			}
-		}
-	});
-
-})( this.app );
-
-(function( $, app ) {
-
-	var services = app.ns("services");
-	var ux = app.ns("ux");
-
-	function parse_version( v ) {
-		return v.match(/^(\d+)\.(\d+)\.(\d+)/).slice(1,4).map( function(d) { return parseInt(d || 0, 10); } );
-	}
-
-	services.Cluster = ux.Class.extend({
-		defaults: {
-			base_uri: null
-		},
-		init: function() {
-			this.base_uri = this.config.base_uri;
-		},
-		setVersion: function( v ) {
-			this.version = v;
-			this._version_parts = parse_version( v );
-		},
-		versionAtLeast: function( v ) {
-			var testVersion = parse_version( v );
-			for( var i = 0; i < 3; i++ ) {
-				if( testVersion[i] !== this._version_parts[i] ) {
-					return testVersion[i] < this._version_parts[i];
-				}
-			}
-			return true;
-		},
-		request: function( params ) {
-			return $.ajax( $.extend({
-				url: this.base_uri + params.path,
-				dataType: "json",
-				error: function(xhr, type, message) {
-					if("console" in window) {
-						console.log({ "XHR Error": type, "message": message });
-					}
-				}
-			},  params) );
-		},
-		"get": function(path, success) { return this.request( { type: "GET", path: path, success: success } ); },
-		"post": function(path, data, success) { return this.request( { type: "POST", path: path, data: data, success: success } ); },
-		"put": function(path, data, success) { return this.request( { type: "PUT", path: path, data: data, success: success } ); },
-		"delete": function(path, data, success) { return this.request( { type: "DELETE", path: path, data: data, success: success } ); }
-	});
-
-})( this.jQuery, this.app );
-
-	(function( app ) {
-
-	var services = app.ns("services");
-	var ux = app.ns("ux");
-
-	services.ClusterState = ux.Observable.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.clusterState = null;
-			this.status = null;
-			this.nodeStats = null;
-			this.clusterNodes = null;
-		},
-		refresh: function() {
-			var self = this, clusterState, status, nodeStats, clusterNodes, clusterHealth;
-			function updateModel() {
-				if( clusterState && status && nodeStats && clusterNodes && clusterHealth ) {
-					this.clusterState = clusterState;
-					this.status = status;
-					this.nodeStats = nodeStats;
-					this.clusterNodes = clusterNodes;
-					this.clusterHealth = clusterHealth;
-					this.fire( "data", this );
-				}
-			}
-			this.cluster.get("_cluster/state", function( data ) {
-				clusterState = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_stats", function( data ) {
-				status = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_nodes/stats", function( data ) {
-				nodeStats = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_nodes", function( data ) {
-				clusterNodes = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_cluster/health", function( data ) {
-				clusterHealth = data;
-				updateModel.call( self );
-			});
-		},
-		_clusterState_handler: function(state) {
-			this.clusterState = state;
-			this.redraw("clusterState");
-		},
-		_status_handler: function(status) {
-			this.status = status;
-			this.redraw("status");
-		},
-		_clusterNodeStats_handler: function(stats) {
-			this.nodeStats = stats;
-			this.redraw("nodeStats");
-		},
-		_clusterNodes_handler: function(nodes) {
-			this.clusterNodes = nodes;
-			this.redraw("clusterNodes");
-		},
-		_clusterHealth_handler: function(health) {
-			this.clusterHealth = health;
-			this.redraw("status");
-		}
-	});
-
-})( this.app );
-
-(function( $, joey, app ) {
-
-	var ui = app.ns("ui");
-	var ux = app.ns("ux");
-
-	ui.AbstractWidget = ux.Observable.extend({
-		defaults : {
-			id: null     // the id of the widget
-		},
-
-		el: null,       // this is the jquery wrapped dom element(s) that is the root of the widget
-
-		init: function() {
-			this._super();
-			for(var prop in this) {       // automatically bind all the event handlers
-				if(prop.contains("_handler")) {
-					this[prop] = this[prop].bind(this);
-				}
-			}
-		},
-
-		id: function(suffix) {
-			return this.config.id ? (this.config.id + (suffix ? "-" + suffix : "")) : undefined;
-		},
-
-		attach: function( parent, method ) {
-			if( parent ) {
-				this.el[ method || "appendTo"]( parent );
-			}
-			this.fire("attached", this );
-			return this;
-		},
-
-		remove: function() {
-			this.el.remove();
-			this.fire("removed", this );
-			this.removeAllObservers();
-			this.el = null;
-			return this;
-		}
-	});
-
-	joey.plugins.push( function( obj ) {
-		if( obj instanceof ui.AbstractWidget ) {
-			return obj.el[0];
-		}
-	});
-
-})( this.jQuery, this.joey, this.app );
-
-(function( $, app, joey ) {
-
-	var ui = app.ns("ui");
-
-	ui.AbstractField = ui.AbstractWidget.extend({
-
-		defaults: {
-			name : "",			// (required) - name of the field
-			require: false,	// validation requirements (false, true, regexp, function)
-			value: "",			// default value
-			label: ""				// human readable label of this field
-		},
-
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-			this.field = this.el.find("[name="+this.config.name+"]");
-			this.label = this.config.label;
-			this.require = this.config.require;
-			this.name = this.config.name;
-			this.val( this.config.value );
-			this.attach( parent );
-		},
-
-		val: function( val ) {
-			if(val === undefined) {
-				return this.field.val();
-			} else {
-				this.field.val( val );
-				return this;
-			}
-		},
-
-		validate: function() {
-			var val = this.val(), req = this.require;
-			if( req === false ) {
-				return true;
-			} else if( req === true ) {
-				return val.length > 0;
-			} else if( req.test && $.isFunction(req.test) ) {
-				return req.test( val );
-			} else if( $.isFunction(req) ) {
-				return req( val, this );
-			}
-		}
-
-	});
-
-})( this.jQuery, this.app, this.joey );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.TextField = ui.AbstractField.extend({
-		init: function() {
-			this._super();
-		},
-		_keyup_handler: function() {
-			this.fire("change", this );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiField uiTextField", children: [
-				{ tag: "INPUT",
-					type: "text",
-					name: this.config.name,
-					placeholder: this.config.placeholder,
-					onkeyup: this._keyup_handler
-				}
-			]};
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.CheckField = ui.AbstractField.extend({
-		_main_template: function() { return (
-			{ tag: "DIV", id: this.id(), cls: "uiCheckField", children: [
-				{ tag: "INPUT", type: "checkbox", name: this.config.name, checked: !!this.config.value }
-			] }
-		); },
-		validate: function() {
-			return this.val() || ( ! this.require );
-		},
-		val: function( val ) {
-			if( val === undefined ) {
-				return !!this.field.attr( "checked" );
-			} else {
-				this.field.attr( "checked", !!val );
-			}
-		}
-	});
-
-})( this.app );
-
-
-
-(function( $, joey, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Button = ui.AbstractWidget.extend({
-		defaults : {
-			label: "",                 // the label text
-			disabled: false,           // create a disabled button
-			autoDisable: false         // automatically disable the button when clicked
-		},
-
-		_baseCls: "uiButton",
-
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this.button_template())
-				.bind("click", this.click_handler);
-			this.config.disabled && this.disable();
-			this.attach( parent );
-		},
-
-		click_handler: function(jEv) {
-			if(! this.disabled) {
-				this.fire("click", jEv, this);
-				this.config.autoDisable && this.disable();
-			}
-		},
-
-		enable: function() {
-			this.el.removeClass("disabled");
-			this.disabled = false;
-			return this;
-		},
-
-		disable: function(disable) {
-			if(disable === false) {
-					return this.enable();
-			}
-			this.el.addClass("disabled");
-			this.disabled = true;
-			return this;
-		},
-
-		button_template: function() { return (
-			{ tag: 'BUTTON', type: 'button', id: this.id(), cls: this._baseCls, children: [
-				{ tag: 'DIV', cls: 'uiButton-content', children: [
-					{ tag: 'DIV', cls: 'uiButton-label', text: this.config.label }
-				] }
-			] }
-		); }
-	});
-
-})( this.jQuery, this.joey, this.app );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.MenuButton = app.ui.Button.extend({
-		defaults: {
-			menu: null
-		},
-		_baseCls: "uiButton uiMenuButton",
-		init: function(parent) {
-			this._super(parent);
-			this.menu = this.config.menu;
-			this.on("click", this.openMenu_handler);
-			this.menu.on("open", function() { this.el.addClass("active"); }.bind(this));
-			this.menu.on("close", function() { this.el.removeClass("active"); }.bind(this));
-		},
-		openMenu_handler: function(jEv) {
-			this.menu && this.menu.open(jEv);
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.SplitButton = ui.AbstractWidget.extend({
-		defaults: {
-			items: [],
-			label: ""
-		},
-		_baseCls: "uiSplitButton",
-		init: function( parent ) {
-			this._super( parent );
-			this.value = null;
-			this.button = new ui.Button({
-				label: this.config.label,
-				onclick: this._click_handler
-			});
-			this.menu = new ui.SelectMenuPanel({
-				value: this.config.value,
-				items: this._getItems(),
-				onSelect: this._select_handler
-			});
-			this.menuButton = new ui.MenuButton({
-				label: "\u00a0",
-				menu: this.menu
-			});
-			this.el = $.joey(this._main_template());
-		},
-		remove: function() {
-			this.menu.remove();
-		},
-		disable: function() {
-			this.button.disable();
-		},
-		enable: function() {
-			this.button.enable();
-		},
-		_click_handler: function() {
-			this.fire("click", this, { value: this.value } );
-		},
-		_select_handler: function( panel, event ) {
-			this.fire( "select", this, event );
-		},
-		_getItems: function() {
-			return this.config.items;
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: [
-				this.button, this.menuButton
-			] };
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.RefreshButton = ui.SplitButton.extend({
-		defaults: {
-			timer: -1
-		},
-		init: function( parent ) {
-			this.config.label = i18n.text("General.RefreshResults");
-			this._super( parent );
-			this.set( this.config.timer );
-		},
-		set: function( value ) {
-			this.value = value;
-			window.clearInterval( this._timer );
-			if( this.value > 0 ) {
-				this._timer = window.setInterval( this._refresh_handler, this.value );
-			}
-		},
-		_click_handler: function() {
-			this._refresh_handler();
-		},
-		_select_handler: function( el, event ) {
-			this.set( event.value );
-			this.fire("change", this );
-		},
-		_refresh_handler: function() {
-			this.fire("refresh", this );
-		},
-		_getItems: function() {
-			return [
-				{ text: i18n.text("General.ManualRefresh"), value: -1 },
-				{ text: i18n.text("General.RefreshQuickly"), value: 100 },
-				{ text: i18n.text("General.Refresh5seconds"), value: 5000 },
-				{ text: i18n.text("General.Refresh1minute"), value: 60000 }
-			];
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Toolbar = ui.AbstractWidget.extend({
-		defaults: {
-			label: "",
-			left: [],
-			right: []
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiToolbar", children: [
-				{ tag: "DIV", cls: "pull-left", children: [
-					{ tag: "H2", text: this.config.label }
-				].concat(this.config.left) },
-				{ tag: "DIV", cls: "pull-right", children: this.config.right }
-			]};
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.AbstractPanel = ui.AbstractWidget.extend({
-		defaults: {
-			body: null,            // initial content of the body
-			modal: true,           // create a modal panel - creates a div that blocks interaction with page
-			height: 'auto',        // panel height
-			width: 400,            // panel width (in pixels)
-			open: false,           // show the panel when it is created
-			parent: 'BODY',        // node that panel is attached to
-			autoRemove: false      // remove the panel from the dom and destroy it when the widget is closed
-		},
-		shared: {  // shared data for all instances of ui.Panel and decendants
-			stack: [], // array of all open panels
-			modal: $( { tag: "DIV", id: "uiModal", css: { opacity: 0.2, position: "absolute", top: "0px", left: "0px" } } )
-		},
-		init: function() {
-			this._super();
-		},
-		open: function( ev ) {
-			this.el
-				.css( { visibility: "hidden" } )
-				.appendTo( this.config.parent )
-				.css( this._getPosition( ev ) )
-				.css( { zIndex: (this.shared.stack.length ? (+this.shared.stack[this.shared.stack.length - 1].el.css("zIndex") + 10) : 100) } )
-				.css( { visibility: "visible", display: "block" } );
-			this.shared.stack.remove(this);
-			this.shared.stack.push(this);
-			this._setModal();
-			$(document).bind("keyup", this._close_handler );
-			this.fire("open", { source: this, event: ev } );
-			return this;
-		},
-		close: function() {
-			var index = this.shared.stack.indexOf(this);
-			if(index !== -1) {
-				this.shared.stack.splice(index, 1);
-				this.el.css( { left: "-2999px" } ); // move the dialog to the left rather than hiding to prevent ie6 rendering artifacts
-				this._setModal();
-				this.fire("close", this );
-				if(this.config.autoRemove) {
-					this.remove();
-				}
-			}
-			return this;
-		},
-		// close the panel and remove it from the dom, destroying it (you can not reuse the panel after calling remove)
-		remove: function() {
-			this.close();
-			$(document).unbind("keyup", this._close_handler );
-			this._super();
-		},
-		// starting at the top of the stack, find the first panel that wants a modal and put it just underneath, otherwise remove the modal
-		_setModal: function() {
-			for(var stackPtr = this.shared.stack.length - 1; stackPtr >= 0; stackPtr--) {
-				if(this.shared.stack[stackPtr].config.modal) {
-					this.shared.modal
-						.appendTo( document.body )
-						.css( { zIndex: this.shared.stack[stackPtr].el.css("zIndex") - 5 } )
-						.css( $(document).vSize().asSize() );
-					return;
-				}
-			}
-			this.shared.modal.remove(); // no panels that want a modal were found
-		},
-		_getPosition: function() {
-			return $(window).vSize()                        // get the current viewport size
-				.sub(this.el.vSize())                         // subtract the size of the panel
-				.mod(function(s) { return s / 2; })           // divide by 2 (to center it)
-				.add($(document).vScroll())                   // add the current scroll offset
-				.mod(function(s) { return Math.max(5, s); })  // make sure the panel is not off the edge of the window
-				.asOffset();                                  // and return it as a {top, left} object
-		},
-		_close_handler: function( ev ) {
-			if( ev.type === "keyup" && ev.keyCode !== 27) { return; } // press esc key to close
-			$(document).unbind("keyup", this._close_handler);
-			this.close( ev );
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.DraggablePanel = ui.AbstractPanel.extend({
-		defaults: {
-	//		title: ""   // (required) text for the panel title
-		},
-
-		_baseCls: "uiPanel",
-
-		init: function() {
-			this._super();
-			this.body = $(this._body_template());
-			this.title = $(this._title_template());
-			this.el = $.joey( this._main_template() );
-			this.el.css( { width: this.config.width } );
-			this.dd = new app.ux.DragDrop({
-				pickupSelector: this.el.find(".uiPanel-titleBar"),
-				dragObj: this.el
-			});
-			// open the panel if set in configuration
-			this.config.open && this.open();
-		},
-
-		setBody: function(body) {
-				this.body.empty().append(body);
-		},
-		_body_template: function() { return { tag: "DIV", cls: "uiPanel-body", css: { height: this.config.height + (this.config.height === 'auto' ? "" : "px" ) }, children: [ this.config.body ] }; },
-		_title_template: function() { return { tag: "SPAN", cls: "uiPanel-title", text: this.config.title }; },
-		_main_template: function() { return (
-			{ tag: "DIV", id: this.id(), cls: this._baseCls, children: [
-				{ tag: "DIV", cls: "uiPanel-titleBar", children: [
-					{ tag: "DIV", cls: "uiPanel-close", onclick: this._close_handler, text: "x" },
-					this.title
-				]},
-				this.body
-			] }
-		); }
-	});
-
-})( this.jQuery, this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.InfoPanel = ui.DraggablePanel.extend({
-		_baseCls: "uiPanel uiInfoPanel"
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.DialogPanel = ui.DraggablePanel.extend({
-		_commit_handler: function(jEv) {
-			this.fire("commit", this, { jEv: jEv });
-		},
-		_main_template: function() {
-			var t = this._super();
-			t.children.push(this._actionsBar_template());
-			return t;
-		},
-		_actionsBar_template: function() {
-			return { tag: "DIV", cls: "pull-right", children: [
-				new app.ui.Button({ label: "Cancel", onclick: this._close_handler }),
-				new app.ui.Button({ label: "OK", onclick: this._commit_handler })
-			]};
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.MenuPanel = ui.AbstractPanel.extend({
-		defaults: {
-			items: [],		// (required) an array of menu items
-			modal: false
-		},
-		_baseCls: "uiMenuPanel",
-		init: function() {
-			this._super();
-			this.el = $(this._main_template());
-		},
-		open: function(jEv) {
-			this._super(jEv);
-			var cx = this; setTimeout(function() { $(document).bind("click", cx._close_handler); }, 50);
-		},
-		_getItems: function() {
-			return this.config.items;
-		},
-		_close_handler: function(jEv) {
-			this._super(jEv);
-			$(document).unbind("click", this._close_handler);
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: this._getItems().map(this._menuItem_template, this) };
-		},
-		_menuItem_template: function(item) {
-			var dx = item.disabled ? { onclick: function() {} } : {};
-			return { tag: "LI", cls: "uiMenuPanel-item" + (item.disabled ? " disabled" : "") + (item.selected ? " selected" : ""), children: [ $.extend({ tag: "DIV", cls: "uiMenuPanel-label" }, item, dx ) ] };
-		},
-		_getPosition: function(jEv) {
-			var right = !! $(jEv.target).parents(".pull-right").length;
-			var parent = $(jEv.target).closest("BUTTON");
-			return parent.vOffset()
-				.addY(parent.vSize().y)
-				.addX( right ? parent.vSize().x - this.el.vOuterSize().x : 0 )
-				.asOffset();
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.SelectMenuPanel = ui.MenuPanel.extend({
-		defaults: {
-			items: [],		// (required) an array of menu items
-			value: null
-		},
-		_baseCls: "uiSelectMenuPanel uiMenuPanel",
-		init: function() {
-			this.value = this.config.value;
-			this._super();
-		},
-		_getItems: function() {
-			return this.config.items.map( function( item ) {
-				return {
-					text: item.text,
-					selected: this.value === item.value,
-					onclick: function( jEv ) {
-						var el = $( jEv.target ).closest("LI");
-						el.parent().children().removeClass("selected");
-						el.addClass("selected");
-						this.fire( "select", this, { value: item.value } );
-						this.value = item.value;
-					}.bind(this)
-				};
-			}, this );
-
-		}
-	});
-
-})( this.app );
-
-( function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Table = ui.AbstractWidget.extend({
-		defaults: {
-			store: null, // (required) implements interface app.data.DataSourceInterface
-			height: 0,
-			width: 0
-		},
-		_baseCls: "uiTable",
-		init: function(parent) {
-			this._super();
-			this.initElements(parent);
-			this.config.store.on("data", this._data_handler);
-		},
-		attach: function(parent) {
-			if(parent) {
-				this._super(parent);
-				this._reflow();
-			}
-		},
-		initElements: function(parent) {
-			this.el = $.joey(this._main_template());
-			this.body = this.el.find(".uiTable-body");
-			this.headers = this.el.find(".uiTable-headers");
-			this.tools = this.el.find(".uiTable-tools");
-			this.attach( parent );
-		},
-		_data_handler: function(store) {
-			this.tools.text(store.summary);
-			this.headers.empty().append(this._header_template(store.columns));
-			this.body.empty().append(this._body_template(store.data, store.columns));
-			this._reflow();
-		},
-		_reflow: function() {
-			var firstCol = this.body.find("TR:first TH.uiTable-header-cell > DIV"),
-					headers = this.headers.find("TR:first TH.uiTable-header-cell > DIV");
-			for(var i = 0; i < headers.length; i++) {
-				$(headers[i]).width( $(firstCol[i]).width() );
-			}
-			this._scroll_handler();
-		},
-		_scroll_handler: function(ev) {
-			this.el.find(".uiTable-headers").scrollLeft(this.body.scrollLeft());
-		},
-		_dataClick_handler: function(ev) {
-			var row = $(ev.target).closest("TR");
-			if(row.length) {
-				this.fire("rowClick", this, { row: row } );
-			}
-		},
-		_headerClick_handler: function(ev) {
-			var header = $(ev.target).closest("TH.uiTable-header-cell");
-			if(header.length) {
-				this.fire("headerClick", this, { header: header, column: header.data("column"), dir: header.data("dir") });
-			}
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), css: { width: this.config.width + "px" }, cls: this._baseCls, children: [
-				{ tag: "DIV", cls: "uiTable-tools" },
-				{ tag: "DIV", cls: "uiTable-headers", onclick: this._headerClick_handler },
-				{ tag: "DIV", cls: "uiTable-body",
-					onclick: this._dataClick_handler,
-					onscroll: this._scroll_handler,
-					css: { height: this.config.height + "px", width: this.config.width + "px" }
-				}
-			] };
-		},
-		_header_template: function(columns) {
-			var ret = { tag: "TABLE", children: [ this._headerRow_template(columns) ] };
-			ret.children[0].children.push(this._headerEndCap_template());
-			return ret;
-		},
-		_headerRow_template: function(columns) {
-			return { tag: "TR", cls: "uiTable-header-row", children: columns.map(function(column) {
-				var dir = ((this.config.store.sort.column === column) && this.config.store.sort.dir) || "none";
-				return { tag: "TH", data: { column: column, dir: dir }, cls: "uiTable-header-cell" + ((dir !== "none") ? " uiTable-sort" : ""), children: [
-					{ tag: "DIV", children: [
-						{ tag: "DIV", cls: "uiTable-headercell-menu", text: dir === "asc" ? "\u25b2" : "\u25bc" },
-						{ tag: "DIV", cls: "uiTable-headercell-text", text: column }
-					]}
-				]};
-			}, this)};
-		},
-		_headerEndCap_template: function() {
-			return { tag: "TH", cls: "uiTable-headerEndCap", children: [ { tag: "DIV" } ] };
-		},
-		_body_template: function(data, columns) {
-			return { tag: "TABLE", children: []
-				.concat(this._headerRow_template(columns))
-				.concat(data.map(function(row) {
-					return { tag: "TR", data: { row: row }, cls: "uiTable-row", children: columns.map(function(column){
-						return { tag: "TD", cls: "uiTable-cell", children: [ { tag: "DIV", text: (row[column] || "").toString() } ] };
-					})};
-				}))
-			};
-		}
-
-	});
-
-})( this.jQuery, this.app );
-
-( function( $, app, joey ) {
-
-	var ui = app.ns("ui");
-
-	var CELL_SEPARATOR = ",";
-	var CELL_QUOTE = '"';
-	var LINE_SEPARATOR = "\r\n";
-
-	ui.CSVTable = ui.AbstractWidget.extend({
-		defaults: {
-			results: null
-		},
-		_baseCls: "uiCSVTable",
-		init: function( parent ) {
-			this._super();
-			var results = this.config.results.hits.hits;
-			var columns = this._parseResults( results );
-			this._downloadButton = new ui.Button({
-				label: "Generate Download Link",
-				onclick: this._downloadLinkGenerator_handler
-			});
-			this._downloadLink = $.joey( { tag: "A", text: "download", });
-			this._downloadLink.hide();
-			this._csvText = this._csv_template( columns, results );
-			this.el = $.joey( this._main_template() );
-			this.attach( parent );
-		},
-		_downloadLinkGenerator_handler: function() {
-			var csvData = new Blob( [ this._csvText ], { type: 'text/csv' });
-			var csvURL = URL.createObjectURL( csvData );
-			this._downloadLink.attr( "href", csvURL );
-			this._downloadLink.show();
-		},
-		_parseResults: function( results ) {
-			var columnPaths = {};
-			(function parse( path, obj ) {
-				if( obj instanceof Array ) {
-					for( var i = 0; i < obj.length; i++ ) {
-						parse( path, obj[i] );
-					}
-				} else if( typeof obj === "object" ) {
-					for( var prop in obj ) {
-						parse( path + "." + prop, obj[ prop ] );
-					}
-				} else {
-					columnPaths[ path ] = true;
-				}
-			})( "root", results );
-			var columns = [];
-			for( var column in columnPaths ) {
-				columns.push( column.split(".").slice(1) );
-			}
-			return columns;
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: this._baseCls, id: this.id(), children: [
-				this._downloadButton,
-				this._downloadLink,
-				{ tag: "PRE", text: this._csvText }
-			] }
-		); },
-		_csv_template: function( columns, results ) {
-			return this._header_template( columns ) + LINE_SEPARATOR + this._results_template( columns, results );
-		},
-		_header_template: function( columns ) {
-			return columns.map( function( column ) {
-				return column.join(".");
-			}).join( CELL_SEPARATOR );
-		},
-		_results_template: function( columns, results ) {
-			return results.map( function( result ) {
-				return columns.map( function( column ) {
-					var l = 0,
-						ptr = result;
-					while( l !== column.length && ptr != null ) {
-						ptr = ptr[ column[ l++ ] ];
-					}
-					return ( ptr == null ) ? "" : ( CELL_QUOTE + ptr.toString().replace(/"/g, '""') + CELL_QUOTE );
-				}).join( CELL_SEPARATOR );
-			}).join( LINE_SEPARATOR );
-		}
-	});
-
-})( this.jQuery, this.app, this.joey );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.JsonPretty = ui.AbstractWidget.extend({
-		defaults: {
-			obj: null
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $(this._main_template());
-			this.attach(parent);
-			this.el.click(this._click_handler);
-		},
-		
-		_click_handler: function(jEv) {
-			var t = $(jEv.target).closest(".uiJsonPretty-name").closest("LI");
-			if(t.length === 0 || t.parents(".uiJsonPretty-minimised").length > 0) { return; }
-			t.toggleClass("uiJsonPretty-minimised");
-			jEv.stopPropagation();
-		},
-		
-		_main_template: function() {
-			try {
-					return { tag: "DIV", cls: "uiJsonPretty", children: this.pretty.parse(this.config.obj) };
-			}	catch (error) {
-					throw "JsonPretty error: " + error.message;
-			}
-		},
-		
-		pretty: { // from https://github.com/RyanAmos/Pretty-JSON/blob/master/pretty_json.js
-			"expando" : function(value) {
-				return (value && (/array|object/i).test(value.constructor.name)) ? "expando" : "";
-			},
-			"parse": function (member) {
-				return this[(member == null) ? 'null' : member.constructor.name.toLowerCase()](member);
-			},
-			"null": function (value) {
-				return this['value']('null', 'null');
-			},
-			"array": function (value) {
-				var results = [];
-				var lastItem = value.length - 1;
-				value.forEach(function( v, i ) {
-					results.push({ tag: "LI", cls: this.expando(v), children: [ this['parse'](v) ] });
-					if( i !== lastItem ) {
-						results.push(",");
-					}
-				}, this);
-				return [ "[ ", ((results.length > 0) ? { tag: "UL", cls: "uiJsonPretty-array", children: results } : null), "]" ];
-			},
-			"object": function (value) {
-				var results = [];
-				var keys = Object.keys( value );
-				var lastItem = keys.length - 1;
-				keys.forEach( function( key, i ) {
-					var children = [ this['value']( 'name', '"' + key + '"' ), ": ", this['parse']( value[ key ]) ];
-					if( i !== lastItem ) {
-						children.push(",");
-					}
-					results.push( { tag: "LI", cls: this.expando( value[ key ] ), children: children } );
-				}, this);
-				return [ "{ ", ((results.length > 0) ? { tag: "UL", cls: "uiJsonPretty-object", children: results } : null ),  "}" ];
-			},
-			"number": function (value) {
-				return this['value']('number', value.toString());
-			},
-			"string": function (value) {
-				if (/^(http|https|file):\/\/[^\s]+$/.test(value)) {
-					return this['link']( value );
-				} else {
-					return this['value']('string', '"' + value.toString() + '"');
-				}
-			},
-			"boolean": function (value) {
-				return this['value']('boolean', value.toString());
-			},
-			"link": function( value ) {
-					return this['value']("string", { tag: "A", href: value, target: "_blank", text: '"' + value + '"' } );
-			},
-			"value": function (type, value) {
-				if (/^(http|https|file):\/\/[^\s]+$/.test(value)) {
-				}
-				return { tag: "SPAN", cls: "uiJsonPretty-" + type, text: value };
-			}
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.PanelForm = ui.AbstractWidget.extend({
-		defaults: {
-			fields: null	// (required) instanceof app.ux.FieldCollection
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-			this.attach( parent );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiPanelForm", children: this.config.fields.fields.map(this._field_template, this) };
-		},
-		_field_template: function(field) {
-			return { tag: "LABEL", cls: "uiPanelForm-field", children: [
-				{ tag: "DIV", cls: "uiPanelForm-label", children: [ field.label, ut.require_template(field) ] },
-				field
-			]};
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( app ){
-
-	var ui = app.ns("ui");
-
-	ui.HelpPanel = ui.InfoPanel.extend({
-		defaults: {
-			ref: "",
-			open: true,
-			autoRemove: true,
-			modal: false,
-			width: 500,
-			height: 450,
-			title: i18n.text("General.Help")
-		},
-		init: function() {
-			this._super();
-			this.body.append(i18n.text(this.config.ref));
-		}
-	});
-
-})( this.app );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.JsonPanel = ui.InfoPanel.extend({
-		defaults: {
-			json: null, // (required)
-			modal: false,
-			open: true,
-			autoRemove: true,
-			height: 500,
-			width: 600
-		},
-
-		_baseCls: "uiPanel uiInfoPanel uiJsonPanel",
-
-		_body_template: function() {
-			var body = this._super();
-			body.children = [ new ui.JsonPretty({ obj: this.config.json }) ];
-			return body;
-		}
-	});
-
-})( this.app );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.SidebarSection = ui.AbstractWidget.extend({
-		defaults: {
-			title: "",
-			help: null,
-			body: null,
-			open: false
-		},
-		init: function() {
-			this._super();
-			this.el = $.joey( this._main_template() );
-			this.body = this.el.children(".uiSidebarSection-body");
-			this.config.open && ( this.el.addClass("shown") && this.body.css("display", "block") );
-		},
-		_showSection_handler: function( ev ) {
-			var shown = $( ev.target ).closest(".uiSidebarSection")
-				.toggleClass("shown")
-					.children(".uiSidebarSection-body").slideToggle(200, function() { this.fire("animComplete", this); }.bind(this))
-				.end()
-				.hasClass("shown");
-			this.fire(shown ? "show" : "hide", this);
-		},
-		_showHelp_handler: function( ev ) {
-			new ui.HelpPanel({ref: this.config.help});
-			ev.stopPropagation();
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: "uiSidebarSection", children: [
-				(this.config.title && { tag: "DIV", cls: "uiSidebarSection-head", onclick: this._showSection_handler, children: [
-					this.config.title,
-					( this.config.help && { tag: "SPAN", cls: "uiSidebarSection-help pull-right", onclick: this._showHelp_handler, text: i18n.text("General.HelpGlyph") } )
-				] }),
-				{ tag: "DIV", cls: "uiSidebarSection-body", children: [ this.config.body ] }
-			] }
-		); }
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.ResultTable = ui.Table.extend({
-		defaults: {
-			width: 500,
-			height: 400
-		},
-
-		init: function() {
-			this._super();
-			this.on("rowClick", this._showPreview_handler);
-			this.selectedRow = null;
-			$(document).bind("keydown", this._nav_handler);
-		},
-		remove: function() {
-			$(document).unbind("keydown", this._nav_handler);
-			this._super();
-		},
-		attach: function(parent) {
-			if(parent) {
-				var height = parent.height() || ( $(document).height() - parent.offset().top - 41 ); // 41 = height in px of .uiTable-tools + uiTable-header
-				var width = parent.width();
-				this.el.width( width );
-				this.body.width( width ).height( height );
-			}
-			this._super(parent);
-		},
-		showPreview: function(row) {
-			row.addClass("selected");
-			this.preview = new app.ui.JsonPanel({
-				title: i18n.text("Browser.ResultSourcePanelTitle"),
-				json: row.data("row")._source,
-				onClose: function() { row.removeClass("selected"); }
-			});
-		},
-		_nav_handler: function(jEv) {
-			if(jEv.keyCode !== 40 && jEv.keyCode !== 38) {
-				return;
-			}
-			this.selectedRow && this.preview && this.preview.remove();
-			if(jEv.keyCode === 40) { // up arrow
-				this.selectedRow = this.selectedRow ? this.selectedRow.next("TR") : this.body.find("TR:first");
-			} else if(jEv.keyCode === 38) { // down arrow
-				this.selectedRow = this.selectedRow ? this.selectedRow.prev("TR") : this.body.find("TR:last");
-			}
-			this.selectedRow && this.showPreview(this.selectedRow);
-		},
-		_showPreview_handler: function(obj, data) {
-			this.showPreview(this.selectedRow = data.row);
-		}
-	});
-
-})( this.jQuery, this.app );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.QueryFilter = ui.AbstractWidget.extend({
-		defaults: {
-			metadata: null,   // (required) instanceof app.data.MetaData
-			query: null       // (required) instanceof app.data.Query that the filters will act apon
-		},
-		init: function() {
-			this._super();
-			this.metadata = this.config.metadata;
-			this.query = this.config.query;
-			this.el = $(this._main_template());
-		},
-		helpTypeMap: {
-			"date" : "QueryFilter.DateRangeHelp"
-		},
-		requestUpdate: function(jEv) {
-			if(jEv && jEv.originalEvent) { // we only want to update on real user interaction not generated events
-				this.query.setPage(1);
-				this.query.query();
-			}
-		},
-		getSpec: function(fieldName) {
-			return this.metadata.fields[fieldName];
-		},
-		_selectAlias_handler: function(jEv) {
-			var indices = (jEv.target.selectedIndex === 0) ? [] : this.metadata.getIndices($(jEv.target).val());
-			$(".uiQueryFilter-index").each(function(i, el) {
-				var jEl = $(el);
-				if(indices.contains(jEl.text()) !== jEl.hasClass("selected")) {
-					jEl.click();
-				}
-			});
-			this.requestUpdate(jEv);
-		},
-		_selectIndex_handler: function(jEv) {
-			var jEl = $(jEv.target).closest(".uiQueryFilter-index");
-			jEl.toggleClass("selected");
-			var selected = jEl.hasClass("selected");
-			this.query.setIndex(jEl.text(), selected);
-			if(selected) {
-				var types = this.metadata.getTypes(this.query.indices);
-				this.el.find("DIV.uiQueryFilter-type.selected").each(function(n, el) {
-					if(! types.contains($(el).text())) {
-						$(el).click();
-					}
-				});
-			}
-			this.requestUpdate(jEv);
-		},
-		_selectType_handler: function(jEv) {
-			var jEl = $(jEv.target).closest(".uiQueryFilter-type");
-			jEl.toggleClass("selected");
-			var type = jEl.text(), selected = jEl.hasClass("selected");
-			this.query.setType(type, selected);
-			if(selected) {
-				var indices = this.metadata.types[type].indices;
-				// es throws a 500 if searching an index for a type it does not contain - so we prevent that
-				this.el.find("DIV.uiQueryFilter-index.selected").each(function(n, el) {
-					if(! indices.contains($(el).text())) {
-						$(el).click();
-					}
-				});
-				// es throws a 500 if you specify types from different indices with _all
-				jEl.siblings(".uiQueryFilter-type.selected").forEach(function(el) {
-					if(this.metadata.types[$(el).text()].indices.intersection(indices).length === 0) {
-						$(el).click();
-					}
-				}, this);
-			}
-			this.requestUpdate(jEv);
-		},
-		_openFilter_handler: function(section) {
-			var field_name = section.config.title;
-			if(! section.loaded) {
-				var spec = this.getSpec(field_name);
-				if(spec.core_type === "string") {
-					section.body.append(this._textFilter_template(spec));
-				} else if(spec.core_type === "date") {
-					section.body.append(this._dateFilter_template(spec));
-					section.body.append(new ui.DateHistogram({ printEl: section.body.find("INPUT"), cluster: this.cluster, query: this.query, spec: spec }));
-				} else if(spec.core_type === "number") {
-					section.body.append(this._numericFilter_template(spec));
-				} else if(spec.core_type === 'boolean') {
-					section.body.append(this._booleanFilter_template(spec));
-				} else if (spec.core_type === 'multi_field') {
-					section.body.append(this._multiFieldFilter_template(section, spec));
-				} 
-				section.loaded = true;
-			}
-			section.on("animComplete", function(section) { section.body.find("INPUT").focus(); });
-		},
-		_textFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqids = jEl.data("uqids") || [];
-			uqids.forEach(function(uqid) {
-				uqid && this.query.removeClause(uqid);
-			}, this);
-			if(val.length) {
-				if(jEl[0] === document.activeElement && jEl[0].selectionStart === jEl[0].selectionEnd) {
-					val = val.replace(new RegExp("(.{"+jEl[0].selectionStart+"})"), "$&*");
-				}
-				uqids = val.split(/\s+/).map(function(term) {
-					// Figure out the actual field name - needed for multi_field, because
-					// querying for "field.field" will not work. Simply "field" must be used
-					// if nothing is aliased.
-					var fieldNameParts = spec.field_name.split('.');
-					var part = fieldNameParts.length - 1;
-					var name = fieldNameParts[part];
-					while (part >= 1) {
-						if (fieldNameParts[part] !== fieldNameParts[part - 1]) {
-							name = fieldNameParts[part - 1] + "." + name;
-						}
-						part--;
-					}
-					return term && this.query.addClause(term, name, "wildcard", "must");
-				}, this);
-			}
-			jEl.data("uqids", uqids);
-			this.requestUpdate(jEv);
-		},
-		_dateFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			var range = window.dateRangeParser.parse(val);
-			var lastRange = jEl.data("lastRange");
-			if(!range || (lastRange && lastRange.start === range.start && lastRange.end === range.end)) {
-				return;
-			}
-			uqid && this.query.removeClause(uqid);
-			if((range.start && range.end) === null) {
-				uqid = null;
-			} else {
-				var value = {};
-				if( range.start ) {
-					value["gte"] = range.start;
-				}
-				if( range.end ) {
-					value["lte"] = range.end;
-				}
-				uqid = this.query.addClause( value, spec.field_name, "range", "must");
-			}
-			jEl.data("lastRange", range);
-			jEl.siblings(".uiQueryFilter-rangeHintFrom")
-				.text(i18n.text("QueryFilter.DateRangeHint.from", range.start && new Date(range.start).toUTCString()));
-			jEl.siblings(".uiQueryFilter-rangeHintTo")
-				.text(i18n.text("QueryFilter.DateRangeHint.to", range.end && new Date(range.end).toUTCString()));
-			jEl.data("uqid", uqid);
-			this.requestUpdate(jEv);
-		},
-		_numericFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			var lastRange = jEl.data("lastRange");
-			var range = (function(val) {
-				var ops = val.split(/->|<>|</).map( function(v) { return parseInt(v.trim(), 10); });
-				if(/<>/.test(val)) {
-					return { gte: (ops[0] - ops[1]), lte: (ops[0] + ops[1]) };
-				} else if(/->|</.test(val)) {
-					return { gte: ops[0], lte: ops[1] };
-				} else {
-					return { gte: ops[0], lte: ops[0] };
-				}
-			})(val || "");
-			if(!range || (lastRange && lastRange.lte === range.lte && lastRange.gte === range.gte)) {
-				return;
-			}
-			jEl.data("lastRange", range);
-			uqid && this.query.removeClause(uqid);
-			uqid = this.query.addClause( range, spec.field_name, "range", "must");
-			jEl.data("uqid", uqid);
-			this.requestUpdate(jEv);
-		},
-		_booleanFilterChange_handler: function( jEv ) {
-			var jEl = $(jEv.target).closest("SELECT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			uqid && this.query.removeClause(uqid);
-			if(val === "true" || val === "false") {
-				jEl.data("uqid", this.query.addClause(val, spec.field_name, "term", "must") );
-			}
-			this.requestUpdate(jEv);
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiQueryFilter", children: [
-				this._aliasSelector_template(),
-				this._indexSelector_template(),
-				this._typesSelector_template(),
-				this._filters_template()
-			] };
-		},
-		_aliasSelector_template: function() {
-			var aliases = Object.keys(this.metadata.aliases).sort();
-			aliases.unshift( i18n.text("QueryFilter.AllIndices") );
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-aliases", children: [
-				{ tag: "SELECT", onChange: this._selectAlias_handler, children: aliases.map(ut.option_template) }
-			] };
-		},
-		_indexSelector_template: function() {
-			var indices = Object.keys( this.metadata.indices ).sort();
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-indices", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Indices") },
-				{ tag: "DIV", onClick: this._selectIndex_handler, children: indices.map( function( name ) {
-					return { tag: "DIV", cls: "uiQueryFilter-booble uiQueryFilter-index", text: name };
-				})}
-			] };
-		},
-		_typesSelector_template: function() {
-			var types = Object.keys( this.metadata.types ).sort();
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-types", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Types") },
-				{ tag: "DIV", onClick: this._selectType_handler, children: types.map( function( name ) {
-					return { tag: "DIV", cls: "uiQueryFilter-booble uiQueryFilter-type", text: name };
-				})}
-			] };
-		},
-		_filters_template: function() {
-			var _metadataFields = this.metadata.fields;
-			var fields = Object.keys( _metadataFields ).sort()
-				.filter(function(d) { return (_metadataFields[d].core_type !== undefined); });
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-filters", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Fields") },
-				{ tag: "DIV", children: fields.map( function(name ) {
-					return new app.ui.SidebarSection({
-						title: name,
-						help: this.helpTypeMap[this.metadata.fields[ name ].type],
-						onShow: this._openFilter_handler
-					});
-				}, this ) }
-			] };
-		},
-		_textFilter_template: function(spec) {
-			return { tag: "INPUT", data: { spec: spec }, onKeyup: this._textFilterChange_handler };
-		},
-		_dateFilter_template: function(spec) {
-			return { tag: "DIV", children: [
-				{ tag: "INPUT", data: { spec: spec }, onKeyup: this._dateFilterChange_handler },
-				{ tag: "PRE", cls: "uiQueryFilter-rangeHintFrom", text: i18n.text("QueryFilter.DateRangeHint.from", "")},
-				{ tag: "PRE", cls: "uiQueryFilter-rangeHintTo", text: i18n.text("QueryFilter.DateRangeHint.to", "") }
-			]};
-		},
-		_numericFilter_template: function(spec) {
-			return { tag: "INPUT", data: { spec: spec }, onKeyup: this._numericFilterChange_handler };
-		},
-		_booleanFilter_template: function(spec) {
-			return { tag: "SELECT", data: { spec: spec }, onChange: this._booleanFilterChange_handler,
-				children: [ i18n.text("QueryFilter.AnyValue"), "true", "false" ].map( function( val ) {
-					return { tag: "OPTION", value: val, text: val };
-				})
-			};
-		},
-		_multiFieldFilter_template: function(section, spec) {
-			return {
-				tag : "DIV", cls : "uiQueryFilter-subMultiFields", children : acx.eachMap(spec.fields, function(name, data) {
-					if (name === spec.field_name) {
-						section.config.title = spec.field_name + "." + name;
-						return this._openFilter_handler(section);
-					}
-					return new app.ui.SidebarSection({
-						title : data.field_name, help : this.helpTypeMap[data.type], onShow : this._openFilter_handler
-					});
-				}, this)
-			};
-		}	
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Page = ui.AbstractWidget.extend({
-		show: function() {
-			this.el.show();
-		},
-		hide: function() {
-			this.el.hide();
-		}
-	});
-
-})( this.app );
-(function( $, app, i18n ){
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-
-	ui.Browser = ui.Page.extend({
-		defaults: {
-			cluster: null  // (required) instanceof app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.query = new app.data.Query( { cluster: this.cluster } );
-			this._refreshButton = new ui.Button({
-				label: i18n.text("General.RefreshResults"),
-				onclick: function( btn ) {
-					this.query.query();
-				}.bind(this)
-			});
-			this.el = $(this._main_template());
-			new data.MetaDataFactory({
-				cluster: this.cluster,
-				onReady: function(metadata) {
-					this.metadata = metadata;
-					this.store = new data.QueryDataSourceInterface( { metadata: metadata, query: this.query } );
-					this.queryFilter = new ui.QueryFilter({ metadata: metadata, query: this.query });
-					this.queryFilter.attach(this.el.find("> .uiBrowser-filter") );
-					this.resultTable = new ui.ResultTable( {
-						onHeaderClick: this._changeSort_handler,
-						store: this.store
-					} );
-					this.resultTable.attach( this.el.find("> .uiBrowser-table") );
-					this.updateResults();
-				}.bind(this)
-			});
-		},
-		updateResults: function() {
-			this.query.query();
-		},
-		_changeSort_handler: function(table, wEv) {
-			this.query.setSort(wEv.column, wEv.dir === "desc");
-			this.query.setPage(1);
-			this.query.query();
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiBrowser", children: [
-				new ui.Toolbar({
-					label: i18n.text("Browser.Title"),
-					left: [ ],
-					right: [ this._refreshButton ]
-				}),
-				{ tag: "DIV", cls: "uiBrowser-filter" },
-				{ tag: "DIV", cls: "uiBrowser-table" }
-			] };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app, i18n, raphael ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-	var services = app.ns("services");
-
-	ui.AnyRequest = ui.Page.extend({
-		defaults: {
-			cluster: null,       // (required) instanceof app.services.Cluster
-			path: "_search",     // default uri to send a request to
-			query: { query: { match_all: { }}},
-			transform: "  return root;" // default transformer function (does nothing)
-		},
-		init: function(parent) {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.history = this.prefs.get("anyRequest-history") || [ { type: "POST", path: this.config.path, query : JSON.stringify(this.config.query), transform: this.config.transform } ];
-			this.el = $.joey(this._main_template());
-			this.base_uriEl = this.el.find("INPUT[name=base_uri]");
-			this.pathEl = this.el.find("INPUT[name=path]");
-			this.typeEl = this.el.find("SELECT[name=method]");
-			this.dataEl = this.el.find("TEXTAREA[name=body]");
-			this.prettyEl = this.el.find("INPUT[name=pretty]");
-			this.transformEl = this.el.find("TEXTAREA[name=transform]");
-			this.asGraphEl = this.el.find("INPUT[name=asGraph]");
-			this.asTableEl = this.el.find("INPUT[name=asTable]");
-			this.asJsonEl = this.el.find("INPUT[name=asJson]");
-			this.cronEl = this.el.find("SELECT[name=cron]");
-			this.outEl = this.el.find("DIV.uiAnyRequest-out");
-			this.errEl = this.el.find("DIV.uiAnyRequest-jsonErr");
-			this.typeEl.val("GET");
-			this.attach(parent);
-			this.setHistoryItem(this.history[this.history.length - 1]);
-		},
-		setHistoryItem: function(item) {
-			this.pathEl.val(item.path);
-			this.typeEl.val(item.type);
-			this.dataEl.val(item.query);
-			this.transformEl.val(item.transform);
-		},
-		_request_handler: function( ev ) {
-			if(! this._validateJson_handler()) {
-				return;
-			}
-			var path = this.pathEl.val(),
-					type = this.typeEl.val(),
-					query = JSON.stringify(JSON.parse(this.dataEl.val())),
-					transform = this.transformEl.val(),
-					base_uri = this.base_uriEl.val();
-			if( ev ) { // if the user click request
-				if(this.timer) {
-					window.clearTimeout(this.timer); // stop any cron jobs
-				}
-				delete this.prevData; // remove data from previous cron runs
-				this.outEl.text(i18n.text("AnyRequest.Requesting"));
-				if( ! /\/$/.test( base_uri )) {
-					base_uri += "/";
-					this.base_uriEl.val( base_uri );
-				}
-				for(var i = 0; i < this.history.length; i++) {
-					if(this.history[i].path === path &&
-						this.history[i].type === type &&
-						this.history[i].query === query &&
-						this.history[i].transform === transform) {
-						this.history.splice(i, 1);
-					}
-				}
-				this.history.push({
-					path: path,
-					type: type,
-					query: query,
-					transform: transform
-				});
-				this.history.slice(250); // make sure history does not get too large
-				this.prefs.set( "anyRequest-history", this.history );
-				this.el.find("UL.uiAnyRequest-history")
-					.empty()
-					.append($( { tag: "UL", children: this.history.map(this._historyItem_template, this) }).children())
-					.children().find(":last-child").each(function(i, j) { j.scrollIntoView(false); }).end()
-					.scrollLeft(0);
-			}
-			this.config.cluster.request({
-				url: base_uri + path,
-				type: type,
-				data: query,
-				success: this._responseWriter_handler,
-				error: this._responseError_handler
-			});
-		},
-		_responseError_handler: function (response) {
-			var obj;
-			try {
-				obj = JSON.parse(response.responseText);
-				if (obj) {
-					this._responseWriter_handler(obj);
-				}
-			} catch (err) {
-			}
-		},
-		_responseWriter_handler: function(data) {
-			this.outEl.empty();
-			try {
-				data = (new Function("root", "prev", this.transformEl.val()))(data, this.prevData)
-			} catch(e) {
-				this.errEl.text(e.message);
-				return;
-			}
-			if(this.asGraphEl.attr("checked")) {
-				var w = this.outEl.width();
-				raphael(this.outEl[0], w - 10, 300)
-					.g.barchart(10, 10, w - 20, 280, [data]);
-			}
-			if(this.asTableEl.attr("checked")) {
-				try {
-					var store = new app.data.ResultDataSourceInterface();
-					this.outEl.append(new app.ui.ResultTable({
-						width: this.outEl.width() - 23,
-						store: store
-					} ) );
-					store.results(data);
-				} catch(e) {
-					this.errEl.text("Results Table Failed: " + e.message);
-				}
-			}
-			if(this.asJsonEl.attr("checked")) {
-				this.outEl.append(new ui.JsonPretty({ obj: data }));
-			}
-			if(this.cronEl.val() > 0) {
-				this.timer = window.setTimeout(function(){
-					this._request_handler();
-				}.bind(this), this.cronEl.val());
-			}
-			this.prevData = data;
-		},
-		_validateJson_handler: function( ev ) {
-			/* if the textarea is empty, we replace its value by an empty JSON object : "{}" and the request goes on as usual */
-			var jsonData = this.dataEl.val().trim();
-			var j;
-			if(jsonData === "") {
-				jsonData = "{}";
-				this.dataEl.val( jsonData );
-			}
-			try {
-				j = JSON.parse(jsonData);
-			} catch(e) {
-				this.errEl.text(e.message);
-				return false;
-			}
-			this.errEl.text("");
-			if(this.prettyEl.attr("checked")) {
-				this.dataEl.val(JSON.stringify(j, null, "  "));
-			}
-			return true;
-		},
-		_historyClick_handler: function( ev ) {
-			var item = $( ev.target ).closest( "LI" ).data( "item" );
-			this.setHistoryItem( item );
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "anyRequest", children: [
-				{ tag: "DIV", cls: "uiAnyRequest-request", children: [
-					new app.ui.SidebarSection({
-						open: false,
-						title: i18n.text("AnyRequest.History"),
-						body: { tag: "UL", onclick: this._historyClick_handler, cls: "uiAnyRequest-history", children: this.history.map(this._historyItem_template, this)	}
-					}),
-					new app.ui.SidebarSection({
-						open: true,
-						title: i18n.text("AnyRequest.Query"),
-						body: { tag: "DIV", children: [
-							{ tag: "INPUT", type: "text", name: "base_uri", value: this.config.cluster.config.base_uri },
-							{ tag: "BR" },
-							{ tag: "INPUT", type: "text", name: "path", value: this.config.path },
-							{ tag: "SELECT", name: "method", children: ["POST", "GET", "PUT", "HEAD", "DELETE"].map(ut.option_template) },
-							{ tag: "TEXTAREA", name: "body", rows: 20, text: JSON.stringify(this.config.query) },
-							{ tag: "BUTTON", css: { cssFloat: "right" }, type: "button", children: [ { tag: "B", text: i18n.text("AnyRequest.Request") } ], onclick: this._request_handler },
-							{ tag: "BUTTON", type: "button", text: i18n.text("AnyRequest.ValidateJSON"), onclick: this._validateJson_handler },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "pretty" }, i18n.text("AnyRequest.Pretty") ] },
-							{ tag: "DIV", cls: "uiAnyRequest-jsonErr" }
-						]}
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.Transformer"),
-						help: "AnyRequest.TransformerHelp",
-						body: { tag: "DIV", children: [
-							{ tag: "CODE", text: "function(root, prev) {" },
-							{ tag: "BR" },
-							{ tag: "TEXTAREA", name: "transform", rows: 5, text: this.config.transform },
-							{ tag: "BR" },
-							{ tag: "CODE", text: "}" }
-						] }
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.RepeatRequest"),
-						body: { tag: "DIV", children: [
-							i18n.text("AnyRequest.RepeatRequestSelect"), " ",
-							{ tag: "SELECT", name: "cron", children: [
-								{ value: 0, text: "do not repeat" },
-								{ value: 1000, text: "second" },
-								{ value: 1000 * 2, text: "2 seconds" },
-								{ value: 1000 * 5, text: "5 seconds" },
-								{ value: 1000 * 20, text: "20 seconds" },
-								{ value: 1000 * 60, text: "minute" },
-								{ value: 1000 * 60 * 10, text: "10 minutes" },
-								{ value: 1000 * 60 * 60, text: "hour" }
-							].map(function(op) { return $.extend({ tag: "OPTION"}, op); }) }
-						] }
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.DisplayOptions"),
-						help: "AnyRequest.DisplayOptionsHelp",
-						body: { tag: "DIV", children: [
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", checked: true, name: "asJson" }, i18n.text("AnyRequest.AsJson") ] },
-							{ tag: "BR" },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "asGraph" }, i18n.text("AnyRequest.AsGraph") ] },
-							{ tag: "BR" },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "asTable" }, i18n.text("AnyRequest.AsTable") ] }
-						] }
-					})
-				] },
-				{ tag: "DIV", cls: "uiAnyRequest-out" }
-			] };
-		},
-		_historyItem_template: function(item) {
-			return { tag: "LI", cls: "booble", data: { item: item }, children: [
-				{ tag: "SPAN", text: item.path },
-				" ",
-				{ tag: "EM", text: item.query },
-				" ",
-				{ tag: "SPAN", text: item.transform }
-			] };
-		}
-	});
-	
-})( this.jQuery, this.app, this.i18n, this.Raphael );
-
-(function( app, i18n, joey ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.NodesView = ui.AbstractWidget.extend({
-		defaults: {
-			interactive: true,
-			aliasRenderer: "list",
-			scaleReplicas: 1,
-			cluster: null,
-			data: null
-		},
-		init: function() {
-			this._super();
-			this.interactive = this.config.interactive;
-			this.cluster = this.config.cluster;
-			this._aliasRenderFunction = {
-				"none": this._aliasRender_template_none,
-				"list": this._aliasRender_template_list,
-				"full": this._aliasRender_template_full
-			}[ this.config.aliasRenderer ];
-			this._styleSheetEl = joey({ tag: "STYLE", text: ".uiNodesView-nullReplica, .uiNodesView-replica { zoom: " + this.config.scaleReplicas + " }" });
-			this.el = $( this._main_template( this.config.data.cluster, this.config.data.indices ) );
-		},
-
-		_newAliasAction_handler: function( index ) {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("AliasForm.AliasName"), name: "alias", require: true })
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("AliasForm.NewAliasForIndexName", index.name),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function(panel, args) {
-					if(fields.validate()) {
-						var data = fields.getData();
-						var command = {
-							"actions" : [
-								{ "add" : { "index" : index.name, "alias" : data["alias"] } }
-							]
-						};
-						this.config.cluster.post('_aliases', JSON.stringify(command), function(d) {
-							dialog.close();
-							alert(JSON.stringify(d));
-							this.fire("redraw");
-						}.bind(this) );
-					}
-				}.bind(this)
-			}).open();
-		},
-		_postIndexAction_handler: function(action, index, redraw) {
-			this.cluster.post(encodeURIComponent( index.name ) + "/" + encodeURIComponent( action ), null, function(r) {
-				alert(JSON.stringify(r));
-				redraw && this.fire("redraw");
-			}.bind(this));
-		},
-		_optimizeIndex_handler: function(index) {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false })
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("OptimizeForm.OptimizeIndex", index.name),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function( panel, args ) {
-					if(fields.validate()) {
-						this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) {
-							alert(JSON.stringify(r));
-						});
-						dialog.close();
-					}
-				}.bind(this)
-			}).open();
-		},
-		_testAnalyser_handler: function(index) {
-			this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) {
-				alert(JSON.stringify(r, true, "  "));
-			});
-		},
-		_deleteIndexAction_handler: function(index) {
-			if( prompt( i18n.text("AliasForm.DeleteAliasMessage", i18n.text("Command.DELETE"), index.name ) ) === i18n.text("Command.DELETE") ) {
-				this.cluster["delete"](encodeURIComponent( index.name ), null, function(r) {
-					alert(JSON.stringify(r));
-					this.fire("redraw");
-				}.bind(this) );
-			}
-		},
-		_shutdownNode_handler: function(node) {
-			if(prompt( i18n.text("IndexCommand.ShutdownMessage", i18n.text("Command.SHUTDOWN"), node.cluster.name ) ) === i18n.text("Command.SHUTDOWN") ) {
-				this.cluster.post( "_cluster/nodes/" + encodeURIComponent( node.name ) + "/_shutdown", null, function(r) {
-					alert(JSON.stringify(r));
-					this.fire("redraw");
-				}.bind(this));
-			}
-		},
-		_deleteAliasAction_handler: function( index, alias ) {
-			if( confirm( i18n.text("Command.DeleteAliasMessage" ) ) ) {
-				var command = {
-					"actions" : [
-						{ "remove" : { "index" : index.name, "alias" : alias.name } }
-					]
-				};
-				this.config.cluster.post('_aliases', JSON.stringify(command), function(d) {
-					alert(JSON.stringify(d));
-					this.fire("redraw");
-				}.bind(this) );
-			}
-		},
-
-		_replica_template: function(replica) {
-			var r = replica.replica;
-			return { tag: "DIV",
-				cls: "uiNodesView-replica" + (r.primary ? " primary" : "") + ( " state-" + r.state ),
-				text: r.shard.toString(),
-				onclick: function() { new ui.JsonPanel({
-					json: replica.status || r,
-					title: r.index + "/" + r.node + " [" + r.shard + "]" });
-				}
-			};
-		},
-		_routing_template: function(routing) {
-			var cell = { tag: "TD", cls: "uiNodesView-routing" + (routing.open ? "" : " close"), children: [] };
-			for(var i = 0; i < routing.replicas.length; i++) {
-				if(i % routing.max_number_of_shards === 0 && i > 0) {
-					cell.children.push({ tag: "BR" });
-				}
-				if( routing.replicas[i] ) {
-					cell.children.push(this._replica_template(routing.replicas[i]));
-				} else {
-					cell.children.push( { tag: "DIV", cls: "uiNodesView-nullReplica" } );
-				}
-			}
-			return cell;
-		},
-		_nodeControls_template: function( node ) { return (
-			{ tag: "DIV", cls: "uiNodesView-controls", children: [
-				new ui.MenuButton({
-					label: i18n.text("NodeInfoMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("NodeInfoMenu.ClusterNodeInfo"), onclick: function() { new ui.JsonPanel({ json: node.cluster, title: node.name });} },
-							{ text: i18n.text("NodeInfoMenu.NodeStats"), onclick: function() { new ui.JsonPanel({ json: node.stats, title: node.name });} }
-						]
-					})
-				}),
-				new ui.MenuButton({
-					label: i18n.text("NodeActionsMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("NodeActionsMenu.Shutdown"), onclick: function() { this._shutdownNode_handler(node); }.bind(this) }
-						]
-					})
-				})
-			] }
-		); },
-		_nodeIcon_template: function( node ) {
-			var icon, alt;
-			if( node.name === "Unassigned" ) {
-				icon = "fa-exclamation-triangle";
-				alt = i18n.text( "NodeType.Unassigned" );
-			} else if( node.cluster.settings && "tribe" in node.cluster.settings) {
-				icon = "fa-sitemap";
-				alt = i18n.text("NodeType.Tribe" );
-			} else {
-				icon = "fa-" + (node.master_node ? "star" : "circle") + (node.data_node ? "" : "-o" );
-				alt = i18n.text( node.master_node ? ( node.data_node ? "NodeType.Master" : "NodeType.Coord" ) : ( node.data_node ? "NodeType.Worker" : "NodeType.Client" ) );
-			}
-			return { tag: "TD", title: alt, cls: "uiNodesView-icon", children: [
-				{ tag: "SPAN", cls: "fa fa-2x " + icon }
-			] };
-		},
-		_node_template: function(node) {
-			return { tag: "TR", cls: "uiNodesView-node" + (node.master_node ? " master": ""), children: [
-				this._nodeIcon_template( node ),
-				{ tag: "TH", children: node.name === "Unassigned" ? [
-					{ tag: "H3", text: node.name }
-				] : [
-					{ tag: "H3", text: node.cluster.name },
-					{ tag: "DIV", text: node.cluster.hostname },
-					this.interactive ? this._nodeControls_template( node ) : null
-				] }
-			].concat(node.routings.map(this._routing_template, this))};
-		},
-		_indexHeaderControls_template: function( index ) { return (
-			{ tag: "DIV", cls: "uiNodesView-controls", children: [
-				new ui.MenuButton({
-					label: i18n.text("IndexInfoMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("IndexInfoMenu.Status"), onclick: function() { new ui.JsonPanel({ json: index.status, title: index.name }); } },
-							{ text: i18n.text("IndexInfoMenu.Metadata"), onclick: function() { new ui.JsonPanel({ json: index.metadata, title: index.name }); } }
-						]
-					})
-				}),
-				new ui.MenuButton({
-					label: i18n.text("IndexActionsMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Optimize"), onclick: function () { this._optimizeIndex_handler(index); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) },
-							{ text: (index.state === "close") ? i18n.text("IndexActionsMenu.Open") : i18n.text("IndexActionsMenu.Close"), onclick: function() { this._postIndexAction_handler((index.state === "close") ? "_open" : "_close", index, true); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Delete"), onclick: function() { this._deleteIndexAction_handler(index); }.bind(this) }
-						]
-					})
-				})
-			] }
-		); },
-		_indexHeader_template: function( index ) {
-			var closed = index.state === "close";
-			var line1 = closed ? "index: close" : ( "size: " + (index.status && index.status.primaries && index.status.total ? ut.byteSize_template( index.status.primaries.store.size_in_bytes ) + " (" + ut.byteSize_template( index.status.total.store.size_in_bytes ) + ")" : "unknown" ) );
-			var line2 = closed ? "\u00A0" : ( "docs: " + (index.status && index.status.primaries && index.status.primaries.docs && index.status.total && index.status.total.docs ? index.status.primaries.docs.count.toLocaleString() + " (" + (index.status.total.docs.count + index.status.total.docs.deleted).toLocaleString() + ")" : "unknown" ) );
-			return index.name ? { tag: "TH", cls: (closed ? "close" : ""), children: [
-				{ tag: "H3", text: index.name },
-				{ tag: "DIV", text: line1 },
-				{ tag: "DIV", text: line2 },
-				this.interactive ? this._indexHeaderControls_template( index ) : null
-			] } : [ { tag: "TD" }, { tag: "TH" } ];
-		},
-		_aliasRender_template_none: function( cluster, indices ) {
-			return null;
-		},
-		_aliasRender_template_list: function( cluster, indices ) {
-			return cluster.aliases.length && { tag: "TBODY", children: [
-				{ tag: "TR", children: [
-					{ tag: "TD" }
-				].concat( indices.map( function( index ) {
-					return { tag: "TD", children: index.metadata && index.metadata.aliases.map( function( alias ) {
-						return { tag: "LI", text: alias };
-					} ) };
-				})) }
-			] };
-		},
-		_aliasRender_template_full: function( cluster, indices ) {
-			return cluster.aliases.length && { tag: "TBODY", children: cluster.aliases.map( function(alias, row) {
-				return { tag: "TR", children: [ { tag: "TD" },{ tag: "TD" } ].concat(alias.indices.map(function(index, i) {
-					if (index) {
-						return {
-							tag: "TD",
-							css: { background: "#" + "9ce9c7fc9".substr((row+6)%7,3) },
-							cls: "uiNodesView-hasAlias" + ( alias.min === i ? " min" : "" ) + ( alias.max === i ? " max" : "" ),
-							text: alias.name,
-							children: this.interactive ? [
-								{	tag: 'SPAN',
-									text: i18n.text("General.CloseGlyph"),
-									cls: 'uiNodesView-hasAlias-remove',
-									onclick: this._deleteAliasAction_handler.bind( this, index, alias )
-								}
-							]: null
-						};
-					}	else {
-						return { tag: "TD" };
-					}
-				}, this ) ) };
-			}, this )	};
-		},
-		_main_template: function(cluster, indices) {
-			return { tag: "TABLE", cls: "table uiNodesView", children: [
-				this._styleSheetEl,
-				{ tag: "THEAD", children: [ { tag: "TR", children: indices.map(this._indexHeader_template, this) } ] },
-				this._aliasRenderFunction( cluster, indices ),
-				{ tag: "TBODY", children: cluster.nodes.map(this._node_template, this) }
-			] };
-		}
-
-	});
-
-})( this.app, this.i18n, this.joey );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	// ( master ) master = true, data = true 
-	// ( coordinator ) master = true, data = false
-	// ( worker ) master = false, data = true;
-	// ( client ) master = false, data = false;
-	// http enabled ?
-
-	function nodeSort_name(a, b) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		return a.cluster.name.toString().localeCompare( b.cluster.name.toString() );
-	}
-
-	function nodeSort_addr( a, b ) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		return a.cluster.transport_address.toString().localeCompare( b.cluster.transport_address.toString() );
-	}
-
-	function nodeSort_type( a, b ) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		if( a.master_node ) {
-			return -1;
-		} else if( b.master_node ) {
-			return 1;
-		} else if( a.data_node && !b.data_node ) {
-			return -1;
-		} else if( b.data_node && !a.data_node ) {
-			return 1;
-		} else {
-			return a.cluster.name.toString().localeCompare( b.cluster.name.toString() );
-		}
-	}
-
-	var NODE_SORT_TYPES = {
-		"Sort.ByName": nodeSort_name,
-		"Sort.ByAddress": nodeSort_addr,
-		"Sort.ByType": nodeSort_type
-	};
-
-	function nodeFilter_none( a ) {
-		return true;
-	}
-
-	function nodeFilter_clients( a ) {
-		return (a.master_node || a.data_node );
-	}
-
-
-	ui.ClusterOverview = ui.Page.extend({
-		defaults: {
-			cluster: null // (reqired) an instanceof app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.prefs = services.Preferences.instance();
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", this.draw_handler );
-			this._refreshButton = new ui.RefreshButton({
-				onRefresh: this.refresh.bind(this),
-				onChange: function( btn ) {
-					if( btn.value === -1 ) {
-						this.draw_handler();
-					}
-				}.bind( this )
-			});
-			var nodeSortPref = this.prefs.get("clusterOverview-nodeSort") || Object.keys(NODE_SORT_TYPES)[0];
-			this._nodeSort = NODE_SORT_TYPES[ nodeSortPref ];
-			this._nodeSortMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.SortCluster" ),
-				menu: new ui.SelectMenuPanel({
-					value: nodeSortPref,
-					items: Object.keys( NODE_SORT_TYPES ).map( function( k ) {
-						return { text: i18n.text( k ), value: k };
-					}),
-					onSelect: function( panel, event ) {
-						this._nodeSort = NODE_SORT_TYPES[ event.value ];
-						this.prefs.set("clusterOverview-nodeSort", event.value );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._indicesSort = this.prefs.get( "clusterOverview-indicesSort") || "desc";
-			this._indicesSortMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.SortIndices" ),
-				menu: new ui.SelectMenuPanel({
-					value: this._indicesSort,
-					items: [
-						{ value: "desc", text: i18n.text( "SortIndices.Descending" ) },
-						{ value: "asc", text: i18n.text( "SortIndices.Ascending" ) } ],
-					onSelect: function( panel, event ) {
-						this._indicesSort = event.value;
-						this.prefs.set( "clusterOverview-indicesSort", this._indicesSort );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._aliasRenderer = this.prefs.get( "clusterOverview-aliasRender" ) || "full";
-			this._aliasMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.ViewAliases" ),
-				menu: new ui.SelectMenuPanel({
-					value: this._aliasRenderer,
-					items: [
-						{ value: "full", text: i18n.text( "ViewAliases.Grouped" ) },
-						{ value: "list", text: i18n.text( "ViewAliases.List" ) },
-						{ value: "none", text: i18n.text( "ViewAliases.None" ) } ],
-					onSelect: function( panel, event ) {
-						this._aliasRenderer = event.value;
-						this.prefs.set( "clusterOverview-aliasRender", this._aliasRenderer );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._indexFilter = new ui.TextField({
-				value: this.prefs.get("clusterOverview-indexFilter"),
-				placeholder: i18n.text( "Overview.IndexFilter" ),
-				onchange: function( indexFilter ) {
-					this.prefs.set("clusterOverview-indexFilter", indexFilter.val() );
-					this.draw_handler();
-				}.bind(this)
-			});
-			this.el = $(this._main_template());
-			this.tablEl = this.el.find(".uiClusterOverview-table");
-			this.refresh();
-		},
-		remove: function() {
-			this._clusterState.removeObserver( "data", this.draw_handler );
-		},
-		refresh: function() {
-			this._refreshButton.disable();
-			this._clusterState.refresh();
-		},
-		draw_handler: function() {
-			var data = this._clusterState;
-			var indexFilter;
-			try {
-				var indexFilterRe = new RegExp( this._indexFilter.val() );
-				indexFilter = function(s) { return indexFilterRe.test(s); };
-			} catch(e) {
-				indexFilter = function() { return true; };
-			}
-			var clusterState = data.clusterState;
-			var status = data.status;
-			var nodeStats = data.nodeStats;
-			var clusterNodes = data.clusterNodes;
-			var nodes = [];
-			var indices = [];
-			var cluster = {};
-			var nodeIndices = {};
-			var indexIndices = {}, indexIndicesIndex = 0;
-			function newNode(n) {
-				return {
-					name: n,
-					routings: [],
-					master_node: clusterState.master_node === n
-				};
-			}
-			function newIndex(i) {
-				return {
-					name: i,
-					replicas: []
-				};
-			}
-			function getIndexForNode(n) {
-				return nodeIndices[n] = (n in nodeIndices) ? nodeIndices[n] : nodes.push(newNode(n)) - 1;
-			}
-			function getIndexForIndex(routings, i) {
-				var index = indexIndices[i] = (i in indexIndices) ?
-						(routings[indexIndices[i]] = routings[indexIndices[i]] || newIndex(i)) && indexIndices[i]
-						: ( ( routings[indexIndicesIndex] = newIndex(i) )  && indexIndicesIndex++ );
-				indices[index] = i;
-				return index;
-			}
-			$.each(clusterNodes.nodes, function(name, node) {
-				getIndexForNode(name);
-			});
-
-			var indexNames = [];
-			$.each(clusterState.routing_table.indices, function(name, index){
-				indexNames.push(name);
-			});
-			indexNames.sort();
-			if (this._indicesSort === "desc") indexNames.reverse();
-			indexNames.filter( indexFilter ).forEach(function(name) {
-				var indexObject = clusterState.routing_table.indices[name];
-				$.each(indexObject.shards, function(name, shard) {
-					shard.forEach(function(replica){
-						var node = replica.node;
-						if(node === null) { node = "Unassigned"; }
-						var index = replica.index;
-						var shard = replica.shard;
-						var routings = nodes[getIndexForNode(node)].routings;
-						var indexIndex = getIndexForIndex(routings, index);
-						var replicas = routings[indexIndex].replicas;
-						if(node === "Unassigned" || !indexObject.shards[shard]) {
-							replicas.push({ replica: replica });
-						} else {
-							replicas[shard] = {
-								replica: replica,
-								status: indexObject.shards[shard].filter(function(replica) {
-									return replica.node === node;
-								})[0]
-							};
-						}
-					});
-				});
-			});
-			indices = indices.map(function(index){
-				return {
-					name: index,
-					state: "open",
-					metadata: clusterState.metadata.indices[index],
-					status: status.indices[index]
-				};
-			}, this);
-			$.each(clusterState.metadata.indices, function(name, index) {
-				if(index.state === "close" && indexFilter( name )) {
-					indices.push({
-						name: name,
-						state: "close",
-						metadata: index,
-						status: null
-					});
-				}
-			});
-			nodes.forEach(function(node) {
-				node.stats = nodeStats.nodes[node.name];
-				var cluster = clusterNodes.nodes[node.name];
-				node.cluster = cluster || { name: "<unknown>" };
-				node.data_node = !( cluster && cluster.attributes && cluster.attributes.data === "false" );
-				for(var i = 0; i < indices.length; i++) {
-					node.routings[i] = node.routings[i] || { name: indices[i].name, replicas: [] };
-					node.routings[i].max_number_of_shards = indices[i].metadata.settings["index.number_of_shards"];
-					node.routings[i].open = indices[i].state === "open";
-				}
-			});
-			var aliasesIndex = {};
-			var aliases = [];
-			var indexClone = indices.map(function() { return false; });
-			$.each(clusterState.metadata.indices, function(name, index) {
-				index.aliases.forEach(function(alias) {
-					var aliasIndex = aliasesIndex[alias] = (alias in aliasesIndex) ? aliasesIndex[alias] : aliases.push( { name: alias, max: -1, min: 999, indices: [].concat(indexClone) }) - 1;
-					var indexIndex = indexIndices[name];
-					var aliasRow = aliases[aliasIndex];
-					aliasRow.min = Math.min(aliasRow.min, indexIndex);
-					aliasRow.max = Math.max(aliasRow.max, indexIndex);
-					aliasRow.indices[indexIndex] = indices[indexIndex];
-				});
-			});
-			cluster.aliases = aliases;
-			cluster.nodes = nodes
-				.filter( nodeFilter_none )
-				.sort( this._nodeSort );
-			indices.unshift({ name: null });
-			this._drawNodesView( cluster, indices );
-			this._refreshButton.enable();
-		},
-		_drawNodesView: function( cluster, indices ) {
-			this._nodesView && this._nodesView.remove();
-			this._nodesView = new ui.NodesView({
-				onRedraw: function() {
-					this.refresh();
-				}.bind(this),
-				interactive: ( this._refreshButton.value === -1 ),
-				aliasRenderer: this._aliasRenderer,
-				cluster: this.cluster,
-				data: {
-					cluster: cluster,
-					indices: indices
-				}
-			});
-			this._nodesView.attach( this.tablEl );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiClusterOverview", children: [
-				new ui.Toolbar({
-					label: i18n.text("Overview.PageTitle"),
-					left: [
-						this._nodeSortMenu,
-						this._indicesSortMenu,
-						this._aliasMenu,
-						this._indexFilter
-					],
-					right: [
-						this._refreshButton
-					]
-				}),
-				{ tag: "DIV", cls: "uiClusterOverview-table" }
-			] };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( app, i18n, raphael ) {
-
-	var ui = app.ns("ui");
-
-	ui.DateHistogram = ui.AbstractWidget.extend({
-		defaults: {
-			printEl: null, // (optional) if supplied, clicking on elements in the histogram changes the query
-			cluster: null, // (required)
-			query: null,   // (required) the current query
-			spec: null     // (required) // date field spec
-		},
-		init: function() {
-			this._super();
-			this.el = $(this._main_template());
-			this.query = this.config.query.clone();
-			// check if the index/types have changed and rebuild the histogram
-			this.config.query.on("results", function(query) {
-				if(this.queryChanged) {
-					this.buildHistogram(query);
-					this.queryChanged = false;
-				}
-			}.bind(this));
-			this.config.query.on("setIndex", function(query, params) {
-				this.query.setIndex(params.index, params.add);
-				this.queryChanged = true;
-			}.bind(this));
-			this.config.query.on("setType", function(query, params) {
-				this.query.setType(params.type, params.add);
-				this.queryChanged = true;
-			}.bind(this));
-			this.query.search.size = 0;
-			this.query.on("results", this._stat_handler);
-			this.query.on("results", this._aggs_handler);
-			this.buildHistogram();
-		},
-		buildHistogram: function(query) {
-			this.statAggs = this.query.addAggs({
-				stats: { field: this.config.spec.field_name }
-			});
-			this.query.query();
-			this.query.removeAggs(this.statAggs);
-		},
-		_stat_handler: function(query, results) {
-			if(! results.aggregations[this.statAggs]) { return; }
-			this.stats = results.aggregations[this.statAggs];
-			// here we are calculating the approximate range  that will give us less than 121 columns
-			var rangeNames = [ "year", "year", "month", "day", "hour", "minute" ];
-			var rangeFactors = [100000, 12, 30, 24, 60, 60000 ];
-			this.intervalRange = 1;
-			var range = this.stats.max - this.stats.min;
-			do {
-				this.intervalName = rangeNames.pop();
-				var factor = rangeFactors.pop();
-				this.intervalRange *= factor;
-				range = range / factor;
-			} while(range > 70);
-			this.dateAggs = this.query.addAggs({
-				date_histogram : {
-					field: this.config.spec.field_name,
-					interval: this.intervalName
-				}
-			});
-			this.query.query();
-			this.query.removeAggs(this.dateAggs);
-		},
-		_aggs_handler: function(query, results) {
-			if(! results.aggregations[this.dateAggs]) { return; }
-			var buckets = [], range = this.intervalRange;
-			var min = Math.floor(this.stats.min / range) * range;
-			var prec = [ "year", "month", "day", "hour", "minute", "second" ].indexOf(this.intervalName);
-			results.aggregations[this.dateAggs].buckets.forEach(function(entry) {
-				buckets[parseInt((entry.key - min) / range , 10)] = entry.doc_count;
-			}, this);
-			for(var i = 0; i < buckets.length; i++) {
-				buckets[i] = buckets[i] || 0;
-			}
-			this.el.removeClass("loading");
-			var el = this.el.empty();
-			var w = el.width(), h = el.height();
-			var r = raphael(el[0], w, h );
-			var printEl = this.config.printEl;
-			query = this.config.query;
-			r.g.barchart(0, 0, w, h, [buckets], { gutter: "0", vgutter: 0 }).hover(
-				function() {
-					this.flag = r.g.popup(this.bar.x, h - 5, this.value || "0").insertBefore(this);
-				}, function() {
-					this.flag.animate({opacity: 0}, 200, ">", function () {this.remove();});
-				}
-			).click(function() {
-				if(printEl) {
-					printEl.val(window.dateRangeParser.print(min + this.bar.index * range, prec));
-					printEl.trigger("keyup");
-					query.query();
-				}
-			});
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: "uiDateHistogram loading", css: { height: "50px" }, children: [
-				i18n.text("General.LoadingAggs")
-			] }
-		); }
-	});
-
-})( this.app, this.i18n, this.Raphael );
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	ui.ClusterConnect = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.cluster = this.config.cluster;
-			this.el = $.joey(this._main_template());
-			this.cluster.get( "", this._node_handler );
-		},
-		
-		_node_handler: function(data) {
-			if(data) {
-				this.prefs.set("app-base_uri", this.cluster.base_uri);
-			}
-		},
-		
-		_reconnect_handler: function() {
-			var base_uri = this.el.find(".uiClusterConnect-uri").val();
-			$("body").empty().append(new app.App("body", { id: "es", base_uri: base_uri }));
-		},
-		
-		_main_template: function() {
-			return { tag: "SPAN", cls: "uiClusterConnect", children: [
-				{ tag: "INPUT", type: "text", cls: "uiClusterConnect-uri", onkeyup: function( ev ) {
-					if(ev.which === 13) {
-						ev.preventDefault();
-						this._reconnect_handler();
-					}
-				}.bind(this), id: this.id("baseUri"), value: this.cluster.base_uri },
-				{ tag: "BUTTON", type: "button", text: i18n.text("Header.Connect"), onclick: this._reconnect_handler }
-			]};
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-
-	var StructuredQuery = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null  // (required) instanceof app.services.Cluster
-		},
-		_baseCls: "uiStructuredQuery",
-		init: function(parent) {
-			this._super();
-			this.selector = new ui.IndexSelector({
-				onIndexChanged: this._indexChanged_handler,
-				cluster: this.config.cluster
-			});
-			this.el = $(this._main_template());
-			this.out = this.el.find("DIV.uiStructuredQuery-out");
-			this.attach( parent );
-		},
-		
-		_indexChanged_handler: function( index ) {
-			this.filter && this.filter.remove();
-			this.filter = new ui.FilterBrowser({
-				cluster: this.config.cluster,
-				index: index,
-				onStartingSearch: function() { this.el.find("DIV.uiStructuredQuery-out").text( i18n.text("General.Searching") ); this.el.find("DIV.uiStructuredQuery-src").hide(); }.bind(this),
-				onSearchSource: this._searchSource_handler,
-				onResults: this._results_handler
-			});
-			this.el.find(".uiStructuredQuery-body").append(this.filter);
-		},
-		
-		_results_handler: function( filter, event ) {
-			var typeMap = {
-				"json": this._jsonResults_handler,
-				"table": this._tableResults_handler,
-				"csv": this._csvResults_handler
-			};
-			typeMap[ event.type ].call( this, event.data, event.metadata );
-		},
-		_jsonResults_handler: function( results ) {
-			this.el.find("DIV.uiStructuredQuery-out").empty().append( new ui.JsonPretty({ obj: results }));
-		},
-		_csvResults_handler: function( results ) {
-			this.el.find("DIV.uiStructuredQuery-out").empty().append( new ui.CSVTable({ results: results }));
-		},
-		_tableResults_handler: function( results, metadata ) {
-			// hack up a QueryDataSourceInterface so that StructuredQuery keeps working without using a Query object
-			var qdi = new data.QueryDataSourceInterface({ metadata: metadata, query: new data.Query() });
-			var tab = new ui.Table( {
-				store: qdi,
-				height: 400,
-				width: this.out.innerWidth()
-			} ).attach(this.out.empty());
-			qdi._results_handler(qdi.config.query, results);
-		},
-		
-		_showRawJSON : function() {
-			if($("#rawJsonText").length === 0) {
-				var hiddenButton = $("#showRawJSON");
-				var jsonText = $({tag: "P", type: "p", id: "rawJsonText"});
-				jsonText.text(hiddenButton[0].value);
-				hiddenButton.parent().append(jsonText);
-			}
-		},
-		
-		_searchSource_handler: function(src) {
-			var searchSourceDiv = this.el.find("DIV.uiStructuredQuery-src");
-			searchSourceDiv.empty().append(new app.ui.JsonPretty({ obj: src }));
-			if(typeof JSON !== "undefined") {
-				var showRawJSON = $({ tag: "BUTTON", type: "button", text: i18n.text("StructuredQuery.ShowRawJson"), id: "showRawJSON", value: JSON.stringify(src), onclick: this._showRawJSON });
-				searchSourceDiv.append(showRawJSON);
-			}
-			searchSourceDiv.show();
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: [
-				this.selector,
-				{ tag: "DIV", cls: "uiStructuredQuery-body" },
-				{ tag: "DIV", cls: "uiStructuredQuery-src", css: { display: "none" } },
-				{ tag: "DIV", cls: "uiStructuredQuery-out" }
-			]};
-		}
-	});
-
-	ui.StructuredQuery = ui.Page.extend({
-		init: function() {
-			this.q = new StructuredQuery( this.config );
-			this.el = this.q.el;
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-	var ut = app.ns("ut");
-
-	ui.FilterBrowser = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null,  // (required) instanceof app.services.Cluster
-			index: "" // (required) name of the index to query
-		},
-
-		init: function(parent) {
-			this._super();
-			this._cluster = this.config.cluster;
-			this.el = $(this._main_template());
-			this.filtersEl = this.el.find(".uiFilterBrowser-filters");
-			this.attach( parent );
-			new data.MetaDataFactory({ cluster: this._cluster, onReady: function(metadata, eventData) {
-				this.metadata = metadata;
-				this._createFilters_handler(eventData.originalData.metadata.indices);
-			}.bind(this) });
-		},
-
-		_createFilters_handler: function(data) {
-			var filters = [];
-			function scan_properties(path, obj) {
-				if (obj.properties) {
-					for (var prop in obj.properties) {
-						scan_properties(path.concat(prop), obj.properties[prop]);
-					}
-				} else {
-					// handle multi_field 
-					if (obj.fields) {
-						for (var subField in obj.fields) {
-							filters.push({ path: (path[path.length - 1] !== subField) ? path.concat(subField) : path, type: obj.fields[subField].type, meta: obj.fields[subField] });
-						}
-					} else {
-						filters.push({ path: path, type: obj.type, meta: obj });
-					}
-				}
-			}
-			for(var type in data[this.config.index].mappings) {
-				scan_properties([type], data[this.config.index].mappings[type]);
-			}
-
-			filters.sort( function(a, b) {
-				var x = a.path.join(".");
-				var y = b.path.join(".");
-				return (x < y) ? -1 : (x > y) ? 1 : 0;
-			});
-
-			this.filters = [
-				{ path: ["match_all"], type: "match_all", meta: {} },
-				{ path: ["_all"], type: "_all", meta: {}}
-			].concat(filters);
-
-			this._addFilterRow_handler();
-		},
-		
-		_addFilterRow_handler: function() {
-			this.filtersEl.append(this._filter_template());
-		},
-		
-		_removeFilterRow_handler: function(jEv) {
-			$(jEv.target).closest("DIV.uiFilterBrowser-row").remove();
-			if(this.filtersEl.children().length === 0) {
-				this._addFilterRow_handler();
-			}
-		},
-		
-		_search_handler: function() {
-			var search = new data.BoolQuery();
-			search.setSize( this.el.find(".uiFilterBrowser-outputSize").val() )
-			this.fire("startingSearch");
-			this.filtersEl.find(".uiFilterBrowser-row").each(function(i, row) {
-				row = $(row);
-				var bool = row.find(".bool").val();
-				var field = row.find(".field").val();
-				var op = row.find(".op").val();
-				var value = {};
-				if(field === "match_all") {
-					op = "match_all";
-				} else if(op === "range") {
-					var lowqual = row.find(".lowqual").val(),
-						highqual = row.find(".highqual").val();
-					if(lowqual.length) {
-						value[row.find(".lowop").val()] = lowqual;
-					}
-					if(highqual.length) {
-						value[row.find(".highop").val()] = highqual;
-					}
-				} else if(op === "fuzzy") {
-					var qual = row.find(".qual").val(),
-						fuzzyqual = row.find(".fuzzyqual").val();
-					if(qual.length) {
-						value["value"] = qual;
-					}
-					if(fuzzyqual.length) {
-						value[row.find(".fuzzyop").val()] = fuzzyqual;
-					}
-				} else {
-					value = row.find(".qual").val();
-				}
-				search.addClause(value, field, op, bool);
-			});
-			if(this.el.find(".uiFilterBrowser-showSrc").attr("checked")) {
-				this.fire("searchSource", search.search);
-			}
-			this._cluster.post( this.config.index + "/_search", search.getData(), this._results_handler );
-		},
-		
-		_results_handler: function( data ) {
-			var type = this.el.find(".uiFilterBrowser-outputFormat").val();
-			this.fire("results", this, { type: type, data: data, metadata: this.metadata });
-		},
-		
-		_changeQueryField_handler: function(jEv) {
-			var select = $(jEv.target);
-			var spec = select.children(":selected").data("spec");
-			select.siblings().remove(".op,.qual,.range,.fuzzy");
-			var ops = [];
-			if(spec.type === 'match_all') {
-			} else if(spec.type === '_all') {
-				ops = ["query_string"];
-			} else if(spec.type === 'string' || spec.type === 'text' || spec.type === 'keyword') {
-				ops = ["term", "wildcard", "prefix", "fuzzy", "range", "query_string", "text", "missing"];
-			} else if(spec.type === 'long' || spec.type === 'integer' || spec.type === 'float' ||
-					spec.type === 'byte' || spec.type === 'short' || spec.type === 'double') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'date') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'geo_point') {
-				ops = ["missing"];
-			} else if(spec.type === 'ip') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'boolean') {
-				ops = ["term"]
-			}
-			select.after({ tag: "SELECT", cls: "op", onchange: this._changeQueryOp_handler, children: ops.map(ut.option_template) });
-			select.next().change();
-		},
-		
-		_changeQueryOp_handler: function(jEv) {
-			var op = $(jEv.target), opv = op.val();
-			op.siblings().remove(".qual,.range,.fuzzy");
-			if(opv === 'term' || opv === 'wildcard' || opv === 'prefix' || opv === "query_string" || opv === 'text') {
-				op.after({ tag: "INPUT", cls: "qual", type: "text" });
-			} else if(opv === 'range') {
-				op.after(this._range_template());
-			} else if(opv === 'fuzzy') {
-				op.after(this._fuzzy_template());
-			}
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", children: [
-				{ tag: "DIV", cls: "uiFilterBrowser-filters" },
-				{ tag: "BUTTON", type: "button", text: i18n.text("General.Search"), onclick: this._search_handler },
-				{ tag: "LABEL", children:
-					i18n.complex("FilterBrowser.OutputType", { tag: "SELECT", cls: "uiFilterBrowser-outputFormat", children: [
-						{ text: i18n.text("Output.Table"), value: "table" },
-						{ text: i18n.text("Output.JSON"), value: "json" },
-						{ text: i18n.text("Output.CSV"), value: "csv" }
-					].map(function( o ) { return $.extend({ tag: "OPTION" }, o ); } ) } )
-				},
-				{ tag: "LABEL", children:
-					i18n.complex("FilterBrowser.OutputSize", { tag: "SELECT", cls: "uiFilterBrowser-outputSize",
-						children: [ "10", "50", "250", "1000", "5000", "25000" ].map( ut.option_template )
-					} )
-				},
-				{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", cls: "uiFilterBrowser-showSrc" }, i18n.text("Output.ShowSource") ] }
-			]};
-		},
-		
-		_filter_template: function() {
-			return { tag: "DIV", cls: "uiFilterBrowser-row", children: [
-				{ tag: "SELECT", cls: "bool", children: ["must", "must_not", "should"].map(ut.option_template) },
-				{ tag: "SELECT", cls: "field", onchange: this._changeQueryField_handler, children: this.filters.map(function(f) {
-					return { tag: "OPTION", data: { spec: f }, value: f.path.join("."), text: f.path.join(".") };
-				})},
-				{ tag: "BUTTON", type: "button", text: "+", onclick: this._addFilterRow_handler },
-				{ tag: "BUTTON", type: "button", text: "-", onclick: this._removeFilterRow_handler }
-			]};
-		},
-		
-		_range_template: function() {
-			return { tag: "SPAN", cls: "range", children: [
-				{ tag: "SELECT", cls: "lowop", children: ["gt", "gte"].map(ut.option_template) },
-				{ tag: "INPUT", type: "text", cls: "lowqual" },
-				{ tag: "SELECT", cls: "highop", children: ["lt", "lte"].map(ut.option_template) },
-				{ tag: "INPUT", type: "text", cls: "highqual" }
-			]};
-		},
-
-		_fuzzy_template: function() {
-			return { tag: "SPAN", cls: "fuzzy", children: [
-				{ tag: "INPUT", cls: "qual", type: "text" },
-				{ tag: "SELECT", cls: "fuzzyop", children: ["max_expansions", "min_similarity"].map(ut.option_template) },
-				{ tag: "INPUT", cls: "fuzzyqual", type: "text" }
-			]};
-		}
-	});
-	
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.IndexSelector = ui.AbstractWidget.extend({
-		init: function(parent) {
-			this._super();
-			this.el = $(this._main_template());
-			this.attach( parent );
-			this.cluster = this.config.cluster;
-			this.update();
-		},
-		update: function() {
-			this.cluster.get( "_stats", this._update_handler );
-		},
-		
-		_update_handler: function(data) {
-			var options = [];
-			var index_names = Object.keys(data.indices).sort();
-			for(var i=0; i < index_names.length; i++) { 
-				name = index_names[i];
-				options.push(this._option_template(name, data.indices[name])); 
-			}
-			this.el.find(".uiIndexSelector-select").empty().append(this._select_template(options));
-			this._indexChanged_handler();
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiIndexSelector", children: i18n.complex( "IndexSelector.SearchIndexForDocs", { tag: "SPAN", cls: "uiIndexSelector-select" } ) };
-		},
-
-		_indexChanged_handler: function() {
-			this.fire("indexChanged", this.el.find("SELECT").val());
-		},
-
-		_select_template: function(options) {
-			return { tag: "SELECT", children: options, onChange: this._indexChanged_handler };
-		},
-		
-		_option_template: function(name, index) {
-			return  { tag: "OPTION", value: name, text: i18n.text("IndexSelector.NameWithDocs", name, index.primaries.docs.count ) };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.Header = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null,
-			clusterState: null
-		},
-		_baseCls: "uiHeader",
-		init: function() {
-			this._clusterConnect = new ui.ClusterConnect({
-				cluster: this.config.cluster
-			});
-			var quicks = [
-				{ text: i18n.text("Nav.Info"), path: "" },
-				{ text: i18n.text("Nav.Status"), path: "_stats" },
-				{ text: i18n.text("Nav.NodeStats"), path: "_nodes/stats" },
-				{ text: i18n.text("Nav.ClusterNodes"), path: "_nodes" },
-				{ text: i18n.text("Nav.Plugins"), path: "_nodes/plugins" },
-				{ text: i18n.text("Nav.ClusterState"), path: "_cluster/state" },
-				{ text: i18n.text("Nav.ClusterHealth"), path: "_cluster/health" },
-				{ text: i18n.text("Nav.Templates"), path: "_template" }
-			];
-			var cluster = this.config.cluster;
-			var quickPanels = {};
-			var menuItems = quicks.map( function( item ) {
-				return { text: item.text, onclick: function() {
-					cluster.get( item.path, function( data ) {
-						quickPanels[ item.path ] && quickPanels[ item.path ].el && quickPanels[ item.path ].remove();
-						quickPanels[ item.path ] = new ui.JsonPanel({
-							title: item.text,
-							json: data
-						});
-					} );
-				} };
-			}, this );
-			this._quickMenu = new ui.MenuButton({
-				label: i18n.text("NodeInfoMenu.Title"),
-				menu: new ui.MenuPanel({
-					items: menuItems
-				})
-			});
-			this.el = $.joey( this._main_template() );
-			this.nameEl = this.el.find(".uiHeader-name");
-			this.statEl = this.el.find(".uiHeader-status");
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", function( state ) {
-				var shards = state.status._shards;
-				var colour = state.clusterHealth.status;
-				var name = state.clusterState.cluster_name;
-				this.nameEl.text( name );
-				this.statEl
-					.text( i18n.text("Header.ClusterHealth", colour, shards.successful, shards.total ) )
-					.css( "background", colour );
-			}.bind(this));
-			this.statEl.text( i18n.text("Header.ClusterNotConnected") ).css("background", "grey");
-			this._clusterState.refresh();
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: this._baseCls, children: [
-				this._clusterConnect,
-				{ tag: "SPAN", cls: "uiHeader-name" },
-				{ tag: "SPAN", cls: "uiHeader-status" },
-				{ tag: "H1", text: i18n.text("General.Elasticsearch") },
-				{ tag: "SPAN", cls: "pull-right", children: [
-					this._quickMenu
-				] }
-			] }
-		); }
-	} );
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( $, app, i18n ) {
-	
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.IndexOverview = ui.Page.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", this._refresh_handler );
-			this.el = $(this._main_template());
-			this._refresh_handler();
-		},
-		remove: function() {
-			this._clusterState.removeObserver( "data", this._refresh_handler );
-		},
-		_refresh_handler: function() {
-			var state = this._clusterState;
-			var view = {
-				indices: acx.eachMap( state.status.indices, function( name, index ) {
-					return {
-						name: name,
-						state: index
-					};
-				}).sort( function( a, b ) {
-					return a.name < b.name ? -1 : 1;
-				})
-			};
-			this._indexViewEl && this._indexViewEl.remove();
-			this._indexViewEl = $( this._indexTable_template( view ) );
-			this.el.find(".uiIndexOverview-table").append( this._indexViewEl );
-		},
-		_newIndex_handler: function() {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("ClusterOverView.IndexName"), name: "_name", require: true }),
-					new ui.TextField({
-						label: i18n.text("ClusterOverview.NumShards"),
-						name: "number_of_shards",
-						value: "5",
-						require: function( val ) { return parseInt( val, 10 ) >= 1; }
-					}),
-					new ui.TextField({
-						label: i18n.text("ClusterOverview.NumReplicas"),
-						name: "number_of_replicas",
-						value: "1",
-						require: function( val ) { return parseInt( val, 10 ) >= 0; }
-					})
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("ClusterOverview.NewIndex"),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function(panel, args) {
-					if(fields.validate()) {
-						var data = fields.getData();
-						var name = data["_name"];
-						delete data["_name"];
-						this.config.cluster.put( encodeURIComponent( name ), JSON.stringify({ settings: { index: data } }), function(d) {
-							dialog.close();
-							alert(JSON.stringify(d));
-							this._clusterState.refresh();
-						}.bind(this) );
-					}
-				}.bind(this)
-			}).open();
-		},
-		_indexTable_template: function( view ) { return (
-			{ tag: "TABLE", cls: "table", children: [
-				{ tag: "THEAD", children: [
-					{ tag: "TR", children: [
-						{ tag: "TH" },
-						{ tag: "TH", children: [
-							{ tag: "H3", text: "Size" }
-						] },
-						{ tag: "TH", children: [
-							{ tag: "H3", text: "Docs" }
-						] }
-					] }
-				] },
-				{ tag: "TBODY", cls: "striped", children: view.indices.map( this._index_template, this ) }
-			] }
-		); },
-
-		_index_template: function( index ) { return (
-			{ tag: "TR", children: [
-				{ tag: "TD", children: [
-					{ tag: "H3", text: index.name }
-				] },
-				{ tag: "TD", text: ut.byteSize_template( index.state.primaries.store.size_in_bytes ) + "/" + ut.byteSize_template( index.state.total.store.size_in_bytes ) },
-				{ tag: "TD", text: ut.count_template( index.state.primaries.docs.count ) }
-			] }
-		); },
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiIndexOverview", children: [
-				new ui.Toolbar({
-					label: i18n.text("IndexOverview.PageTitle"),
-					left: [
-						new ui.Button({
-							label: i18n.text("ClusterOverview.NewIndex"),
-							onclick: this._newIndex_handler
-						}),
-					]
-				}),
-				{ tag: "DIV", cls: "uiIndexOverview-table", children: this._indexViewEl }
-			] };
-		}
-
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
-(function( app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	app.App = ui.AbstractWidget.extend({
-		defaults: {
-			base_uri: null
-		},
-		init: function(parent) {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.base_uri = this.config.base_uri || this.prefs.get("app-base_uri") || "http://localhost:9200";
-			if( this.base_uri.charAt( this.base_uri.length - 1 ) !== "/" ) {
-				// XHR request fails if the URL is not ending with a "/"
-				this.base_uri += "/";
-			}
-			if( this.config.auth_user ) {
-				var credentials = window.btoa( this.config.auth_user + ":" + this.config.auth_password );
-				$.ajaxSetup({
-					headers: {
-						"Authorization": "Basic " + credentials
-					}
-				});
-			}
-			this.cluster = new services.Cluster({ base_uri: this.base_uri });
-			this._clusterState = new services.ClusterState({
-				cluster: this.cluster
-			});
-
-			this._header = new ui.Header({ cluster: this.cluster, clusterState: this._clusterState });
-			this.$body = $.joey( this._body_template() );
-			this.el = $.joey(this._main_template());
-			this.attach( parent );
-			this.instances = {};
-			this.el.find(".uiApp-headerMenuItem:first").click();
-			if( this.config.dashboard ) {
-				if( this.config.dashboard === "cluster" ) {
-					var page = this.instances["ClusterOverview"];
-					page._refreshButton.set( 5000 );
-				}
-			}
-		},
-
-		navigateTo: function( type, config, ev ) {
-			if( ev.target.classList.contains( "uiApp-headerNewMenuItem" ) ) {
-				this.showNew( type, config, ev );
-			} else {
-				var ref = type + "0";
-				if(! this.instances[ ref ]) {
-					this.createPage( type, 0, config );
-				}
-				this.show( ref, ev );
-			}
-		},
-
-		createPage: function( type, id, config ) {
-			var page = this.instances[ type + id ] = new ui[ type ]( config );
-			this.$body.append( page );
-			return page;
-		},
-
-		show: function( ref, ev ) {
-			$( ev.target ).closest("DIV.uiApp-headerMenuItem").addClass("active").siblings().removeClass("active");
-			for(var p in this.instances) {
-				this.instances[p][ p === ref ? "show" : "hide" ]();
-			}
-		},
-
-		showNew: function( type, config, jEv ) {
-			var ref, page, $tab,
-				type_index = 0;
-
-			while ( ! page ) {
-				ref = type + ( ++type_index );
-				if (! ( ref in this.instances ) ) {
-					page = this.createPage( type, type_index, config );
-				}
-			}
-
-			// Add the tab and its click handlers
-			$tab = $.joey({
-				tag: "DIV",
-				cls: "uiApp-headerMenuItem pull-left",
-				text: i18n.text("Nav." + type ) + " " + type_index,
-				onclick: function( ev ) { this.show( ref, ev ); }.bind(this),
-				children: [
-					{ tag: "A", text: " [-]", onclick: function (ev) {
-						$tab.remove();
-						page.remove();
-						delete this.instances[ ref ];
-					}.bind(this) }
-				]
-			});
-
-			$('.uiApp-headerMenu').append( $tab );
-			$tab.trigger("click");
-		},
-
-		_openAnyRequest_handler: function(ev) { this.navigateTo("AnyRequest", { cluster: this.cluster }, ev ); },
-		_openStructuredQuery_handler: function(ev) { this.navigateTo("StructuredQuery", { cluster: this.cluster }, ev ); },
-		_openBrowser_handler: function(ev) { this.navigateTo("Browser", { cluster: this.cluster }, ev );  },
-		_openClusterOverview_handler: function(ev) { this.navigateTo("ClusterOverview", { cluster: this.cluster, clusterState: this._clusterState }, ev ); },
-		_openIndexOverview_handler: function(ev) { this.navigateTo("IndexOverview", { cluster: this.cluster, clusterState: this._clusterState }, ev ); },
-
-		_body_template: function() { return (
-			{ tag: "DIV", id: this.id("body"), cls: "uiApp-body" }
-		); },
-
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiApp", children: [
-				{ tag: "DIV", id: this.id("header"), cls: "uiApp-header", children: [
-					this._header,
-					{ tag: "DIV", cls: "uiApp-headerMenu", children: [
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Overview"), onclick: this._openClusterOverview_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Indices"), onclick: this._openIndexOverview_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Browser"), onclick: this._openBrowser_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.StructuredQuery"), onclick: this._openStructuredQuery_handler, children: [
-							{ tag: "A", cls: "uiApp-headerNewMenuItem ", text: ' [+]' }
-						] },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.AnyRequest"), onclick: this._openAnyRequest_handler, children: [
-							{ tag: "A", cls: "uiApp-headerNewMenuItem ", text: ' [+]' }
-						] },
-					]}
-				]},
-				this.$body
-			]};
-		}
-		
-	});
-
-})( this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/favicon.png b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/favicon.png
deleted file mode 100644
index f433ec6d0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/favicon.png
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/loading.gif b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/loading.gif
deleted file mode 100644
index f001e23f7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/loading.gif
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/reset.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/reset.css
deleted file mode 100644
index 29a5f1b69..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/base/reset.css
+++ /dev/null
@@ -1,44 +0,0 @@
-BODY {
-	font-family: Verdana, sans-serif;
-	font-size: 73%;
-	padding: 0;
-	margin: 0;
-}
-
-INPUT, SELECT, TEXTAREA {
-	border: 1px solid #cecece;
-	padding: 1px 3px;
-	background: white;
-}
-
-SELECT {
-	padding: 0;
-}
-
-.saf SELECT {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-TEXTAREA, CODE {
-	font-family: monospace;
-	font-size: 13px;
-}
-
-BUTTON::-moz-focus-inner {
-	border: none;
-}
-
-.pull-left {
-	float: left;
-}
-
-.pull-right {
-	float: right;
-}
-
-.loading  {
-	background-image: url(loading.gif);
-	background-repeat: no-repeat;
-	text-indent: 20px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/FontAwesome.otf b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/FontAwesome.otf
deleted file mode 100644
index 8b0f54e47..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/FontAwesome.otf
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.eot b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 7c79c6a6b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.eot
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.svg b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 45fdf3383..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="1792" />
-<glyph unicode="&#xf198;" horiz-adv-x="1792" />
-<glyph unicode="&#xf199;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.ttf b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index e89738de5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.ttf
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.woff b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 8c1748aab..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/fonts/fontawesome-webfont.woff
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/i18n.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/i18n.js
deleted file mode 100644
index 9765ded86..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/i18n.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function() {
-	/**
-	 * provides text formatting and i18n key storage features<br>
-	 * implements most of the Sun Java MessageFormat functionality.
-	 * @see <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/MessageFormat.html" target="sun">Sun's Documentation</a>
-	 */
-
-	var keys = {};
-
-	var format = function(message, args) {
-		var substitute = function() {
-			var format = arguments[1].split(',');
-			var substr = escape(args[format.shift()]);
-			if(format.length === 0) {
-				return substr; // simple substitution eg {0}
-			}
-			switch(format.shift()) {
-				case "number" : return (new Number(substr)).toLocaleString();
-				case "date" : return (new Date(+substr)).toLocaleDateString(); // date and time require milliseconds since epoch
-				case "time" : return (new Date(+substr)).toLocaleTimeString(); //  eg i18n.text("Key", +(new Date())); for current time
-			}
-			var styles = format.join("").split("|").map(function(style) {
-				return style.match(/(-?[\.\d]+)(#|<)([^{}]*)/);
-			});
-			var match = styles[0][3];
-			for(var i=0; i<styles.length; i++) {
-				if((styles[i][2] === "#" && (+styles[i][1]) === (+substr)) ||
-						(styles[i][2] === "<" && ((+styles[i][1]) < (+substr)))) {
-					match = styles[i][3];
-				}
-			}
-			return match;
-		};
-
-		return message && message.replace(/'(')|'([^']+)'|([^{']+)|([^']+)/g, function(x, sq, qs, ss, sub) {
-			do {} while(sub && (sub !== (sub = (sub.replace(/\{([^{}]+)\}/, substitute)))));
-			return sq || qs || ss || unescape(sub);
-		});
-	};
-
-	this.i18n = {
-
-		setKeys: function(strings) {
-			for(var key in strings) {
-				keys[key] = strings[key];
-			}
-		},
-
-		text: function() {
-			var args = Array.prototype.slice.call(arguments),
-				key = keys[args.shift()];
-			if(args.length === 0) {
-				return key;
-			}
-			return format(key, args);
-		},
-
-		complex: function() {
-			var args = Array.prototype.slice.call(arguments),
-				key = keys[args.shift()],
-				ret = [],
-				replacer = function(x, pt, sub) { ret.push(pt || args[+sub]); return ""; };
-			do {} while(key && key !== (key = key.replace(/([^{]+)|\{(\d+)\}/, replacer )));
-			return ret;
-		}
-
-	};
-
-})();
-
-(function() {
-	var nav = window.navigator;
-	var userLang = ( nav.languages && nav.languages[0] ) || nav.language || nav.userLanguage;
-	var scripts = document.getElementsByTagName('script');
-	var data = scripts[ scripts.length - 1].dataset;
-	if( ! data["langs"] ) {
-		return;
-	}
-	var langs = data["langs"].split(/\s*,\s*/);
-	var script0 = scripts[0];
-	function install( lang ) {
-		var s = document.createElement("script");
-		s.src = data["basedir"] + "/" + lang + '_strings.js';
-		s.async = false;
-		script0.parentNode.appendChild(s);
-		script0 = s;
-	}
-
-	install( langs.shift() ); // always install primary language
-	userLang && langs
-		.filter( function( lang ) { return userLang.indexOf( lang ) === 0; } )
-		.forEach( install );
-}());
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/index.html b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/index.html
deleted file mode 100644
index 4e07bab0b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>elasticsearch-head</title>
-		<link rel="stylesheet" href="base/reset.css">
-		<link rel="stylesheet" href="vendor.css">
-		<link rel="stylesheet" href="app.css">
-		<script src="i18n.js" data-baseDir="lang" data-langs="en,fr,pt,zh,tr"></script>
-		<script src="vendor.js"></script>
-		<script src="app.js"></script>
-		<script>
-			window.onload = function() {
-				if(location.href.contains("/_plugin/")) {
-					var base_uri = location.href.replace(/_plugin\/.*/, '');
-				}
-				var args = location.search.substring(1).split("&").reduce(function(r, p) {
-					r[decodeURIComponent(p.split("=")[0])] = decodeURIComponent(p.split("=")[1]); return r;
-				}, {});
-				new app.App("body", {
-					id: "es",
-					base_uri: args["base_uri"] || base_uri,
-					auth_user : args["auth_user"] || "",
-					auth_password : args["auth_password"],
-					dashboard: args["dashboard"]
-				});
-			};
-		</script>
-		<link rel="icon" href="base/favicon.png" type="image/png">
-	</head>
-	<body></body>
-</html>
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/en_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/en_strings.js
deleted file mode 100644
index 3ee522ac8..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/en_strings.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "Loading Aggregations...",
-	"General.Searching": "Searching...",
-	"General.Search": "Search",
-	"General.Help": "Help",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Refresh",
-	"General.ManualRefresh": "Manual Refresh",
-	"General.RefreshQuickly": "Refresh quickly",
-	"General.Refresh5seconds": "Refresh every 5 seconds",
-	"General.Refresh1minute": "Refresh every minute",
-	"AliasForm.AliasName": "Alias Name",
-	"AliasForm.NewAliasForIndex": "New Alias for {0}",
-	"AliasForm.DeleteAliasMessage": "type ''{0}'' to delete {1}. There is no undo",
-	"AnyRequest.DisplayOptions" : "Display Options",
-	"AnyRequest.AsGraph" : "Graph Results",
-	"AnyRequest.AsJson" : "Show Raw JSON",
-	"AnyRequest.AsTable" : "Show Search Results Table",
-	"AnyRequest.History" : "History",
-	"AnyRequest.RepeatRequest" : "Repeat Request",
-	"AnyRequest.RepeatRequestSelect" : "Repeat request every ",
-	"AnyRequest.Transformer" : "Result Transformer",
-	"AnyRequest.Pretty": "Pretty",
-	"AnyRequest.Query" : "Query",
-	"AnyRequest.Request": "Request",
-	"AnyRequest.Requesting": "Requesting...",
-	"AnyRequest.ValidateJSON": "Validate JSON",
-	"Browser.Title": "Browser",
-	"Browser.ResultSourcePanelTitle": "Result Source",
-	"Command.DELETE": "DELETE",
-	"Command.SHUTDOWN": "SHUTDOWN",
-	"Command.DeleteAliasMessage": "Delete Alias?",
-	"ClusterOverView.IndexName": "Index Name",
-	"ClusterOverview.NumShards": "Number of Shards",
-	"ClusterOverview.NumReplicas": "Number of Replicas",
-	"ClusterOverview.NewIndex": "New Index",
-	"IndexActionsMenu.Title": "Actions",
-	"IndexActionsMenu.NewAlias": "New Alias...",
-	"IndexActionsMenu.Refresh": "Refresh",
-	"IndexActionsMenu.Flush": "Flush",
-	"IndexActionsMenu.Optimize": "Optimize...",
-	"IndexActionsMenu.Snapshot": "Gateway Snapshot",
-	"IndexActionsMenu.Analyser": "Test Analyser",
-	"IndexActionsMenu.Open": "Open",
-	"IndexActionsMenu.Close": "Close",
-	"IndexActionsMenu.Delete": "Delete...",
-	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Index Status",
-	"IndexInfoMenu.Metadata": "Index Metadata",
-	"IndexCommand.TextToAnalyze": "Text to Analyse",
-	"IndexCommand.ShutdownMessage": "type ''{0}'' to shutdown {1}. Node can NOT be restarted from this interface",
-	"IndexOverview.PageTitle": "Indices Overview",
-	"IndexSelector.NameWithDocs": "{0} ({1} docs)",
-	"IndexSelector.SearchIndexForDocs": "Search {0} for documents where:",
-	"FilterBrowser.OutputType": "Output Results: {0}",
-	"FilterBrowser.OutputSize": "Number of Results: {0}",
-	"Header.ClusterHealth": "cluster health: {0} ({1} of {2})",
-	"Header.ClusterNotConnected": "cluster health: not connected",
-	"Header.Connect": "Connect",
-	"Nav.AnyRequest": "Any Request",
-	"Nav.Browser": "Browser",
-	"Nav.ClusterHealth": "Cluster Health",
-	"Nav.ClusterState": "Cluster State",
-	"Nav.ClusterNodes": "Nodes Info",
-	"Nav.Info": "Info",
-	"Nav.NodeStats": "Nodes Stats",
-	"Nav.Overview": "Overview",
-	"Nav.Indices": "Indices",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Indices Stats",
-	"Nav.Templates": "Templates",
-	"Nav.StructuredQuery": "Structured Query",
-	"NodeActionsMenu.Title": "Actions",
-	"NodeActionsMenu.Shutdown": "Shutdown...",
-	"NodeInfoMenu.Title": "Info",
-	"NodeInfoMenu.ClusterNodeInfo": "Cluster Node Info",
-	"NodeInfoMenu.NodeStats": "Node Stats",
-	"NodeType.Client": "Client Node",
-	"NodeType.Coord": "Coordinator",
-	"NodeType.Master": "Master Node",
-	"NodeType.Tribe": "Tribe Node",
-	"NodeType.Worker": "Worker Node",
-	"NodeType.Unassigned": "Unassigned",
-	"OptimizeForm.OptimizeIndex": "Optimize {0}",
-	"OptimizeForm.MaxSegments": "Maximum # Of Segments",
-	"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
-	"OptimizeForm.FlushAfter": "Flush After Optimize",
-	"OptimizeForm.WaitForMerge": "Wait For Merge",
-	"Overview.PageTitle" : "Cluster Overview",
-	"Output.JSON": "JSON",
-	"Output.Table": "Table",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "Show query source",
-	"Preference.SortCluster": "Sort Cluster",
-	"Sort.ByName": "By Name",
-	"Sort.ByAddress": "By Address",
-	"Sort.ByType": "By Type",
-	"Preference.SortIndices": "Sort Indices",
-	"SortIndices.Descending": "Descending",
-	"SortIndices.Ascending": "Ascending",
-	"Preference.ViewAliases": "View Aliases",
-	"ViewAliases.Grouped": "Grouped",
-	"ViewAliases.List": "List",
-	"ViewAliases.None": "None",
-	"Overview.IndexFilter": "Index Filter",
-	"TableResults.Summary": "Searched {0} of {1} shards. {2} hits. {3} seconds",
-	"QueryFilter.AllIndices": "All Indices",
-	"QueryFilter.AnyValue": "any",
-	"QueryFilter-Header-Indices": "Indices",
-	"QueryFilter-Header-Types": "Types",
-	"QueryFilter-Header-Fields": "Fields",
-	"QueryFilter.DateRangeHint.from": "From : {0}",
-	"QueryFilter.DateRangeHint.to": "  To : {0}",
-	"Query.FailAndUndo": "Query Failed. Undoing last changes",
-	"StructuredQuery.ShowRawJson": "Show Raw JSON"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>The Result Transformer can be used to post process the raw json results from a request into a more useful format.</p>\
-		<p>The transformer should contain the body of a javascript function. The return value from the function becomes the new value passed to the json printer</p>\
-		<p>Example:<br>\
-		  <code>return root.hits.hits[0];</code> would traverse a result set to show just the first match<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> would return the total memory used across an entire cluster<br></p>\
-		<p>The following functions are available and can be useful processing arrays and objects<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>When Repeat Request is running, an extra parameter called prev is passed to the transformation function. This allows comparisons, and cumulative graphing</p>\
-		<p>Example:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> would return the load average on the first cluster node over the last minute\
-		This could be fed into the Graph to produce a load graph for the node\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>Raw Json: shows complete results of the query and transformation in raw JSON format </p>\
-		<p>Graph Results: To produce a graph of your results, use the result transformer to produce an array of values</p>\
-		<p>Search Results Table: If your query is a search, you can display the results of the search in a table.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Date fields accept a natural language query to produce a From and To date that form a range that the results are queried over.</p>\
-		<p>The following formats are supported:</p>\
-		<ul>\
-			<li><b>Keywords / Key Phrases</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				searches for dates matching the keyword. <code>last year</code> would search all of last year.</li>\
-			<li><b>Ranges</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (spaces optional, many synonyms for range qualifiers)<br>\
-				Create a search range centered on <code>now</code> extending into the past and future by the amount specified.</li>\
-			<li><b>DateTime and Partial DateTime</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				these formats specify a specific date range. <code>2011</code> would search the whole of 2011, while <code>2011-01-18 12:32:45</code> would only search for results in that 1 second range</li>\
-			<li><b>Time and Time Partials</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				these formats search for a particular time during the current day. <code>12:32</code> would search that minute during today</li>\
-			<li><b>Date Ranges</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				A Date Range is created by specifying two dates in any format (Keyword / DateTime / Time) separated by &lt; or -&gt; (both do the same thing). If either end of the date range is missing, it is the same as having no constraint in that direction.</li>\
-			<li><b>Date Range using Offset</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Searches the specified date including the range in the direction specified.</li>\
-			<li><b>Anchored Ranges</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Similar to above except the range is extend in both directions from the anchor date</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/fr_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/fr_strings.js
deleted file mode 100644
index 1efb5ab82..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/fr_strings.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-//	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs" : "Chargement des facettes...",
-	"General.Searching": "Recherche en cours...",
-	"General.Search": "Recherche",
-	"General.Help": "Aide",
-//	"General.HelpGlyph": "?",
-//	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Rafraîchir",
-	"General.ManualRefresh": "Rafraîchissement manuel",
-	"General.RefreshQuickly": "Rafraîchissement rapide",
-	"General.Refresh5seconds": "Rafraîchissement toutes les 5 secondes",
-	"General.Refresh1minute": "Rafraîchissement toutes les minutes",
-	"AliasForm.AliasName": "Alias",
-	"AliasForm.NewAliasForIndex": "Nouvel Alias pour {0}",
-	"AliasForm.DeleteAliasMessage": "Entrez ''{0}'' pour effacer {1}. Attention, action irréversible.",
-	"AnyRequest.DisplayOptions" : "Options d'affichage",
-	"AnyRequest.AsGraph" : "En graphe",
-	"AnyRequest.AsJson" : "En JSON brut",
-	"AnyRequest.AsTable" : "En tableau",
-	"AnyRequest.History" : "Historique",
-	"AnyRequest.RepeatRequest" : "Répétition automatique de la requête",
-	"AnyRequest.RepeatRequestSelect" : "Répéter la requête toutes les ",
-	"AnyRequest.Transformer" : "Transformation des résultats",
-//	"AnyRequest.Pretty": "Pretty",
-	"AnyRequest.Query" : "Recherche",
-	"AnyRequest.Request": "Requête",
-	"AnyRequest.Requesting": "Requête en cours...",
-	"AnyRequest.ValidateJSON": "Valider le JSON",
-	"Browser.Title": "Navigateur",
-	"Browser.ResultSourcePanelTitle": "Résultat au format JSON",
-	"Command.DELETE": "SUPPRIMER",
-	"Command.SHUTDOWN": "ETEINDRE",
-	"Command.DeleteAliasMessage": "Supprimer l'Alias?",
-	"ClusterOverView.IndexName": "Index",
-	"ClusterOverview.NumShards": "Nombre de shards",
-	"ClusterOverview.NumReplicas": "Nombre de replica",
-	"ClusterOverview.NewIndex": "Nouvel Index",
-//	"IndexActionsMenu.Title": "Actions",
-	"IndexActionsMenu.NewAlias": "Nouvel Alias...",
-	"IndexActionsMenu.Refresh": "Rafraîchir",
-	"IndexActionsMenu.Flush": "Flusher",
-	"IndexActionsMenu.Optimize": "Optimiser...",
-	"IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)",
-	"IndexActionsMenu.Analyser": "Tester un analyseur",
-	"IndexActionsMenu.Open": "Ouvrir",
-	"IndexActionsMenu.Close": "Fermer",
-	"IndexActionsMenu.Delete": "Effacer...",
-//	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Etat de l'Index",
-	"IndexInfoMenu.Metadata": "Métadonnées de l'Index",
-	"IndexCommand.TextToAnalyze": "Texte à analyser",
-	"IndexCommand.ShutdownMessage": "Entrez ''{0}'' pour éteindre {1}. Le noeud NE PEUT PAS être redémarré depuis cette interface.",
-//	"IndexSelector.NameWithDocs": "{0} ({1} docs)",
-	"IndexSelector.SearchIndexForDocs": "Chercher dans {0} les documents correspondant à",
-	"FilterBrowser.OutputType": "Format d'affichage des résultats {0}",
-	"FilterBrowser.OutputSize": "Nombre de Résultats: {0}",
-	"Header.ClusterHealth": "Santé du cluster: {0} ({1} {2})",
-	"Header.ClusterNotConnected": "Santé du cluster: non connecté",
-	"Header.Connect": "Se connecter",
-	"Nav.AnyRequest": "Autres requêtes",
-	"Nav.StructuredQuery": "Requêtes structurées",
-	"Nav.Browser": "Navigateur",
-	"Nav.ClusterHealth": "Santé du cluster",
-	"Nav.ClusterState": "Etat du cluster",
-	"Nav.ClusterNodes": "Noeuds du cluster",
-//	"Nav.Info": "Info",
-	"Nav.NodeStats": "Statistiques sur les noeuds",
-	"Nav.Overview": "Aperçu",
-	"Nav.Indices": "Index",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Etat",
-	"Nav.Templates": "Templates",
-	"Nav.StructuredQuery": "Recherche Structurée",
-//	"NodeActionsMenu.Title": "Actions",
-	"NodeActionsMenu.Shutdown": "Eteindre...",
-//	"NodeInfoMenu.Title": "Info",
-	"NodeInfoMenu.ClusterNodeInfo": "Infos sur le noeud du cluster",
-	"NodeInfoMenu.NodeStats": "Statistiques du noeud",
-	"NodeType.Client": "Noeud Client",
-	"NodeType.Coord": "Coordinateur",
-	"NodeType.Master": "Noeud Master",
-	"NodeType.Tribe": "Noeud Tribe",
-	"NodeType.Worker": "Noeud Worker",
-	"NodeType.Unassigned": "Non assigné",
-	"OptimizeForm.OptimizeIndex": "Optimiser {0}",
-	"OptimizeForm.MaxSegments": "Nombre maximum de segments",
-	"OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions",
-	"OptimizeForm.FlushAfter": "Flusher après l'optimisation",
-	"OptimizeForm.WaitForMerge": "Attendre la fin de la fusion",
-	"Overview.PageTitle" : "Aperçu du cluster",
-//	"Output.JSON": "JSON",
-	"Output.Table": "Tableau",
-	"Output.ShowSource": "Voir la requête source",
-    "TableResults.Summary": "Recherche sur {0} des {1} shards. {2} résultats. {3} secondes",
-	"QueryFilter.AllIndices": "Tous les index",
-	"QueryFilter.AnyValue": "Tout",
-	"QueryFilter-Header-Indices": "Index",
-//	"QueryFilter-Header-Types": "Types",
-	"QueryFilter-Header-Fields": "Champs",
-	"QueryFilter.DateRangeHint.from": "De : {0}",
-	"QueryFilter.DateRangeHint.to": "  A : {0}",
-	"Query.FailAndUndo": "Requête en échec. Annulation des dernières modifications.",
-	"StructuredQuery.ShowRawJson": "Voir le JSON brut"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>Le transformateur de résultats peut être utilisé pour modifier a posteriori les résultats JSON bruts dans un format plus utile.</p>\
-		<p>Le transformateur devrait contenir le corps d'une fonction javascript. La valeur de retour de la fonction devient la nouvelle valeur qui sera passée à l'afficheur des documents JSON.</p>\
-		<p>Exemple:<br>\
-		  <code>return root.hits.hits[0];</code> ne renverra que le premier élément de l'ensemble des résultats.<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> retournera la mémoire totale utilisée dans l'ensemble du cluster.<br></p>\
-		<p>Les fonctions suivantes sont disponibles et peuvent vous être utiles pour travailler sur les tableaux et les objets:<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>Lorsque vous activez la répétition automatique de la requête, un paramètre supplémentaire nommé prev est passé à la fonction de transformation. Cela permet les comparaisons et les graphes cumulatifs.</p>\
-		<p>Exemple:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> retournera la charge moyenne du premier noeud du cluster pour la dernière minute écoulée.\
-		Cela peut alimenter ensuite le graphe pour produire un graphe de charge du noeud.\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>En JSON brut: affiche les résultats complets de la recherche éventuellement transformée au format JSON brut.</p>\
-		<p>En graphe: pour fabriquer un graphe de vos résultats, utilsez la transformation de résultats pour générer un tableau de valeurs.</p>\
-		<p>En tableau: si votre requête est une recherche, vous pouvez alors afficher les résultats dans un tableau.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Les champs Date acceptent une requête en langage naturel pour produire un écart de date (from/to) correspondant.</p>\
-		<p>Les formats suivants sont acceptés :</p>\
-		<ul>\
-			<li><b>Mots clés</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				Cherchera pour des dates correspondant au mot clé. <code>last year</code> cherchera sur toute l'année précédente.</li>\
-			<li><b>Ecarts</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (les espaces sont optionnels et il existe beaucoup de synonymes pour qualifier les écarts)<br>\
-				Créé un écart de date basé sur l'heure courante (maintenant) avec plus ou moins l'écart indiqué.</li>\
-			<li><b>Dates et Dates partielles</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				Ces formats indiquent un écart de date spécifique. <code>2011</code> cherchera sur toute l'année 2011, alors que <code>2011-01-18 12:32:45</code> ne cherchera que pour la date précise à la seconde près.</li>\
-			<li><b>Heures et heures partielles</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				Ces formats indiquent un espace de temps pour la date du jour. <code>12:32</code> cherchera les éléments d'aujourd'hui à cette minute précise.</li>\
-			<li><b>Ecart de Date</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				Un écart de date est créé en spécifiant deux dates dans n'importe lequel des formats précédents (Mot clé / Dates / Heures) séparées par &lt; ou -&gt; (les deux produisent le même effet). Si la date de fin n'est pas indiquée, alors il n'y aura aucune contrainte de fin.</li>\
-			<li><b>Ecart de date avec décalage</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Cherche en incluant un décalage de la date dans la direction indiquée.</li>\
-			<li><b>Ecart de date avec bornes</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Similaire à ci-dessus excepté que le décalage est appliqué dans les deux sens à partir de la date indiquée.</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/pt_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/pt_strings.js
deleted file mode 100644
index 25f46af16..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/pt_strings.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "Carregando Facetas...",
-	"General.Searching": "Buscando...",
-	"General.Search": "Busca",
-	"General.Help": "Ajuda",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Atualizar",
-	"General.ManualRefresh": "Atualização Manual",
-	"General.RefreshQuickly": "Atualização rápida",
-	"General.Refresh5seconds": "Atualização a cada 5 segundos",
-	"General.Refresh1minute": "Atualização a cada minuto",
-	"AliasForm.AliasName": "Apelido",
-	"AliasForm.NewAliasForIndex": "Novo apelido para {0}",
-	"AliasForm.DeleteAliasMessage": "digite ''{0}'' para deletar {1}. Não há como voltar atrás",
-	"AnyRequest.DisplayOptions" : "Mostrar Opções",
-	"AnyRequest.AsGraph" : "Mostrar como gráfico",
-	"AnyRequest.AsJson" : "Mostrar JSON bruto",
-	"AnyRequest.AsTable" : "Mostrar tabela de resultados da consulta",
-	"AnyRequest.History" : "Histórico",
-	"AnyRequest.RepeatRequest" : "Refazer requisição",
-	"AnyRequest.RepeatRequestSelect" : "Repetir requisição a cada ",
-	"AnyRequest.Transformer" : "Transformador de resultado",
-	"AnyRequest.Pretty": "Amigável",
-	"AnyRequest.Query" : "Consulta",
-	"AnyRequest.Request": "Requisição",
-	"AnyRequest.Requesting": "Realizando requisição...",
-	"AnyRequest.ValidateJSON": "Validar JSON",
-	"Browser.Title": "Navegador",
-	"Browser.ResultSourcePanelTitle": "Resultado",
-	"Command.DELETE": "DELETAR",
-	"Command.SHUTDOWN": "DESLIGAR",
-	"Command.DeleteAliasMessage": "Remover apelido?",
-	"ClusterOverView.IndexName": "Nome do índice",
-	"ClusterOverview.NumShards": "Número de Shards",
-	"ClusterOverview.NumReplicas": "Número de Réplicas",
-	"ClusterOverview.NewIndex": "Novo índice",
-	"IndexActionsMenu.Title": "Ações",
-	"IndexActionsMenu.NewAlias": "Novo apelido...",
-	"IndexActionsMenu.Refresh": "Atualizar",
-	"IndexActionsMenu.Flush": "Flush",
-	"IndexActionsMenu.Optimize": "Otimizar...",
-	"IndexActionsMenu.Snapshot": "Snapshot do Gateway",
-	"IndexActionsMenu.Analyser": "Analizador de teste",
-	"IndexActionsMenu.Open": "Abrir",
-	"IndexActionsMenu.Close": "Fechar",
-	"IndexActionsMenu.Delete": "Deletar...",
-	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Status do índice",
-	"IndexInfoMenu.Metadata": "Metadados do índice",
-	"IndexCommand.TextToAnalyze": "Texto para analizar",
-	"IndexCommand.ShutdownMessage": "digite ''{0}'' para desligar {1}. Nó NÃO PODE ser reiniciado à partir dessa interface",
-	"IndexOverview.PageTitle": "Visão geral dos índices",
-	"IndexSelector.NameWithDocs": "{0} ({1} documentoss)",
-	"IndexSelector.SearchIndexForDocs": "Busca {0} por documentos onde:",
-	"FilterBrowser.OutputType": "Resultados: {0}",
-	"FilterBrowser.OutputSize": "Número de Resultados: {0}",
-	"Header.ClusterHealth": "saúde do cluster: {0} ({1} {2})",
-	"Header.ClusterNotConnected": "saúde do cluster: não conectado",
-	"Header.Connect": "Conectar",
-	"Nav.AnyRequest": "Qualquer requisição",
-	"Nav.Browser": "Navegador",
-	"Nav.ClusterHealth": "Saúde do Cluster",
-	"Nav.ClusterState": "Estado do Cluster",
-	"Nav.ClusterNodes": "Nós do Cluster",
-	"Nav.Info": "Informações",
-	"Nav.NodeStats": "Estatísticas do nó",
-	"Nav.Overview": "Visão Geral",
-	"Nav.Indices": "Índices",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Status",
-	"Nav.Templates": "Modelos",
-	"Nav.StructuredQuery": "Consulta Estruturada",
-	"NodeActionsMenu.Title": "Ações",
-	"NodeActionsMenu.Shutdown": "Desligar...",
-	"NodeInfoMenu.Title": "Informações",
-	"NodeInfoMenu.ClusterNodeInfo": "Informações do Nó do Cluster",
-	"NodeInfoMenu.NodeStats": "Estatísticas do Nó",
-	"NodeType.Client": "Nó cliente",
-	"NodeType.Coord": "Coordenador",
-	"NodeType.Master": "Nó mestre",
-	"NodeType.Tribe": "Nó tribo",
-	"NodeType.Worker": "Nó trabalhador",
-	"NodeType.Unassigned": "Não atribuido",
-	"OptimizeForm.OptimizeIndex": "Otimizar {0}",
-	"OptimizeForm.MaxSegments": "# Máximo De Segmentos",
-	"OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões",
-	"OptimizeForm.FlushAfter": "Flush após Otimizar",
-	"OptimizeForm.WaitForMerge": "Esperar Por Merge",
-	"Overview.PageTitle": "Visão geral do Cluster",
-	"Output.JSON": "JSON",
-	"Output.Table": "Tabela",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "Mostrar consulta original",
-	"Preference.SortCluster": "Ordenar Cluster",
-	"Sort.ByName": "Por nome",
-	"Sort.ByAddress": "Por endereço",
-	"Sort.ByType": "Por tipo",
-	"Preference.ViewAliases": "Ver Alias",
-	"ViewAliases.Grouped": "Agrupado",
-	"ViewAliases.List": "Lista",
-	"ViewAliases.None": "Nenhum",
-	"Overview.IndexFilter": "Filtar Índice",
-	"TableResults.Summary": "Buscado {0} de {1} shards. {2} resultados. {3} segundos",
-	"QueryFilter.AllIndices": "Todos os Índices",
-	"QueryFilter.AnyValue": "qualquer",
-	"QueryFilter-Header-Indices": "Índices",
-	"QueryFilter-Header-Types": "Tipos",
-	"QueryFilter-Header-Fields": "Campos",
-	"QueryFilter.DateRangeHint.from": "De : {0}",
-	"QueryFilter.DateRangeHint.to": "  A : {0}",
-	"Query.FailAndUndo": "Consulta falhou. Desfazendo últimas alterações",
-	"StructuredQuery.ShowRawJson": "Mostrar JSON bruto"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>O Transformador de Resultados pode ser usado para transformar os resultados de uma consulta de json bruto para um formato mais útil.</p>\
-		<p>O transformador deve possuir o corpo de uma função javascript. O retorno da função se torna o novo valor passado para o json printer</p>\
-		<p>Exemplo:<br>\
-		  <code>return root.hits.hits[0];</code> irá alterar a resposta para mostrar apenas o primeiro resultado<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> irá retornar o total de memória utilizada pelo cluster<br></p>\
-		<p>As seguintes funções estão disponíveis e podem ser úteis no processamento de vetores e objetos<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>Durante a execução da opção Refazer Requisição, um parâmetro extra chamado prev é passado para a função de transformação. Isso permite fazer comparações e marcações cumulativas</p>\
-		<p>Exemplo:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> irá retornar a carga média no primeiro nó do cluster no último minuto\
-		Essa informação pode ser inserida no Gráfico para fazer um gráfico de carga do nó\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>Json Bruto: Exibe o resultado completo da consulta e da transformação no formato de JSON bruto</p>\
-		<p>Gráfico de Resultados: Para gerar um gráfico com seus resultados, utilize o tranformador de resultados para produzir um vetor de valores</p>\
-		<p>Tabela de Resultados da Consulta: Se sua consulta for uma busca, você pode exibir seus resultados no formato de uma tabela.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Campos do tipo Data aceitam consultas em linguagem natural (em inglês) para produzir um <i>From</i> e um <i>To</i> de modo a formar um intervalo dentro do qual os resultados são filtrados.</p>\
-		<p>Os seguintes formatos são suportados:</p>\
-		<ul>\
-			<li><b>Palavras-chave</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				buscam por datas de acordo com a palavra-chave. <code>last year</code> irá buscar tudo do último ano.</li>\
-			<li><b>Intervalos</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (espaços são opcionais, diversos sinônimos para qualificadores de intervalo)<br>\
-				Cria um intervalo de busca a partir de agora (<code>now</code>), extendendo este intervalo no passado e no futuro de acordo com intervalo especificado.</li>\
-			<li><b>Data/Hora (<i>DateTime</i>) e Data/Hora parcial</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				esses formatos especificam um intervalo especifico. <code>2011</code> irá buscar todo o ano de 2011, enquanto <code>2011-01-18 12:32:45</code> irá buscar apenas por resultados dentro deste intervalo de 1 segundo</li>\
-			<li><b>Tempo (<i>Time</i>) e Tempo parcial</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				esses formatos buscam por um horário específico no dia atual. <code>12:32</code> irá buscar este minuto específico do dia</li>\
-			<li><b>Intervalos de Data</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				Um intervalo de data é criado especificando-se duas datas em qualquer formato (Palavras-chave, Data/Hora ou Tempo) separados por &lt; ou -&gt; (ambos fazem a mesma coisa). Se a data de início ou fim do intervalo não for especificada é a mesma coisa que não impor limites na busca nesta direção.</li>\
-			<li><b>Intervalo de Data com Deslocamento</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Busca a data especificada incluindo o intervalo na direção determinada pelo deslocamento</li>\
-			<li><b>Intervalos Bidirecionais</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Idêntico ao exemplo anterior porém o intervalo é extendido em ambas as direções a partir da data especificada</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/tr_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/tr_strings.js
deleted file mode 100644
index 3bb987f81..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/tr_strings.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({

-	"General.Elasticsearch": "Elasticsearch",

-	"General.LoadingAggs": "Gruplar Yükleniyor...",

-	"General.Searching": "Aranıyor...",

-	"General.Search": "Ara",

-	"General.Help": "Yardım",

-	"General.HelpGlyph": "?",

-	"General.CloseGlyph": "X",

-	"General.RefreshResults": "Yenile",

-	"General.ManualRefresh": "Manuel Yenileme",

-	"General.RefreshQuickly": "Hızlı yenile",

-	"General.Refresh5seconds": "5 saniyede bir yenile",

-	"General.Refresh1minute": "Her dakika yenile",

-	"AliasForm.AliasName": "Alternatif İsim",

-	"AliasForm.NewAliasForIndex": "{0} için yeni alternatif isim",

-	"AliasForm.DeleteAliasMessage": "{1} silmek için ''{0}'' . Geriye dönüş yoktur.",

-	"AnyRequest.DisplayOptions" : "Seçenekleri Göster",

-	"AnyRequest.AsGraph" : "Sonuçları Çizdir",

-	"AnyRequest.AsJson" : "JSON formatında göster",

-	"AnyRequest.AsTable" : "Arama sonuçlarını tablo halinde göster",

-	"AnyRequest.History" : "Geçmiş",

-	"AnyRequest.RepeatRequest" : "İsteği Tekrarla",

-	"AnyRequest.RepeatRequestSelect" : "İsteği sürekli tekrarla ",

-	"AnyRequest.Transformer" : "Sonuç Dönüştürücü",

-	"AnyRequest.Pretty": "Düzenli",

-	"AnyRequest.Query" : "Sorgu",

-	"AnyRequest.Request": "Gönder",

-	"AnyRequest.Requesting": "İsteniyor...",

-	"AnyRequest.ValidateJSON": "JSON Doğrula",

-	"Browser.Title": "Browser",

-	"Browser.ResultSourcePanelTitle": "Sonuç Kaynağı",

-	"Command.DELETE": "SİL",

-	"Command.SHUTDOWN": "KAPA",

-	"Command.DeleteAliasMessage": "Alternatif ismi sil?",

-	"ClusterOverView.IndexName": "Indeks İsmi",

-	"ClusterOverview.NumShards": "Sektör Sayısı",

-	"ClusterOverview.NumReplicas": "Yedek Sayısı",

-	"ClusterOverview.NewIndex": "Yeni Indeks",

-	"IndexActionsMenu.Title": "İşlemler",

-	"IndexActionsMenu.NewAlias": "Yeni Alternatif İsim...",

-	"IndexActionsMenu.Refresh": "Yenile",

-	"IndexActionsMenu.Flush": "Boşalt",

-	"IndexActionsMenu.Optimize": "Optimize et...",

-	"IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)",

-	"IndexActionsMenu.Analyser": "Analizi test et",

-	"IndexActionsMenu.Open": "Aç",

-	"IndexActionsMenu.Close": "Kapa",

-	"IndexActionsMenu.Delete": "Sil...",

-	"IndexInfoMenu.Title": "Bilgi",

-	"IndexInfoMenu.Status": "Indeks Durumu",

-	"IndexInfoMenu.Metadata": "Indeks Metaveri",

-	"IndexCommand.TextToAnalyze": "Analiz edilecek metin",

-	"IndexCommand.ShutdownMessage": "{1} kapatmak için ''{0}'' yazın . Nod bu arayüzden tekrar BAŞLATILAMAZ",

-	"IndexOverview.PageTitle": "Indeksler Genel Bakış",

-	"IndexSelector.NameWithDocs": "{0} ({1} döküman)",

-	"IndexSelector.SearchIndexForDocs": "{0} indeksinde ara:",

-	"FilterBrowser.OutputType": "Sonuç Formatı: {0}",

-	"FilterBrowser.OutputSize": "Sonuç Sayısı: {0}",

-	"Header.ClusterHealth": "Küme Durumu: {0} ({1} de {2})",

-	"Header.ClusterNotConnected": "Küme Durumu: Bağlı Değil",

-	"Header.Connect": "Bağlan",

-	"Nav.AnyRequest": "Özel Sorgu",

-	"Nav.Browser": "Görüntüle",

-	"Nav.ClusterHealth": "Küme Durumu",

-	"Nav.ClusterState": "Küme Statüsü",

-	"Nav.ClusterNodes": "Nod Bilgileri",

-	"Nav.Info": "Bilgi",

-	"Nav.NodeStats": "Nod İstatistikleri",

-	"Nav.Overview": "Genel Bakış",

-	"Nav.Indices": "Indeksler",

-	"Nav.Plugins": "Eklentiler",

-	"Nav.Status": "Indeks İstatistikleri",

-	"Nav.Templates": "Şablonlar",

-	"Nav.StructuredQuery": "Yapılandırılmış Sorgu",

-	"NodeActionsMenu.Title": "İşlemler",

-	"NodeActionsMenu.Shutdown": "Kapat...",

-	"NodeInfoMenu.Title": "Bilgi",

-	"NodeInfoMenu.ClusterNodeInfo": "Küme Nod Bilgileri",

-	"NodeInfoMenu.NodeStats": "Nod İstatistikleri",

-	"NodeType.Client": "Client Nod",

-	"NodeType.Coord": "Coordinator",

-	"NodeType.Master": "Master Nod",

-	"NodeType.Tribe": "Tribe Nod",

-	"NodeType.Worker": "Worker Nod",

-	"NodeType.Unassigned": "Sahipsiz",

-	"OptimizeForm.OptimizeIndex": "{0} Optimize Et",

-	"OptimizeForm.MaxSegments": "Maksimum Segment Sayısı",

-	"OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle",

-	"OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt",

-	"OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle",

-	"Overview.PageTitle" : "Kümeler Genelbakış",

-	"Output.JSON": "JSON",

-	"Output.Table": "Tablo",

-	"Output.CSV": "CSV",

-	"Output.ShowSource": "Sorgu kaynağını göster",

-	"Preference.SortCluster": "Kümeyi Sırala",

-	"Sort.ByName": "İsme göre",

-	"Sort.ByAddress": "Adrese göre",

-	"Sort.ByType": "Tipe göre",

-	"Preference.SortIndices": "Indeksleri sırala",

-	"SortIndices.Descending": "Azalan",

-	"SortIndices.Ascending": "Artan",

-	"Preference.ViewAliases": "Alternatif isimleri görüntüle",

-	"ViewAliases.Grouped": "Gruplanmış",

-	"ViewAliases.List": "Liste",

-	"ViewAliases.None": "Karışık",

-	"Overview.IndexFilter": "Indeks Filtresi",

-	"TableResults.Summary": "{0} parçanın {1} tanesi arandı. {2} sonuç. {3} saniye",

-	"QueryFilter.AllIndices": "Tüm Indeksler",

-	"QueryFilter.AnyValue": "herhangi",

-	"QueryFilter-Header-Indices": "Indeksler",

-	"QueryFilter-Header-Types": "Tipler",

-	"QueryFilter-Header-Fields": "Alanlar",

-	"QueryFilter.DateRangeHint.from": "{0}'dan",

-	"QueryFilter.DateRangeHint.to": "  {0}'a",

-	"Query.FailAndUndo": "Sorgu Başarısız. Son değişiklikler geri alınıyor.",

-	"StructuredQuery.ShowRawJson": "Formatsız JSON göster"

-});

-

-i18n.setKeys({

-	"AnyRequest.TransformerHelp" : "\

-		<p>Sonuç Dönüştürücü sorgudan dönen JSON sonuçlarını işleyip daha kullanışlı bir formata dönüştürmek için kullanılabilir.</p>\

-		<p>Dönüştürücü içierisinde javascript fonksiyonu tanımlanmalıdır. Bu fonksiyondan dönen yeni sonuç çıktı kısmına yazdırılır.</p>\

-		<p>Örnek:<br>\

-		  <code>return root.hits.hits[0];</code> sonucu dolaşarak ilk eşleşmeyi göster<br>\

-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> tüm kümede kullanılan toplam belleği gösterir<br></p>\

-		<p>Aşağıdaki fonksiyonlar dizi ve objelerin işlenmesinde yardımcı olması için kullanılabilir<br>\

-		<ul>\

-			<li><i>Object.keys</i>(object) := array</li>\

-			<li>array.<i>forEach</i>(function(prop, index))</li>\

-			<li>array.<i>map</i>(function(prop, index)) := array</li>\

-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\

-		</ul>\

-		<p>Sorgu tekrarlama çalışırken, prev isimli ekstra bir parametre dönüştürücü fonksiyonuna verilir. Bu sayede karşılaştırmalar ve toplu grafik gösterimleri yapılabilir.</p>\

-		<p>Örnek:<br>\

-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> önceki dakika boyunca kümede bulunan ilk nod üzerindeki averaj yükü verir.\

-		Bu sonuç nod için yük grafiği yaratılmasında kullanılabilir.\

-		"

-});

-

-i18n.setKeys({

-	"AnyRequest.DisplayOptionsHelp" : "\

-		<p>Sade Json: Sorgunun tüm sonuçlarını ve (yapıldıysa) dönüştürüldükten sonraki halini sade JSON formatında gösterir </p>\

-		<p>Sonuçları Çizdir: Sonuçları grafiksel olarak görüntülemek için sonuç dörücüyü kullanarak değerleri dizi haline getirin.</p>\

-		<p>Arama Sonuçları Tablosu: Eğer sorgunuz bir arama ise, sonuçları bir tabloda görüntüleyebilirsiniz.</p>\

-		"

-});

-

-i18n.setKeys({

-	"QueryFilter.DateRangeHelp" : "\

-		<p>Tarih alanları ana dile yakın kelimeler kullanarak iki tarih aralığında sorgu yapılabilmesini sağlar.</p>\

-		<p>Aşağıdaki tanımlar kullanılabilir:</p>\

-		<ul>\

-			<li><b>Anahtar Kelimeler</b><br>\

-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\

-				kelimeleri eşleşen tarihleri verir. Örneğin <code>last year</code> geçen yıl tarihli bütün verileri döndürür.</li>\

-			<li><b>Aralıklar</b><br>\

-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (boşluklar isteğe bağlıdır, ayni kelime için farklı yazım şekilleri kullanılabilir)<br>\

-				Şu anki tarihi (<code>now</code>) baz alarak geçmiş veya ileriki bir tarih aralığındaki kayıtları verir.</li>\

-			<li><b>Tarih ve Kısmi Tarihler</b><br>\

-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\

-				bu formatlar spesifik bir tarihi tanımlarlar. <code>2011</code> tüm 2011 yılını ararken, <code>2011-01-18 12:32:45</code> şeklinde bir sorgu sadece o saniyedeki sonuçları verir.</li>\

-			<li><b>Zaman ve Kısmi Zamanlar</b><br>\

-				<code>12<br> 12:32<br> 12:32:45</code><br>\

-				bu formatlar gün içerisinde spesifik bir zamanı tanımlarlar. Örneğin <code>12:32</code> sadece bu saat ve dakikadaki kayıtları verir.</li>\

-			<li><b>Tarih Aralıkları</b><br>\

-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\

-				Tarih aralıkları yukarda belirtilen herhangi bir formatı &lt; or -&gt;  ile ayırarak yapılabilir. Eğer aralığın bir tarafı eksikse, sorgu ucu açıkmış gibi davranır.</li>\

-			<li><b>Ofsetli Tarih Aralığı</b><br>\

-				<code>2010 -> 1yr<br> 3mins < now</code>\

-				Verilen yöndeki tarih aralığına bakar.</li>\

-			<li><b>Çakılı Aralıklar</b><br>\

-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\

-				Yukarıdakiyle ayni fakat belirtilen tarihten her iki yöne de bakılır.</li>\

-		</ul>\

-	"

-});

diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/zh_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/zh_strings.js
deleted file mode 100644
index 2d83d43b0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/lang/zh_strings.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "加载聚合查询...",
-	"General.Searching": "搜索中...",
-	"General.Search": "搜索",
-	"General.Help": "帮助",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "刷新",
-	"General.ManualRefresh": "手动刷新",
-	"General.RefreshQuickly": "快速刷新",
-	"General.Refresh5seconds": "每5秒刷新",
-	"General.Refresh1minute": "每1分钟刷新",
-	"AliasForm.AliasName": "别名",
-	"AliasForm.NewAliasForIndex": "为 {0} 创建新别名",
-	"AliasForm.DeleteAliasMessage": "输入 ''{0}''  删除 {1}. 此操作无法恢复",
-	"AnyRequest.DisplayOptions" : "显示选项",
-	"AnyRequest.AsGraph" : "图形视图",
-	"AnyRequest.AsJson" : "原始 JSON",
-	"AnyRequest.AsTable" : "表格视图",
-	"AnyRequest.History" : "历史记录",
-	"AnyRequest.RepeatRequest" : "重复请求",
-	"AnyRequest.RepeatRequestSelect" : "重复周期 ",
-	"AnyRequest.Transformer" : "结果转换器",
-	"AnyRequest.Pretty": "易读",
-	"AnyRequest.Query" : "查询",
-	"AnyRequest.Request": "提交请求",
-	"AnyRequest.Requesting": "请求中...",
-	"AnyRequest.ValidateJSON": "验证 JSON",
-	"Browser.Title": "数据浏览",
-	"Browser.ResultSourcePanelTitle": "原始数据",
-	"Command.DELETE": "删除",
-	"Command.SHUTDOWN": "关闭",
-	"Command.DeleteAliasMessage": "删除别名?",
-	"ClusterOverView.IndexName": "索引名称",
-	"ClusterOverview.NumShards": "分片数",
-	"ClusterOverview.NumReplicas": "副本数",
-	"ClusterOverview.NewIndex": "新建索引",
-	"IndexActionsMenu.Title": "动作",
-	"IndexActionsMenu.NewAlias": "新建别名...",
-	"IndexActionsMenu.Refresh": "刷新",
-	"IndexActionsMenu.Flush": "Flush刷新",
-	"IndexActionsMenu.Optimize": "优化...",
-	"IndexActionsMenu.Snapshot": "网关快照",
-	"IndexActionsMenu.Analyser": "测试分析器",
-	"IndexActionsMenu.Open": "开启",
-	"IndexActionsMenu.Close": "关闭",
-	"IndexActionsMenu.Delete": "删除...",
-	"IndexInfoMenu.Title": "信息",
-	"IndexInfoMenu.Status": "索引状态",
-	"IndexInfoMenu.Metadata": "索引信息",
-	"IndexCommand.TextToAnalyze": "文本分析",
-	"IndexCommand.ShutdownMessage": "输入 ''{0}'' 以关闭 {1} 节点. 关闭的节点无法从此界面重新启动",
-	"IndexOverview.PageTitle": "索引概览",
-	"IndexSelector.NameWithDocs": "{0} ({1} 个文档)",
-	"IndexSelector.SearchIndexForDocs": "搜索 {0} 的文档， 查询条件:",
-	"FilterBrowser.OutputType": "返回格式: {0}",
-	"FilterBrowser.OutputSize": "显示数量: {0}",
-	"Header.ClusterHealth": "集群健康值: {0} ({1} of {2})",
-	"Header.ClusterNotConnected": "集群健康值: 未连接",
-	"Header.Connect": "连接",
-	"Nav.AnyRequest": "复合查询",
-	"Nav.Browser": "数据浏览",
-	"Nav.ClusterHealth": "集群健康值",
-	"Nav.ClusterState": "群集状态",
-	"Nav.ClusterNodes": "集群节点",
-	"Nav.Info": "信息",
-	"Nav.NodeStats": "节点状态",
-	"Nav.Overview": "概览",
-	"Nav.Indices": "索引",
-	"Nav.Plugins": "插件",
-	"Nav.Status": "状态",
-	"Nav.Templates": "模板",
-	"Nav.StructuredQuery": "基本查询",
-	"NodeActionsMenu.Title": "动作",
-	"NodeActionsMenu.Shutdown": "关停...",
-	"NodeInfoMenu.Title": "信息",
-	"NodeInfoMenu.ClusterNodeInfo": "集群节点信息",
-	"NodeInfoMenu.NodeStats": "节点状态",
-	"NodeType.Client": "节点客户端",
-	"NodeType.Coord": "协调器",
-	"NodeType.Master": "主节点",
-	"NodeType.Tribe": "分支结点",
-	"NodeType.Worker": "工作节点",
-	"NodeType.Unassigned": "未分配",
-	"OptimizeForm.OptimizeIndex": "优化 {0}",
-	"OptimizeForm.MaxSegments": "最大索引段数",
-	"OptimizeForm.ExpungeDeletes": "只删除被标记为删除的",
-	"OptimizeForm.FlushAfter": "优化后刷新",
-	"OptimizeForm.WaitForMerge": "等待合并",
-	"Overview.PageTitle" : "集群概览",
-	"Output.JSON": "JSON",
-	"Output.Table": "Table",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "显示查询语句",
-	"Preference.SortCluster": "集群排序",
-	"Sort.ByName": "按名称",
-	"Sort.ByAddress": "按地址",
-	"Sort.ByType": "按类型",
-	"TableResults.Summary": "查询 {1} 个分片中用的 {0} 个. {2} 命中. 耗时 {3} 秒",
-	"QueryFilter.AllIndices": "所有索引",
-	"QueryFilter.AnyValue": "任意",
-	"QueryFilter-Header-Indices": "索引",
-	"QueryFilter-Header-Types": "类型",
-	"QueryFilter-Header-Fields": "字段",
-	"QueryFilter.DateRangeHint.from": "从 : {0}",
-	"QueryFilter.DateRangeHint.to": "  到 : {0}",
-	"Query.FailAndUndo": "查询失败. 撤消最近的更改",
-	"StructuredQuery.ShowRawJson": "显示原始 JSON"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>结果转换器用于返回结果原始JSON的后续处理, 将结果转换为更有用的格式.</p>\
-		<p>转换器应当包含javascript函数体. 函数的返回值将传递给json分析器</p>\
-		<p>Example:<br>\
-		  <code>return root.hits.hits[0];</code><br>\
-		  遍历结果并只显示第一个元素<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code><br>\
-		  将返回整个集群使用的总内存<br></p>\
-		<p>以下函数可以方便的处理数组与对象<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>当启用重复请求时, prev 参数将会传递给转换器函数. 这将用于比较并累加图形</p>\
-		<p>Example:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code><br>\
-		将返回第一个集群节点最近一分钟内的平均负载\
-		将会把结果送人图表以产生一个负载曲线图\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>原始 Json: 将完整的查询结果转换为原始JSON格式 </p>\
-		<p>图形视图: 将查询结果图形化, 将查询结果转换为数组值的形式</p>\
-		<p>表格视图: 如果查询是一个搜索, 可以将搜索结果以表格形式显示.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Date 字段接受日期范围的形式查询.</p>\
-		<p>一下格式被支持:</p>\
-		<ul>\
-			<li><b>关键词 / 关键短语</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				搜索关键字匹配的日期. <code>last year</code> 将搜索过去全年.</li>\
-			<li><b>范围</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (空格可选, 同等于多个范围修饰词)<br>\
-				创建一个指定时间范围的搜索, 将围绕<code>现在</code> 并延伸至过去与未来时间段.</li>\
-			<li><b>DateTime 与 DateTime局部</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				指定一个特定的日期范围. <code>2011</code>会搜索整个 2011年, 而 <code>2011-01-18 12:32:45</code> 将只搜索1秒范围内</li>\
-			<li><b>Time 与 Time局部</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				这些格式只搜索当天的特定时间. <code>12:32</code> 将搜索当天的那一分钟</li>\
-			<li><b>日期范围</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				日期范围是将两个日期格式串 (日期关键字 / DateTime / Time) 用  &lt; 或 -&gt; (效果相同) 分隔. 如果缺少任意一端，那么在这个方向上时间将没有限制.</li>\
-			<li><b>偏移日期范围</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				搜索包括指定方向上偏移的日期.</li>\
-			<li><b>锚定范围</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				类似于上面的便宜日期，在两个方向上将锚定的日期延长</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.css
deleted file mode 100644
index be7e15cb3..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.css
+++ /dev/null
@@ -1,1338 +0,0 @@
-/*!
- *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('fonts/fontawesome-webfont.eot?v=4.0.3');
-  src: url('fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.fa {
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-/* makes the font 33% larger relative to the icon container */
-.fa-lg {
-  font-size: 1.3333333333333333em;
-  line-height: 0.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.2857142857142858em;
-  text-align: center;
-}
-.fa-ul {
-  padding-left: 0;
-  margin-left: 2.142857142857143em;
-  list-style-type: none;
-}
-.fa-ul > li {
-  position: relative;
-}
-.fa-li {
-  position: absolute;
-  left: -2.142857142857143em;
-  width: 2.142857142857143em;
-  top: 0.14285714285714285em;
-  text-align: center;
-}
-.fa-li.fa-lg {
-  left: -1.8571428571428572em;
-}
-.fa-border {
-  padding: .2em .25em .15em;
-  border: solid 0.08em #eeeeee;
-  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: spin 2s infinite linear;
-  -moz-animation: spin 2s infinite linear;
-  -o-animation: spin 2s infinite linear;
-  animation: spin 2s infinite linear;
-}
-@-moz-keyframes spin {
-  0% {
-    -moz-transform: rotate(0deg);
-  }
-  100% {
-    -moz-transform: rotate(359deg);
-  }
-}
-@-webkit-keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-  }
-}
-@-o-keyframes spin {
-  0% {
-    -o-transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-  }
-}
-@-ms-keyframes spin {
-  0% {
-    -ms-transform: rotate(0deg);
-  }
-  100% {
-    -ms-transform: rotate(359deg);
-  }
-}
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(359deg);
-  }
-}
-.fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-.fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-.fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
-.fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
-  -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  -o-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);
-  -moz-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-.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: #ffffff;
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-   readers do not read off random characters that represent icons */
-.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-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-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 {
-  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: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-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-asc:before {
-  content: "\f0dd";
-}
-.fa-sort-up:before,
-.fa-sort-desc: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-reply-all:before {
-  content: "\f122";
-}
-.fa-mail-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 {
-  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";
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.js
deleted file mode 100644
index f96c031a1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/_site/vendor.js
+++ /dev/null
@@ -1,14515 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-/*!
- * jQuery JavaScript Library v1.6.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu May 12 15:04:36 2011 -0400
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Check for digits
-	rdigit = /\d/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = quickExpr.exec( selector );
-			}
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = (context ? context.ownerDocument || context : document);
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if (selector.selector !== undefined) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.6.1",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.done( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			readyList.resolveWith( document, [ jQuery ] );
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).unbind( "ready" );
-			}
-		}
-	},
-
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
-
-		readyList = jQuery._Deferred();
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	// A crude way of determining if an object is a window
-	isWindow: function( obj ) {
-		return obj && typeof obj === "object" && "setInterval" in obj;
-	},
-
-	isNaN: function( obj ) {
-		return obj == null || !rdigit.test( obj ) || isNaN( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		// Not own constructor property must be Object
-		if ( obj.constructor &&
-			!hasOwn.call(obj, "constructor") &&
-			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw msg;
-	},
-
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return (new Function( "return " + data ))();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	// (xml & tmp used internally)
-	parseXML: function( data , xml , tmp ) {
-
-		if ( window.DOMParser ) { // Standard
-			tmp = new DOMParser();
-			xml = tmp.parseFromString( data , "text/xml" );
-		} else { // IE
-			xml = new ActiveXObject( "Microsoft.XMLDOM" );
-			xml.async = "false";
-			xml.loadXML( data );
-		}
-
-		tmp = xml.documentElement;
-
-		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-
-		if ( indexOf ) {
-			return indexOf.call( array, elem );
-		}
-
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can be optionally by executed if its a function
-	access: function( elems, key, value, exec, fn, pass ) {
-		var length = elems.length;
-
-		// Setting many attributes
-		if ( typeof key === "object" ) {
-			for ( var k in key ) {
-				jQuery.access( elems, k, key[k], exec, fn, value );
-			}
-			return elems;
-		}
-
-		// Setting one attribute
-		if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = !pass && exec && jQuery.isFunction(value);
-
-			for ( var i = 0; i < length; i++ ) {
-				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-			}
-
-			return elems;
-		}
-
-		// Getting an attribute
-		return length ? fn( elems[0], key ) : undefined;
-	},
-
-	now: function() {
-		return (new Date()).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
-
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-// Expose jQuery to the global object
-return jQuery;
-
-})();
-
-
-var // Promise methods
-	promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ),
-	// Static reference to slice
-	sliceDeferred = [].slice;
-
-jQuery.extend({
-	// Create a simple deferred (one callbacks list)
-	_Deferred: function() {
-		var // callbacks list
-			callbacks = [],
-			// stored [ context , args ]
-			fired,
-			// to avoid firing when already doing so
-			firing,
-			// flag to know if the deferred has been cancelled
-			cancelled,
-			// the deferred itself
-			deferred  = {
-
-				// done( f1, f2, ...)
-				done: function() {
-					if ( !cancelled ) {
-						var args = arguments,
-							i,
-							length,
-							elem,
-							type,
-							_fired;
-						if ( fired ) {
-							_fired = fired;
-							fired = 0;
-						}
-						for ( i = 0, length = args.length; i < length; i++ ) {
-							elem = args[ i ];
-							type = jQuery.type( elem );
-							if ( type === "array" ) {
-								deferred.done.apply( deferred, elem );
-							} else if ( type === "function" ) {
-								callbacks.push( elem );
-							}
-						}
-						if ( _fired ) {
-							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
-						}
-					}
-					return this;
-				},
-
-				// resolve with given context and args
-				resolveWith: function( context, args ) {
-					if ( !cancelled && !fired && !firing ) {
-						// make sure args are available (#8421)
-						args = args || [];
-						firing = 1;
-						try {
-							while( callbacks[ 0 ] ) {
-								callbacks.shift().apply( context, args );
-							}
-						}
-						finally {
-							fired = [ context, args ];
-							firing = 0;
-						}
-					}
-					return this;
-				},
-
-				// resolve with this as context and given arguments
-				resolve: function() {
-					deferred.resolveWith( this, arguments );
-					return this;
-				},
-
-				// Has this deferred been resolved?
-				isResolved: function() {
-					return !!( firing || fired );
-				},
-
-				// Cancel
-				cancel: function() {
-					cancelled = 1;
-					callbacks = [];
-					return this;
-				}
-			};
-
-		return deferred;
-	},
-
-	// Full fledged deferred (two callbacks list)
-	Deferred: function( func ) {
-		var deferred = jQuery._Deferred(),
-			failDeferred = jQuery._Deferred(),
-			promise;
-		// Add errorDeferred methods, then and promise
-		jQuery.extend( deferred, {
-			then: function( doneCallbacks, failCallbacks ) {
-				deferred.done( doneCallbacks ).fail( failCallbacks );
-				return this;
-			},
-			always: function() {
-				return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments );
-			},
-			fail: failDeferred.done,
-			rejectWith: failDeferred.resolveWith,
-			reject: failDeferred.resolve,
-			isRejected: failDeferred.isResolved,
-			pipe: function( fnDone, fnFail ) {
-				return jQuery.Deferred(function( newDefer ) {
-					jQuery.each( {
-						done: [ fnDone, "resolve" ],
-						fail: [ fnFail, "reject" ]
-					}, function( handler, data ) {
-						var fn = data[ 0 ],
-							action = data[ 1 ],
-							returned;
-						if ( jQuery.isFunction( fn ) ) {
-							deferred[ handler ](function() {
-								returned = fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise().then( newDefer.resolve, newDefer.reject );
-								} else {
-									newDefer[ action ]( returned );
-								}
-							});
-						} else {
-							deferred[ handler ]( newDefer[ action ] );
-						}
-					});
-				}).promise();
-			},
-			// Get a promise for this deferred
-			// If obj is provided, the promise aspect is added to the object
-			promise: function( obj ) {
-				if ( obj == null ) {
-					if ( promise ) {
-						return promise;
-					}
-					promise = obj = {};
-				}
-				var i = promiseMethods.length;
-				while( i-- ) {
-					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
-				}
-				return obj;
-			}
-		});
-		// Make sure only one callback list will be used
-		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
-		// Unexpose cancel
-		delete deferred.cancel;
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( firstParam ) {
-		var args = arguments,
-			i = 0,
-			length = args.length,
-			count = length,
-			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
-				firstParam :
-				jQuery.Deferred();
-		function resolveFunc( i ) {
-			return function( value ) {
-				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				if ( !( --count ) ) {
-					// Strange bug in FF4:
-					// Values changed onto the arguments object sometimes end up as undefined values
-					// outside the $.when method. Cloning the object into a fresh array solves the issue
-					deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) );
-				}
-			};
-		}
-		if ( length > 1 ) {
-			for( ; i < length; i++ ) {
-				if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) {
-					args[ i ].promise().then( resolveFunc(i), deferred.reject );
-				} else {
-					--count;
-				}
-			}
-			if ( !count ) {
-				deferred.resolveWith( deferred, args );
-			}
-		} else if ( deferred !== firstParam ) {
-			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
-		}
-		return deferred.promise();
-	}
-});
-
-
-
-jQuery.support = (function() {
-
-	var div = document.createElement( "div" ),
-		documentElement = document.documentElement,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		marginDiv,
-		support,
-		fragment,
-		body,
-		bodyStyle,
-		tds,
-		events,
-		eventName,
-		i,
-		isSupported;
-
-	// Preliminary tests
-	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName( "*" );
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement( "select" );
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName( "input" )[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName( "tbody" ).length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName( "link" ).length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute( "href" ) === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-			div.detachEvent( "onclick", click );
-		});
-		div.cloneNode( true ).fireEvent( "onclick" );
-	}
-
-	// Check if a radio maintains it's value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute("type", "radio");
-	support.radioValue = input.value === "t";
-
-	input.setAttribute("checked", "checked");
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	div.innerHTML = "";
-
-	// Figure out if the W3C box model works as expected
-	div.style.width = div.style.paddingLeft = "1px";
-
-	// We use our own, invisible, body
-	body = document.createElement( "body" );
-	bodyStyle = {
-		visibility: "hidden",
-		width: 0,
-		height: 0,
-		border: 0,
-		margin: 0,
-		// Set background to avoid IE crashes when removing (#9028)
-		background: "none"
-	};
-	for ( i in bodyStyle ) {
-		body.style[ i ] = bodyStyle[ i ];
-	}
-	body.appendChild( div );
-	documentElement.insertBefore( body, documentElement.firstChild );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	support.boxModel = div.offsetWidth === 2;
-
-	if ( "zoom" in div.style ) {
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		// (IE < 8 does this)
-		div.style.display = "inline";
-		div.style.zoom = 1;
-		support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
-
-		// Check if elements with layout shrink-wrap their children
-		// (IE 6 does this)
-		div.style.display = "";
-		div.innerHTML = "<div style='width:4px;'></div>";
-		support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
-	}
-
-	div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
-	tds = div.getElementsByTagName( "td" );
-
-	// Check if table cells still have offsetWidth/Height when they are set
-	// to display:none and there are still other visible table cells in a
-	// table row; if so, offsetWidth/Height are not reliable for use when
-	// determining if an element has been hidden directly using
-	// display:none (it is still safe to use offsets if a parent element is
-	// hidden; don safety goggles and see bug #4512 for more information).
-	// (only IE 8 fails this test)
-	isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-	tds[ 0 ].style.display = "";
-	tds[ 1 ].style.display = "none";
-
-	// Check if empty table cells still have offsetWidth/Height
-	// (IE < 8 fail this test)
-	support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-	div.innerHTML = "";
-
-	// Check if div with explicit width and no margin-right incorrectly
-	// gets computed margin-right based on width of container. For more
-	// info see bug #3333
-	// Fails in WebKit before Feb 2011 nightlies
-	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-	if ( document.defaultView && document.defaultView.getComputedStyle ) {
-		marginDiv = document.createElement( "div" );
-		marginDiv.style.width = "0";
-		marginDiv.style.marginRight = "0";
-		div.appendChild( marginDiv );
-		support.reliableMarginRight =
-			( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
-	}
-
-	// Remove the body element we added
-	body.innerHTML = "";
-	documentElement.removeChild( body );
-
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for( i in {
-			submit: 1,
-			change: 1,
-			focusin: 1
-		} ) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	return support;
-})();
-
-// Keep track of boxModel
-jQuery.boxModel = jQuery.support.boxModel;
-
-
-
-
-var rbrace = /^(?:\{.*\}|\[.*\])$/,
-	rmultiDash = /([a-z])([A-Z])/g;
-
-jQuery.extend({
-	cache: {},
-
-	// Please use with caution
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
-
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
-
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
-
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
-
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
-			return;
-		}
-
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ jQuery.expando ] = id = ++jQuery.uuid;
-			} else {
-				id = jQuery.expando;
-			}
-		}
-
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
-
-			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
-			// metadata on plain JS objects when the object is serialized using
-			// JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
-
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
-			} else {
-				cache[ id ] = jQuery.extend(cache[ id ], name);
-			}
-		}
-
-		thisCache = cache[ id ];
-
-		// Internal jQuery data is stored in a separate object inside the object's data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data
-		if ( pvt ) {
-			if ( !thisCache[ internalKey ] ) {
-				thisCache[ internalKey ] = {};
-			}
-
-			thisCache = thisCache[ internalKey ];
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
-
-		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
-		// not attempt to inspect the internal events object using jQuery.data, as this
-		// internal data object is undocumented and subject to change.
-		if ( name === "events" && !thisCache[name] ) {
-			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
-		}
-
-		return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache;
-	},
-
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var internalKey = jQuery.expando, isNode = elem.nodeType,
-
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
-
-			// See jQuery.data for more information
-			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
-
-			if ( thisCache ) {
-				delete thisCache[ name ];
-
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !isEmptyDataObject(thisCache) ) {
-					return;
-				}
-			}
-		}
-
-		// See jQuery.data for more information
-		if ( pvt ) {
-			delete cache[ id ][ internalKey ];
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject(cache[ id ]) ) {
-				return;
-			}
-		}
-
-		var internalCache = cache[ id ][ internalKey ];
-
-		// Browsers that fail expando deletion also refuse to delete expandos on
-		// the window, but it will allow it on all other JS objects; other browsers
-		// don't care
-		if ( jQuery.support.deleteExpando || cache != window ) {
-			delete cache[ id ];
-		} else {
-			cache[ id ] = null;
-		}
-
-		// We destroyed the entire user cache at once because it's faster than
-		// iterating through each key, but we need to continue to persist internal
-		// data if it existed
-		if ( internalCache ) {
-			cache[ id ] = {};
-			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
-			// metadata on plain JS objects when the object is serialized using
-			// JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-
-			cache[ id ][ internalKey ] = internalCache;
-
-		// Otherwise, we need to eliminate the expando on the node to avoid
-		// false lookups in the cache for entries that no longer exist
-		} else if ( isNode ) {
-			// IE does not allow us to delete expando properties from nodes,
-			// nor does it have a removeAttribute function on Document nodes;
-			// we must handle all of these cases
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-			} else {
-				elem[ jQuery.expando ] = null;
-			}
-		}
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		if ( elem.nodeName ) {
-			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-			if ( match ) {
-				return !(match === true || elem.getAttribute("classid") !== match);
-			}
-		}
-
-		return true;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var data = null;
-
-		if ( typeof key === "undefined" ) {
-			if ( this.length ) {
-				data = jQuery.data( this[0] );
-
-				if ( this[0].nodeType === 1 ) {
-			    var attr = this[0].attributes, name;
-					for ( var i = 0, l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
-
-						if ( name.indexOf( "data-" ) === 0 ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( this[0], name, data[ name ] );
-						}
-					}
-				}
-			}
-
-			return data;
-
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			// Try to fetch any internally stored data first
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-				data = dataAttr( this[0], key, data );
-			}
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-
-		} else {
-			return this.each(function() {
-				var $this = jQuery( this ),
-					args = [ parts[0], value ];
-
-				$this.triggerHandler( "setData" + parts[1] + "!", args );
-				jQuery.data( this, key, value );
-				$this.triggerHandler( "changeData" + parts[1] + "!", args );
-			});
-		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				!jQuery.isNaN( data ) ? parseFloat( data ) :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
-// property to be considered empty objects; this property always exists in
-// order to make sure JSON.stringify does not expose internal metadata
-function isEmptyDataObject( obj ) {
-	for ( var name in obj ) {
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-
-
-
-function handleQueueMarkDefer( elem, type, src ) {
-	var deferDataKey = type + "defer",
-		queueDataKey = type + "queue",
-		markDataKey = type + "mark",
-		defer = jQuery.data( elem, deferDataKey, undefined, true );
-	if ( defer &&
-		( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) &&
-		( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) {
-		// Give room for hard-coded callbacks to fire first
-		// and eventually mark/queue something else on the element
-		setTimeout( function() {
-			if ( !jQuery.data( elem, queueDataKey, undefined, true ) &&
-				!jQuery.data( elem, markDataKey, undefined, true ) ) {
-				jQuery.removeData( elem, deferDataKey, true );
-				defer.resolve();
-			}
-		}, 0 );
-	}
-}
-
-jQuery.extend({
-
-	_mark: function( elem, type ) {
-		if ( elem ) {
-			type = (type || "fx") + "mark";
-			jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true );
-		}
-	},
-
-	_unmark: function( force, elem, type ) {
-		if ( force !== true ) {
-			type = elem;
-			elem = force;
-			force = false;
-		}
-		if ( elem ) {
-			type = type || "fx";
-			var key = type + "mark",
-				count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 );
-			if ( count ) {
-				jQuery.data( elem, key, count, true );
-			} else {
-				jQuery.removeData( elem, key, true );
-				handleQueueMarkDefer( elem, type, "mark" );
-			}
-		}
-	},
-
-	queue: function( elem, type, data ) {
-		if ( elem ) {
-			type = (type || "fx") + "queue";
-			var q = jQuery.data( elem, type, undefined, true );
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !q || jQuery.isArray(data) ) {
-					q = jQuery.data( elem, type, jQuery.makeArray(data), true );
-				} else {
-					q.push( data );
-				}
-			}
-			return q || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			fn = queue.shift(),
-			defer;
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift("inprogress");
-			}
-
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
-		}
-
-		if ( !queue.length ) {
-			jQuery.removeData( elem, type + "queue", true );
-			handleQueueMarkDefer( elem, type, "queue" );
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
-
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function() {
-			var queue = jQuery.queue( this, type, data );
-
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, object ) {
-		if ( typeof type !== "string" ) {
-			object = type;
-			type = undefined;
-		}
-		type = type || "fx";
-		var defer = jQuery.Deferred(),
-			elements = this,
-			i = elements.length,
-			count = 1,
-			deferDataKey = type + "defer",
-			queueDataKey = type + "queue",
-			markDataKey = type + "mark",
-			tmp;
-		function resolve() {
-			if ( !( --count ) ) {
-				defer.resolveWith( elements, [ elements ] );
-			}
-		}
-		while( i-- ) {
-			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
-					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
-						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
-					jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) {
-				count++;
-				tmp.done( resolve );
-			}
-		}
-		resolve();
-		return defer.promise();
-	}
-});
-
-
-
-
-var rclass = /[\n\t\r]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea)?$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	rinvalidChar = /\:/,
-	formHook, boolHook;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.attr );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-	
-	prop: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.prop );
-	},
-	
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class") || "") );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ",
-							setClass = elem.className;
-
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret,
-			elem = this[0];
-		
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				return (elem.value || "").replace(rreturn, "");
-			}
-
-			return undefined;
-		}
-
-		var isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var self = jQuery(this), val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
-
-				// Loop through all the selected options
-				for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-					var option = options[ i ];
-
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-	
-	attrFix: {
-		// Always normalize to ensure hook usage
-		tabindex: "tabIndex"
-	},
-	
-	attr: function( elem, name, value, pass ) {
-		var nType = elem.nodeType;
-		
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return undefined;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( !("getAttribute" in elem) ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// Normalize the name if needed
-		name = notxml && jQuery.attrFix[ name ] || name;
-
-		hooks = jQuery.attrHooks[ name ];
-
-		if ( !hooks ) {
-			// Use boolHook for boolean attributes
-			if ( rboolean.test( name ) &&
-				(typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase()) ) {
-
-				hooks = boolHook;
-
-			// Use formHook for forms and if the name contains certain characters
-			} else if ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) {
-				hooks = formHook;
-			}
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return undefined;
-
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, "" + value );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && notxml ) {
-			return hooks.get( elem, name );
-
-		} else {
-
-			ret = elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, name ) {
-		var propName;
-		if ( elem.nodeType === 1 ) {
-			name = jQuery.attrFix[ name ] || name;
-		
-			if ( jQuery.support.getSetAttribute ) {
-				// Use removeAttribute in browsers that support it
-				elem.removeAttribute( name );
-			} else {
-				jQuery.attr( elem, name, "" );
-				elem.removeAttributeNode( elem.getAttributeNode( name ) );
-			}
-
-			// Set corresponding property to false for boolean attributes
-			if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) {
-				elem[ propName ] = false;
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		},
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabIndex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-	
-	prop: function( elem, name, value ) {
-		var nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return undefined;
-		}
-
-		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.propFix[ name ] || name;
-		
-		hooks = jQuery.propHooks[ name ];
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return (elem[ name ] = value);
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-	
-	propHooks: {}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		return elem[ jQuery.propFix[ name ] || name ] ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = value;
-			}
-
-			elem.setAttribute( name, name.toLowerCase() );
-		}
-		return name;
-	}
-};
-
-// Use the value property for back compat
-// Use the formHook for button elements in IE6/7 (#1954)
-jQuery.attrHooks.value = {
-	get: function( elem, name ) {
-		if ( formHook && jQuery.nodeName( elem, "button" ) ) {
-			return formHook.get( elem, name );
-		}
-		return elem.value;
-	},
-	set: function( elem, value, name ) {
-		if ( formHook && jQuery.nodeName( elem, "button" ) ) {
-			return formHook.set( elem, value, name );
-		}
-		// Does not return so that setAttribute is also used
-		elem.value = value;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !jQuery.support.getSetAttribute ) {
-
-	// propFix is more comprehensive and contains all fixes
-	jQuery.attrFix = jQuery.propFix;
-	
-	// Use this for any attribute on a form in IE6/7
-	formHook = jQuery.attrHooks.name = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			// Return undefined if nodeValue is empty string
-			return ret && ret.nodeValue !== "" ?
-				ret.nodeValue :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Check form objects in IE (multiple bugs related)
-			// Only use nodeValue if the attribute node exists on the form
-			var ret = elem.getAttributeNode( name );
-			if ( ret ) {
-				ret.nodeValue = value;
-				return value;
-			}
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
-		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return (elem.style.cssText = "" + value);
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-	});
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0);
-			}
-		}
-	});
-});
-
-
-
-
-var hasOwn = Object.prototype.hasOwnProperty,
-	rnamespaces = /\.(.*)$/,
-	rformElems = /^(?:textarea|input|select)$/i,
-	rperiod = /\./g,
-	rspaces = / /g,
-	rescape = /[^\w\s.|`]/g,
-	fcleanup = function( nm ) {
-		return nm.replace(rescape, "\\$&");
-	};
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		} else if ( !handler ) {
-			// Fixes bug #7229. Fix recommended by jdalton
-			return;
-		}
-
-		var handleObjIn, handleObj;
-
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure
-		var elemData = jQuery._data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
-		}
-
-		var events = elemData.events,
-			eventHandle = elemData.handle;
-
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-		}
-
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
-
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
-
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
-
-			handleObj.type = type;
-			if ( !handleObj.guid ) {
-				handleObj.guid = handler.guid;
-			}
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
-
-			// Keep track of which events have been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		}
-
-		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
-			events = elemData && elemData.events;
-
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" +
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
-				}
-
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-
-			for ( j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
-
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
-					}
-
-					if ( pos != null ) {
-						break;
-					}
-				}
-			}
-
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				ret = null;
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem, undefined, true );
-			}
-		}
-	},
-	
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Event object or event type
-		var type = event.type || event,
-			namespaces = [],
-			exclusive;
-
-		if ( type.indexOf("!") >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
-
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
-
-		event.type = type;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
-		
-		// triggerHandler() and global events don't bubble or run the default action
-		if ( onlyHandlers || !elem ) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-
-		// Handle a global trigger
-		if ( !elem ) {
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			jQuery.each( jQuery.cache, function() {
-				// internalKey variable is just used to make it easier to find
-				// and potentially change this stuff later; currently it just
-				// points to jQuery.expando
-				var internalKey = jQuery.expando,
-					internalCache = this[ internalKey ];
-				if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
-					jQuery.event.trigger( event, data, internalCache.handle.elem );
-				}
-			});
-			return;
-		}
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		event.target = elem;
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
-
-		var cur = elem,
-			// IE doesn't like method names with a colon (#3533, #8272)
-			ontype = type.indexOf(":") < 0 ? "on" + type : "";
-
-		// Fire event on the current element, then bubble up the DOM tree
-		do {
-			var handle = jQuery._data( cur, "handle" );
-
-			event.currentTarget = cur;
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Trigger an inline bound script
-			if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) {
-				event.result = false;
-				event.preventDefault();
-			}
-
-			// Bubble up to document, then to window
-			cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window;
-		} while ( cur && !event.isPropagationStopped() );
-
-		// If nobody prevented the default action, do it now
-		if ( !event.isDefaultPrevented() ) {
-			var old,
-				special = jQuery.event.special[ type ] || {};
-
-			if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction)() check here because IE6/7 fails that test.
-				// IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch.
-				try {
-					if ( ontype && elem[ type ] ) {
-						// Don't re-trigger an onFOO event when we call its FOO() method
-						old = elem[ ontype ];
-
-						if ( old ) {
-							elem[ ontype ] = null;
-						}
-
-						jQuery.event.triggered = type;
-						elem[ type ]();
-					}
-				} catch ( ieError ) {}
-
-				if ( old ) {
-					elem[ ontype ] = old;
-				}
-
-				jQuery.event.triggered = undefined;
-			}
-		}
-		
-		return event.result;
-	},
-
-	handle: function( event ) {
-		event = jQuery.event.fix( event || window.event );
-		// Snapshot the handlers list since a called handler may add/remove events.
-		var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0),
-			run_all = !event.exclusive && !event.namespace,
-			args = Array.prototype.slice.call( arguments, 0 );
-
-		// Use the fix-ed Event rather than the (read-only) native event
-		args[0] = event;
-		event.currentTarget = this;
-
-		for ( var j = 0, l = handlers.length; j < l; j++ ) {
-			var handleObj = handlers[ j ];
-
-			// Triggered event must 1) be non-exclusive and have no namespace, or
-			// 2) have namespace(s) a subset or equal to those in the bound event.
-			if ( run_all || event.namespace_re.test( handleObj.namespace ) ) {
-				// Pass in a reference to the handler function itself
-				// So that we can later remove it
-				event.handler = handleObj.handler;
-				event.data = handleObj.data;
-				event.handleObj = handleObj;
-
-				var ret = handleObj.handler.apply( this, args );
-
-				if ( ret !== undefined ) {
-					event.result = ret;
-					if ( ret === false ) {
-						event.preventDefault();
-						event.stopPropagation();
-					}
-				}
-
-				if ( event.isImmediatePropagationStopped() ) {
-					break;
-				}
-			}
-		}
-		return event.result;
-	},
-
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
-
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary
-		if ( !event.target ) {
-			// Fixes #1925 where srcElement might not be defined either
-			event.target = event.srcElement || document;
-		}
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var eventDocument = event.target.ownerDocument || document,
-				doc = eventDocument.documentElement,
-				body = eventDocument.body;
-
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
-			event.which = event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
-	},
-
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
-
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this,
-					liveConvert( handleObj.origType, handleObj.selector ),
-					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
-			},
-
-			remove: function( handleObj ) {
-				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
-			}
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
-				}
-			},
-
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		if ( elem.detachEvent ) {
-			elem.detachEvent( "on" + type, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// set the correct event type
-	event.type = event.data;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-
-		// Chrome does something similar, the parentNode property
-		// can be accessed but is null.
-		if ( parent && parent !== document && !parent.parentNode ) {
-			return;
-		}
-
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
-		}
-	};
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( !jQuery.nodeName( this, "form" ) ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						trigger( "submit", this, arguments );
-					}
-				});
-
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
-				return false;
-			}
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
-		}
-	};
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
-	var changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( jQuery.nodeName( elem, "select" ) ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery._data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery._data( elem, "_change_data", val );
-		}
-
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			e.liveFired = undefined;
-			jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
-	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange,
-
-			beforedeactivate: testChange,
-
-			click: function( e ) {
-				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
-
-				if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) {
-					testChange.call( this, e );
-				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
-
-				if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery._data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
-
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return rformElems.test( this.nodeName );
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
-
-			return rformElems.test( this.nodeName );
-		}
-	};
-
-	changeFilters = jQuery.event.special.change.filters;
-
-	// Handle when the input is .focus()'d
-	changeFilters.focus = changeFilters.beforeactivate;
-}
-
-function trigger( type, elem, args ) {
-	// Piggyback on a donor event to simulate a different one.
-	// Fake originalEvent to avoid donor's stopPropagation, but if the
-	// simulated event prevents default then we do the same on the donor.
-	// Don't pass args or remember liveFired; they apply to the donor event.
-	var event = jQuery.extend( {}, args[ 0 ] );
-	event.type = type;
-	event.originalEvent = {};
-	event.liveFired = undefined;
-	jQuery.event.handle.call( elem, event );
-	if ( event.isDefaultPrevented() ) {
-		args[ 0 ].preventDefault();
-	}
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0;
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-
-		function handler( donor ) {
-			// Donor event is always a native one; fix it and switch its type.
-			// Let focusin/out handler cancel the donor focus/blur event.
-			var e = jQuery.event.fix( donor );
-			e.type = fix;
-			e.originalEvent = {};
-			jQuery.event.trigger( e, null, e.target );
-			if ( e.isDefaultPrevented() ) {
-				donor.preventDefault();
-			}
-		}
-	});
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		var handler;
-
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-
-		if ( arguments.length === 2 || data === false ) {
-			fn = data;
-			data = undefined;
-		}
-
-		if ( name === "one" ) {
-			handler = function( event ) {
-				jQuery( this ).unbind( event, handler );
-				return fn.apply( this, arguments );
-			};
-			handler.guid = fn.guid || jQuery.guid++;
-		} else {
-			handler = fn;
-		}
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
-			}
-		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
-		}
-
-		return this;
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
-	},
-
-	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-			return this.unbind( "live" );
-
-		} else {
-			return this.die( types, null, fn, selector );
-		}
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
-
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
-
-		if ( typeof types === "object" && !types.preventDefault ) {
-			for ( var key in types ) {
-				context[ name ]( key, data, types[key], selector );
-			}
-
-			return this;
-		}
-
-		if ( name === "die" && !types &&
-					origSelector && origSelector.charAt(0) === "." ) {
-
-			context.unbind( origSelector );
-
-			return this;
-		}
-
-		if ( data === false || jQuery.isFunction( data ) ) {
-			fn = data || returnFalse;
-			data = undefined;
-		}
-
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( liveMap[ type ] ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				for ( var j = 0, l = context.length; j < l; j++ ) {
-					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				}
-
-			} else {
-				// unbind live handler
-				context.unbind( "live." + liveConvert( type, selector ), fn );
-			}
-		}
-
-		return this;
-	};
-});
-
-function liveHandler( event ) {
-	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
-		elems = [],
-		selectors = [],
-		events = jQuery._data( this, "events" );
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
-	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
-		return;
-	}
-
-	if ( event.namespace ) {
-		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		close = match[i];
-
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
-				elem = close.elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					event.type = handleObj.preType;
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-
-					// Make sure not to accidentally match a child element with the same selector
-					if ( related && jQuery.contains( elem, related ) ) {
-						related = elem;
-					}
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-
-		if ( maxLevel && match.level > maxLevel ) {
-			break;
-		}
-
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		ret = match.handleObj.origHandler.apply( match.elem, arguments );
-
-		if ( ret === false || event.isPropagationStopped() ) {
-			maxLevel = match.level;
-
-			if ( ret === false ) {
-				stop = false;
-			}
-			if ( event.isImmediatePropagationStopped() ) {
-				break;
-			}
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.bind( name, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-
-
-/*!
- * Sizzle CSS Selector Engine
- *  Copyright 2011, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true,
-	rBackslash = /\\/g,
-	rNonWord = /\W/;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function() {
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
-
-	var origContext = context;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var m, set, checkSet, extra, ret, cur, pop, i,
-		prune = true,
-		contextXML = Sizzle.isXML( context ),
-		parts = [],
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	do {
-		chunker.exec( "" );
-		m = chunker.exec( soFar );
-
-		if ( m ) {
-			soFar = m[3];
-		
-			parts.push( m[1] );
-		
-			if ( m[2] ) {
-				extra = m[3];
-				break;
-			}
-		}
-	} while ( m );
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
-			ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set )[0] :
-				ret.set[0];
-		}
-
-		if ( context ) {
-			ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
-			set = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set ) :
-				ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray( set );
-
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				cur = parts.pop();
-				pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-
-		} else if ( context && context.nodeType === 1 ) {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-
-		} else {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort( sortOrder );
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[ i - 1 ] ) {
-					results.splice( i--, 1 );
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function( expr, set ) {
-	return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
-	return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
-	var set;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var match,
-			type = Expr.order[i];
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice( 1, 1 );
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace( rBackslash, "" );
-				set = Expr.find[ type ]( match, context, isXML );
-
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( "*" ) :
-			[];
-	}
-
-	return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
-	var match, anyFound,
-		old = expr,
-		result = [],
-		curLoop = set,
-		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var found, item,
-					filter = Expr.filter[ type ],
-					left = match[1];
-
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-
-								} else {
-									curLoop[i] = false;
-								}
-
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-
-	leftMatch: {},
-
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-
-	attrHandle: {
-		href: function( elem ) {
-			return elem.getAttribute( "href" );
-		},
-		type: function( elem ) {
-			return elem.getAttribute( "type" );
-		}
-	},
-
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !rNonWord.test( part ),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-
-		">": function( checkSet, part ) {
-			var elem,
-				isPartStr = typeof part === "string",
-				i = 0,
-				l = checkSet.length;
-
-			if ( isPartStr && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-
-			} else {
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-
-		"": function(checkSet, part, isXML){
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
-		},
-
-		"~": function( checkSet, part, isXML ) {
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
-		}
-	},
-
-	find: {
-		ID: function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		},
-
-		NAME: function( match, context ) {
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [],
-					results = context.getElementsByName( match[1] );
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-
-		TAG: function( match, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( match[1] );
-			}
-		}
-	},
-	preFilter: {
-		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
-			match = " " + match[1].replace( rBackslash, "" ) + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-
-		ID: function( match ) {
-			return match[1].replace( rBackslash, "" );
-		},
-
-		TAG: function( match, curLoop ) {
-			return match[1].replace( rBackslash, "" ).toLowerCase();
-		},
-
-		CHILD: function( match ) {
-			if ( match[1] === "nth" ) {
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
-
-				match[2] = match[2].replace(/^\+|\s*/g, '');
-
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-			else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-
-		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
-			var name = match[1] = match[1].replace( rBackslash, "" );
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			// Handle if an un-quoted value was used
-			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-
-		PSEUDO: function( match, curLoop, inplace, result, not ) {
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-
-					return false;
-				}
-
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
-
-		POS: function( match ) {
-			match.unshift( true );
-
-			return match;
-		}
-	},
-	
-	filters: {
-		enabled: function( elem ) {
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-
-		disabled: function( elem ) {
-			return elem.disabled === true;
-		},
-
-		checked: function( elem ) {
-			return elem.checked === true;
-		},
-		
-		selected: function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-			
-			return elem.selected === true;
-		},
-
-		parent: function( elem ) {
-			return !!elem.firstChild;
-		},
-
-		empty: function( elem ) {
-			return !elem.firstChild;
-		},
-
-		has: function( elem, i, match ) {
-			return !!Sizzle( match[3], elem ).length;
-		},
-
-		header: function( elem ) {
-			return (/h\d/i).test( elem.nodeName );
-		},
-
-		text: function( elem ) {
-			var attr = elem.getAttribute( "type" ), type = elem.type;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
-		},
-
-		radio: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
-		},
-
-		checkbox: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
-		},
-
-		file: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
-		},
-
-		password: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
-		},
-
-		submit: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "submit" === elem.type;
-		},
-
-		image: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
-		},
-
-		reset: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "reset" === elem.type;
-		},
-
-		button: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && "button" === elem.type || name === "button";
-		},
-
-		input: function( elem ) {
-			return (/input|select|textarea|button/i).test( elem.nodeName );
-		},
-
-		focus: function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		}
-	},
-	setFilters: {
-		first: function( elem, i ) {
-			return i === 0;
-		},
-
-		last: function( elem, i, match, array ) {
-			return i === array.length - 1;
-		},
-
-		even: function( elem, i ) {
-			return i % 2 === 0;
-		},
-
-		odd: function( elem, i ) {
-			return i % 2 === 1;
-		},
-
-		lt: function( elem, i, match ) {
-			return i < match[3] - 0;
-		},
-
-		gt: function( elem, i, match ) {
-			return i > match[3] - 0;
-		},
-
-		nth: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		},
-
-		eq: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function( elem, match, i, array ) {
-			var name = match[1],
-				filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var j = 0, l = not.length; j < l; j++ ) {
-					if ( not[j] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-
-			} else {
-				Sizzle.error( name );
-			}
-		},
-
-		CHILD: function( elem, match ) {
-			var type = match[1],
-				node = elem;
-
-			switch ( type ) {
-				case "only":
-				case "first":
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					if ( type === "first" ) { 
-						return true; 
-					}
-
-					node = elem;
-
-				case "last":
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					return true;
-
-				case "nth":
-					var first = match[2],
-						last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-
-					if ( first === 0 ) {
-						return diff === 0;
-
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-
-		ID: function( elem, match ) {
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-
-		TAG: function( elem, match ) {
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		
-		CLASS: function( elem, match ) {
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-
-		ATTR: function( elem, match ) {
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-
-		POS: function( elem, match, i, array ) {
-			var name = match[2],
-				filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS,
-	fescape = function(all, num){
-		return "\\" + (num - 0 + 1);
-	};
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-
-var makeArray = function( array, results ) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
-	makeArray = function( array, results ) {
-		var i = 0,
-			ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-
-			} else {
-				for ( ; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
-	};
-
-} else {
-	sortOrder = function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
-
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-	siblingCheck = function( a, b, ret ) {
-		if ( a === b ) {
-			return ret;
-		}
-
-		var cur = a.nextSibling;
-
-		while ( cur ) {
-			if ( cur === b ) {
-				return -1;
-			}
-
-			cur = cur.nextSibling;
-		}
-
-		return 1;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-Sizzle.getText = function( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += Sizzle.getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-};
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date()).getTime(),
-		root = document.documentElement;
-
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-
-				return m ?
-					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-
-		Expr.filter.ID = function( elem, match ) {
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-
-	// release memory in IE
-	root = form = null;
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function( match, context ) {
-			var results = context.getElementsByTagName( match[1] );
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-
-		Expr.attrHandle.href = function( elem ) {
-			return elem.getAttribute( "href", 2 );
-		};
-	}
-
-	// release memory in IE
-	div = null;
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle,
-			div = document.createElement("div"),
-			id = "__sizzle__";
-
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function( query, context, extra, seed ) {
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && !Sizzle.isXML(context) ) {
-				// See if we find a selector to speed up
-				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-				
-				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
-					// Speed-up: Sizzle("TAG")
-					if ( match[1] ) {
-						return makeArray( context.getElementsByTagName( query ), extra );
-					
-					// Speed-up: Sizzle(".CLASS")
-					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
-						return makeArray( context.getElementsByClassName( match[2] ), extra );
-					}
-				}
-				
-				if ( context.nodeType === 9 ) {
-					// Speed-up: Sizzle("body")
-					// The body element only exists once, optimize finding it
-					if ( query === "body" && context.body ) {
-						return makeArray( [ context.body ], extra );
-						
-					// Speed-up: Sizzle("#ID")
-					} else if ( match && match[3] ) {
-						var elem = context.getElementById( match[3] );
-
-						// Check parentNode to catch when Blackberry 4.6 returns
-						// nodes that are no longer in the document #6963
-						if ( elem && elem.parentNode ) {
-							// Handle the case where IE and Opera return items
-							// by name instead of ID
-							if ( elem.id === match[3] ) {
-								return makeArray( [ elem ], extra );
-							}
-							
-						} else {
-							return makeArray( [], extra );
-						}
-					}
-					
-					try {
-						return makeArray( context.querySelectorAll(query), extra );
-					} catch(qsaError) {}
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					var oldContext = context,
-						old = context.getAttribute( "id" ),
-						nid = old || id,
-						hasParent = context.parentNode,
-						relativeHierarchySelector = /^\s*[+~]/.test( query );
-
-					if ( !old ) {
-						context.setAttribute( "id", nid );
-					} else {
-						nid = nid.replace( /'/g, "\\$&" );
-					}
-					if ( relativeHierarchySelector && hasParent ) {
-						context = context.parentNode;
-					}
-
-					try {
-						if ( !relativeHierarchySelector || hasParent ) {
-							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
-						}
-
-					} catch(pseudoError) {
-					} finally {
-						if ( !old ) {
-							oldContext.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		// release memory in IE
-		div = null;
-	})();
-}
-
-(function(){
-	var html = document.documentElement,
-		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
-
-	if ( matches ) {
-		// Check to see if it's possible to do matchesSelector
-		// on a disconnected node (IE 9 fails this)
-		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
-			pseudoWorks = false;
-
-		try {
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( document.documentElement, "[test!='']:sizzle" );
-	
-		} catch( pseudoError ) {
-			pseudoWorks = true;
-		}
-
-		Sizzle.matchesSelector = function( node, expr ) {
-			// Make sure that attribute selectors are quoted
-			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			if ( !Sizzle.isXML( node ) ) {
-				try { 
-					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
-						var ret = matches.call( node, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || !disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9, so check for that
-								node.document && node.document.nodeType !== 11 ) {
-							return ret;
-						}
-					}
-				} catch(e) {}
-			}
-
-			return Sizzle(expr, null, null, [node]).length > 0;
-		};
-	}
-})();
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function( match, context, isXML ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	// release memory in IE
-	div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-			
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-if ( document.documentElement.contains ) {
-	Sizzle.contains = function( a, b ) {
-		return a !== b && (a.contains ? a.contains(b) : true);
-	};
-
-} else if ( document.documentElement.compareDocumentPosition ) {
-	Sizzle.contains = function( a, b ) {
-		return !!(a.compareDocumentPosition(b) & 16);
-	};
-
-} else {
-	Sizzle.contains = function() {
-		return false;
-	};
-}
-
-Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context ) {
-	var match,
-		tmpSet = [],
-		later = "",
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	slice = Array.prototype.slice,
-	POS = jQuery.expr.match.POS,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var self = this,
-			i, l;
-
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			});
-		}
-
-		var ret = this.pushStack( "", "find", selector ),
-			length, n, r;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-
-	is: function( selector ) {
-		return !!selector && ( typeof selector === "string" ?
-			jQuery.filter( selector, this ).length > 0 :
-			this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var ret = [], i, l, cur = this[0];
-		
-		// Array
-		if ( jQuery.isArray( selectors ) ) {
-			var match, selector,
-				matches = {},
-				level = 1;
-
-			if ( cur && selectors.length ) {
-				for ( i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
-
-					if ( !matches[ selector ] ) {
-						matches[ selector ] = POS.test( selector ) ?
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[ selector ];
-
-						if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) {
-							ret.push({ selector: selector, elem: cur, level: level });
-						}
-					}
-
-					cur = cur.parentNode;
-					level++;
-				}
-			}
-
-			return ret;
-		}
-
-		// String
-		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-
-				} else {
-					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
-						break;
-					}
-				}
-			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-		return this.pushStack( ret, "closest", selectors );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until ),
-			// The variable 'args' was introduced in
-			// https://github.com/jquery/jquery/commit/52a0238
-			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
-			// http://code.google.com/p/v8/issues/detail?id=1050
-			args = slice.call(arguments);
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, args.join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-}
-
-
-
-
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery( this );
-
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
-
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, "<$1></$2>");
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
-
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery( this );
-
-				self.html( value.call(this, i, self.html()) );
-			});
-
-		} else {
-			this.empty().append( value );
-		}
-
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.length ?
-				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-				this;
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, fragment, parent,
-			value = args[0],
-			scripts = [];
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = jQuery.buildFragment( args, this, scripts );
-			}
-
-			fragment = results.fragment;
-
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						// Make sure that we do not leak memory by inadvertently discarding
-						// the original fragment (which might have attached data) instead of
-						// using it; in addition, use the original fragment object for the last
-						// item instead of first because it can end up being emptied incorrectly
-						// in certain situations (Bug #8070).
-						// Fragments from the fragment cache must always be cloned and never used
-						// in place.
-						results.cacheable || (l > 1 && i < lastIndex) ?
-							jQuery.clone( fragment, true, true ) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
-			}
-		}
-
-		return this;
-	}
-});
-
-function root( elem, cur ) {
-	return jQuery.nodeName(elem, "table") ?
-		(elem.getElementsByTagName("tbody")[0] ||
-		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-		elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var internalKey = jQuery.expando,
-		oldData = jQuery.data( src ),
-		curData = jQuery.data( dest, oldData );
-
-	// Switch to use the internal data object, if it exists, for the next
-	// stage of data copying
-	if ( (oldData = oldData[ internalKey ]) ) {
-		var events = oldData.events;
-				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
-				}
-			}
-		}
-	}
-}
-
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
-
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 fail to clone children inside object elements that use
-	// the proprietary classid attribute value (rather than the type
-	// attribute) to identify the type of content to display
-	if ( nodeName === "object" ) {
-		dest.outerHTML = src.outerHTML;
-
-	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-		if ( src.checked ) {
-			dest.defaultChecked = dest.checked = src.checked;
-		}
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
-		cacheable = true;
-
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults && cacheresults !== 1 ) {
-			fragment = cacheresults;
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [],
-			insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
-			}
-
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-function getAll( elem ) {
-	if ( "getElementsByTagName" in elem ) {
-		return elem.getElementsByTagName( "*" );
-
-	} else if ( "querySelectorAll" in elem ) {
-		return elem.querySelectorAll( "*" );
-
-	} else {
-		return [];
-	}
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( elem.type === "checkbox" || elem.type === "radio" ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-// Finds all inputs and passes them to fixDefaultChecked
-function findInputs( elem ) {
-	if ( jQuery.nodeName( elem, "input" ) ) {
-		fixDefaultChecked( elem );
-	} else if ( elem.getElementsByTagName ) {
-		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var clone = elem.cloneNode(true),
-				srcElements,
-				destElements,
-				i;
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName
-			// instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				cloneFixAttributes( srcElements[i], destElements[i] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
-
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
-
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	clean: function( elems, context, fragment, scripts ) {
-		var checkScriptType;
-
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		var ret = [], j;
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Trim whitespace, otherwise indexOf won't work as expected
-					var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-						wrap = wrapMap[ tag ] || wrapMap._default,
-						depth = wrap[0],
-						div = context.createElement("div");
-
-					// Go to html and back, then peel off extra wrappers
-					div.innerHTML = wrap[1] + elem + wrap[2];
-
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						var hasBody = rtbody.test(elem),
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
-
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
-
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
-							}
-						}
-					}
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
-
-					elem = div.childNodes;
-				}
-			}
-
-			// Resets defaultChecked for any radios and checkboxes
-			// about to be appended to the DOM in IE 6/7 (#8060)
-			var len;
-			if ( !jQuery.support.appendChecked ) {
-				if ( elem[0] && typeof (len = elem.length) === "number" ) {
-					for ( j = 0; j < len; j++ ) {
-						findInputs( elem[j] );
-					}
-				} else {
-					findInputs( elem );
-				}
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			checkScriptType = function( elem ) {
-				return !elem.type || rscriptType.test( elem.type );
-			};
-			for ( i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
-
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-				continue;
-			}
-
-			id = elem[ jQuery.expando ];
-
-			if ( id ) {
-				data = cache[ id ] && cache[ id ][ internalKey ];
-
-				if ( data && data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						// This is a shortcut to avoid jQuery.event.remove's overhead
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
-						}
-					}
-
-					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
-					if ( data.handle ) {
-						data.handle.elem = null;
-					}
-				}
-
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-
-				delete cache[ id ];
-			}
-		}
-	}
-});
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
-	}
-
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	rdashAlpha = /-([a-z])/ig,
-	// fixed for IE9, see #8346
-	rupper = /([A-Z]|^ms)/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-	rrelNum = /^[+\-]=/,
-	rrelNumFilter = /[^+\-\.\de]+/g,
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-	curCSS,
-
-	getComputedStyle,
-	currentStyle,
-
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	// Setting 'undefined' is a no-op
-	if ( arguments.length === 2 && value === undefined ) {
-		return this;
-	}
-
-	return jQuery.access( this, name, value, true, function( elem, name, value ) {
-		return value !== undefined ?
-			jQuery.style( elem, name, value ) :
-			jQuery.css( elem, name );
-	});
-};
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity", "opacity" );
-					return ret === "" ? "1" : ret;
-
-				} else {
-					return elem.style.opacity;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"zIndex": true,
-		"fontWeight": true,
-		"opacity": true,
-		"zoom": true,
-		"lineHeight": true,
-		"widows": true,
-		"orphans": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, origName = jQuery.camelCase( name ),
-			style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( type === "number" && isNaN( value ) || value == null ) {
-				return;
-			}
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && rrelNum.test( value ) ) {
-				value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) );
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra ) {
-		var ret, hooks;
-
-		// Make sure that we're working with the right name
-		name = jQuery.camelCase( name );
-		hooks = jQuery.cssHooks[ name ];
-		name = jQuery.cssProps[ name ] || name;
-
-		// cssFloat needs a special treatment
-		if ( name === "cssFloat" ) {
-			name = "float";
-		}
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
-			return ret;
-
-		// Otherwise, if a way to get the computed value exists, use that
-		} else if ( curCSS ) {
-			return curCSS( elem, name );
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-	},
-
-	camelCase: function( string ) {
-		return string.replace( rdashAlpha, fcamelCase );
-	}
-});
-
-// DEPRECATED, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-jQuery.each(["height", "width"], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			var val;
-
-			if ( computed ) {
-				if ( elem.offsetWidth !== 0 ) {
-					val = getWH( elem, name, extra );
-
-				} else {
-					jQuery.swap( elem, cssShow, function() {
-						val = getWH( elem, name, extra );
-					});
-				}
-
-				if ( val <= 0 ) {
-					val = curCSS( elem, name, name );
-
-					if ( val === "0px" && currentStyle ) {
-						val = currentStyle( elem, name, name );
-					}
-
-					if ( val != null ) {
-						// Should return "auto" instead of 0, use 0 for
-						// temporary backwards-compat
-						return val === "" || val === "auto" ? "0px" : val;
-					}
-				}
-
-				if ( val < 0 || val == null ) {
-					val = elem.style[ name ];
-
-					// Should return "auto" instead of 0, use 0 for
-					// temporary backwards-compat
-					return val === "" || val === "auto" ? "0px" : val;
-				}
-
-				return typeof val === "string" ? val : val + "px";
-			}
-		},
-
-		set: function( elem, value ) {
-			if ( rnumpx.test( value ) ) {
-				// ignore negative width and height values #1599
-				value = parseFloat(value);
-
-				if ( value >= 0 ) {
-					return value + "px";
-				}
-
-			} else {
-				return value;
-			}
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( parseFloat( RegExp.$1 ) / 100 ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle;
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// Set the alpha filter to set the opacity
-			var opacity = jQuery.isNaN( value ) ?
-				"" :
-				"alpha(opacity=" + value * 100 + ")",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery(function() {
-	// This hook cannot be added until DOM ready because the support test
-	// for it is not run until after DOM ready
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				var ret;
-				jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						ret = curCSS( elem, "margin-right", "marginRight" );
-					} else {
-						ret = elem.style.marginRight;
-					}
-				});
-				return ret;
-			}
-		};
-	}
-});
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, name ) {
-		var ret, defaultView, computedStyle;
-
-		name = name.replace( rupper, "-$1" ).toLowerCase();
-
-		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
-			return undefined;
-		}
-
-		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-			ret = computedStyle.getPropertyValue( name );
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-		}
-
-		return ret;
-	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
-		var left,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
-			style = elem.style;
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-			// Remember the original values
-			left = style.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : (ret || 0);
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWH( elem, name, extra ) {
-	var which = name === "width" ? cssWidth : cssHeight,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-	if ( extra === "border" ) {
-		return val;
-	}
-
-	jQuery.each( which, function() {
-		if ( !extra ) {
-			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
-		}
-
-		if ( extra === "margin" ) {
-			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
-
-		} else {
-			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
-		}
-	});
-
-	return val;
-}
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth,
-			height = elem.offsetHeight;
-
-		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rspacesAjax = /\s+/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Document location
-	ajaxLocation,
-
-	// Document location segments
-	ajaxLocParts;
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		if ( jQuery.isFunction( func ) ) {
-			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
-				i = 0,
-				length = dataTypes.length,
-				dataType,
-				list,
-				placeBefore;
-
-			// For each dataType in the dataTypeExpression
-			for(; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters ),
-		selection;
-
-	for(; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
-			}
-		}
-	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" && _load ) {
-			return _load.apply( this, arguments );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf( " " );
-		if ( off >= 0 ) {
-			var selector = url.slice( off, url.length );
-			url = url.slice( 0, off );
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = undefined;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			// Complete callback (responseText is used internally)
-			complete: function( jqXHR, status, responseText ) {
-				// Store the response as specified by the jqXHR object
-				responseText = jqXHR.responseText;
-				// If successful, inject the HTML into all the matched elements
-				if ( jqXHR.isResolved() ) {
-					// #4825: Get the actual response in case
-					// a dataFilter is present in ajaxSettings
-					jqXHR.done(function( r ) {
-						responseText = r;
-					});
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [ responseText, status, jqXHR ] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-
-	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.bind( o, f );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			type: method,
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	};
-});
-
-jQuery.extend({
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function ( target, settings ) {
-		if ( !settings ) {
-			// Only one parameter, we extend ajaxSettings
-			settings = target;
-			target = jQuery.extend( true, jQuery.ajaxSettings, settings );
-		} else {
-			// target was provided, we extend into it
-			jQuery.extend( true, target, jQuery.ajaxSettings, settings );
-		}
-		// Flatten fields we don't want deep extended
-		for( var field in { context: 1, url: 1 } ) {
-			if ( field in settings ) {
-				target[ field ] = settings[ field ];
-			} else if( field in jQuery.ajaxSettings ) {
-				target[ field ] = jQuery.ajaxSettings[ field ];
-			}
-		}
-		return target;
-	},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": "*/*"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		}
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery._Deferred(),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// ifModified key
-			ifModifiedKey,
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// The jqXHR state
-			state = 0,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Fake xhr
-			jqXHR = {
-
-				readyState: 0,
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || "abort";
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
-				}
-			};
-
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, statusText, responses, headers ) {
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status ? 4 : 0;
-
-			var isSuccess,
-				success,
-				error,
-				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
-				lastModified,
-				etag;
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-
-					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
-						jQuery.lastModified[ ifModifiedKey ] = lastModified;
-					}
-					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
-						jQuery.etag[ ifModifiedKey ] = etag;
-					}
-				}
-
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
-
-				// If we have data
-				} else {
-
-					try {
-						success = ajaxConvert( s, response );
-						statusText = "success";
-						isSuccess = true;
-					} catch(e) {
-						// We have a parsererror
-						statusText = "parsererror";
-						error = e;
-					}
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = statusText;
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.done;
-
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.then( tmp, tmp );
-				}
-			}
-			return this;
-		};
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
-
-		// Determine if a cross-domain request is in order
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefiler, stop there
-		if ( state === 2 ) {
-			return false;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-			}
-
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
-
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-				// Abort if not done already
-				jqXHR.abort();
-				return false;
-
-		}
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( status < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					jQuery.error( e );
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [],
-			add = function( key, value ) {
-				// If value is a function, invoke it and return its value
-				value = jQuery.isFunction( value ) ? value() : value;
-				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-			};
-
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[ prefix ], traditional, add );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join( "&" ).replace( r20, "+" );
-	}
-});
-
-function buildParams( prefix, obj, traditional, add ) {
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && obj != null && typeof obj === "object" ) {
-		// Serialize object item.
-		for ( var name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields,
-		ct,
-		type,
-		finalDataType,
-		firstDataType;
-
-	// Fill responseXXX fields
-	for( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	var dataTypes = s.dataTypes,
-		converters = {},
-		i,
-		key,
-		length = dataTypes.length,
-		tmp,
-		// Current and previous dataTypes
-		current = dataTypes[ 0 ],
-		prev,
-		// Conversion expression
-		conversion,
-		// Conversion function
-		conv,
-		// Conversion functions (transitive conversion)
-		conv1,
-		conv2;
-
-	// For each dataType in the chain
-	for( i = 1; i < length; i++ ) {
-
-		// Create converters map
-		// with lowercased keys
-		if ( i === 1 ) {
-			for( key in s.converters ) {
-				if( typeof key === "string" ) {
-					converters[ key.toLowerCase() ] = s.converters[ key ];
-				}
-			}
-		}
-
-		// Get the dataTypes
-		prev = current;
-		current = dataTypes[ i ];
-
-		// If current is auto dataType, update it to prev
-		if( current === "*" ) {
-			current = prev;
-		// If no auto and dataTypes are actually different
-		} else if ( prev !== "*" && prev !== current ) {
-
-			// Get the converter
-			conversion = prev + " " + current;
-			conv = converters[ conversion ] || converters[ "* " + current ];
-
-			// If there is no direct converter, search transitively
-			if ( !conv ) {
-				conv2 = undefined;
-				for( conv1 in converters ) {
-					tmp = conv1.split( " " );
-					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
-						conv2 = converters[ tmp[1] + " " + current ];
-						if ( conv2 ) {
-							conv1 = converters[ conv1 ];
-							if ( conv1 === true ) {
-								conv = conv2;
-							} else if ( conv2 === true ) {
-								conv = conv1;
-							}
-							break;
-						}
-					}
-				}
-			}
-			// If we found no converter, dispatch an error
-			if ( !( conv || conv2 ) ) {
-				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
-			}
-			// If found converter is not an equivalence
-			if ( conv !== true ) {
-				// Convert with 1 or 2 converters accordingly
-				response = conv ? conv( response ) : conv2( conv1(response) );
-			}
-		}
-	}
-	return response;
-}
-
-
-
-
-var jsc = jQuery.now(),
-	jsre = /(\=)\?(&|$)|\?\?/i;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		return jQuery.expando + "_" + ( jsc++ );
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
-		( typeof s.data === "string" );
-
-	if ( s.dataTypes[ 0 ] === "jsonp" ||
-		s.jsonp !== false && ( jsre.test( s.url ) ||
-				inspectData && jsre.test( s.data ) ) ) {
-
-		var responseContainer,
-			jsonpCallback = s.jsonpCallback =
-				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-			previous = window[ jsonpCallback ],
-			url = s.url,
-			data = s.data,
-			replace = "$1" + jsonpCallback + "$2";
-
-		if ( s.jsonp !== false ) {
-			url = url.replace( jsre, replace );
-			if ( s.url === url ) {
-				if ( inspectData ) {
-					data = data.replace( jsre, replace );
-				}
-				if ( s.data === data ) {
-					// Add callback manually
-					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
-				}
-			}
-		}
-
-		s.url = url;
-		s.data = data;
-
-		// Install callback
-		window[ jsonpCallback ] = function( response ) {
-			responseContainer = [ response ];
-		};
-
-		// Clean-up function
-		jqXHR.always(function() {
-			// Set callback back to previous value
-			window[ jsonpCallback ] = previous;
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( previous ) ) {
-				window[ jsonpCallback ]( responseContainer[ 0 ] );
-			}
-		});
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( jsonpCallback + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = "async";
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-
-						// Dereference the script
-						script = undefined;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0,
-	xhrCallbacks;
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var xhr = s.xhr(),
-						handle,
-						i;
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( _ ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-									responses.text = xhr.responseText;
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					// if we're in sync mode or it's in cache
-					// and has been retrieved directly (IE6 & IE7)
-					// we need to manually fire the callback
-					if ( !s.async || xhr.readyState === 4 ) {
-						callback();
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
-					}
-				}
-			};
-		}
-	});
-}
-
-
-
-
-var elemdisplay = {},
-	iframe, iframeDoc,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	],
-	fxNow,
-	requestAnimationFrame = window.webkitRequestAnimationFrame ||
-	    window.mozRequestAnimationFrame ||
-	    window.oRequestAnimationFrame;
-
-jQuery.fn.extend({
-	show: function( speed, easing, callback ) {
-		var elem, display;
-
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("show", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				elem = this[i];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					// Reset the inline display of this element to learn if it is
-					// being hidden by cascaded rules or not
-					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
-						display = elem.style.display = "";
-					}
-
-					// Set elements which have been overridden with display: none
-					// in a stylesheet to whatever the default browser style is
-					// for such an element
-					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
-						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
-					}
-				}
-			}
-
-			// Set the display of most of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				elem = this[i];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					if ( display === "" || display === "none" ) {
-						elem.style.display = jQuery._data(elem, "olddisplay") || "";
-					}
-				}
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, easing, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				if ( this[i].style ) {
-					var display = jQuery.css( this[i], "display" );
-
-					if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
-						jQuery._data( this[i], "olddisplay", display );
-					}
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				if ( this[i].style ) {
-					this[i].style.display = "none";
-				}
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2, callback ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2, callback);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, easing, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, easing, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete, [ false ] );
-		}
-
-		// Do not change referenced properties as per-property easing will be lost
-		prop = jQuery.extend( {}, prop );
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			// XXX 'this' does not always have a nodeName when running the
-			// test suite
-
-			if ( optall.queue === false ) {
-				jQuery._mark( this );
-			}
-
-			var opt = jQuery.extend( {}, optall ),
-				isElement = this.nodeType === 1,
-				hidden = isElement && jQuery(this).is(":hidden"),
-				name, val, p,
-				display, e,
-				parts, start, end, unit;
-
-			// will store per property easing and be used to determine when an animation is complete
-			opt.animatedProperties = {};
-
-			for ( p in prop ) {
-
-				// property name normalization
-				name = jQuery.camelCase( p );
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-				}
-
-				val = prop[ name ];
-
-				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
-				if ( jQuery.isArray( val ) ) {
-					opt.animatedProperties[ name ] = val[ 1 ];
-					val = prop[ name ] = val[ 0 ];
-				} else {
-					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
-				}
-
-				if ( val === "hide" && hidden || val === "show" && !hidden ) {
-					return opt.complete.call( this );
-				}
-
-				if ( isElement && ( name === "height" || name === "width" ) ) {
-					// Make sure that nothing sneaks out
-					// Record all 3 overflow attributes because IE does not
-					// change the overflow attribute when overflowX and
-					// overflowY are set to the same value
-					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
-					// Set display property to inline-block for height/width
-					// animations on inline elements that are having width/height
-					// animated
-					if ( jQuery.css( this, "display" ) === "inline" &&
-							jQuery.css( this, "float" ) === "none" ) {
-						if ( !jQuery.support.inlineBlockNeedsLayout ) {
-							this.style.display = "inline-block";
-
-						} else {
-							display = defaultDisplay( this.nodeName );
-
-							// inline-level elements accept inline-block;
-							// block-level elements need to be inline with layout
-							if ( display === "inline" ) {
-								this.style.display = "inline-block";
-
-							} else {
-								this.style.display = "inline";
-								this.style.zoom = 1;
-							}
-						}
-					}
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			for ( p in prop ) {
-				e = new jQuery.fx( this, opt, p );
-				val = prop[ p ];
-
-				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]();
-
-				} else {
-					parts = rfxnum.exec( val );
-					start = e.cur();
-
-					if ( parts ) {
-						end = parseFloat( parts[2] );
-						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							jQuery.style( this, p, (end || 1) + unit);
-							start = ((end || 1) / e.cur()) * start;
-							jQuery.style( this, p, start + unit);
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			}
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			var timers = jQuery.timers,
-				i = timers.length;
-			// clear marker counters if we know they won't be
-			if ( !gotoEnd ) {
-				jQuery._unmark( true, this );
-			}
-			while ( i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
-	}
-
-});
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout( clearFxNow, 0 );
-	return ( fxNow = jQuery.now() );
-}
-
-function clearFxNow() {
-	fxNow = undefined;
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function( noUnmark ) {
-			if ( opt.queue !== false ) {
-				jQuery.dequeue( this );
-			} else if ( noUnmark !== false ) {
-				jQuery._unmark( this );
-			}
-
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
-			}
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		options.orig = options.orig || {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-	},
-
-	// Get the current size
-	cur: function() {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var parsed,
-			r = jQuery.css( this.elem, this.prop );
-		// Empty strings, null, undefined and "auto" are converted to 0,
-		// complex values such as "rotate(1rad)" are returned as is,
-		// simple values such as "10px" are parsed to Float.
-		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		var self = this,
-			fx = jQuery.fx,
-			raf;
-
-		this.startTime = fxNow || createFxNow();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			// Use requestAnimationFrame instead of setInterval if available
-			if ( requestAnimationFrame ) {
-				timerId = 1;
-				raf = function() {
-					// When timerId gets set to null at any point, this stops
-					if ( timerId ) {
-						requestAnimationFrame( raf );
-						fx.tick();
-					}
-				};
-				requestAnimationFrame( raf );
-			} else {
-				timerId = setInterval( fx.tick, fx.interval );
-			}
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = fxNow || createFxNow(),
-			done = true,
-			elem = this.elem,
-			options = this.options,
-			i, n;
-
-		if ( gotoEnd || t >= options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			options.animatedProperties[ this.prop ] = true;
-
-			for ( i in options.animatedProperties ) {
-				if ( options.animatedProperties[i] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				// Reset the overflow
-				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-
-					jQuery.each( [ "", "X", "Y" ], function (index, value) {
-						elem.style[ "overflow" + value ] = options.overflow[index];
-					});
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( options.hide ) {
-					jQuery(elem).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( options.hide || options.show ) {
-					for ( var p in options.animatedProperties ) {
-						jQuery.style( elem, p, options.orig[p] );
-					}
-				}
-
-				// Execute the complete function
-				options.complete.call( elem );
-			}
-
-			return false;
-
-		} else {
-			// classical easing cannot be used with an Infinity duration
-			if ( options.duration == Infinity ) {
-				this.now = t;
-			} else {
-				n = t - this.startTime;
-				this.state = n / options.duration;
-
-				// Perform the easing function, defaults to swing
-				this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
-				this.now = this.start + ((this.end - this.start) * this.pos);
-			}
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-};
-
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-
-	interval: 13,
-
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-
-	speeds: {
-		slow: 600,
-		fast: 200,
-		// Default speed
-		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style( fx.elem, "opacity", fx.now );
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-// Try to restore the default display value of an element
-function defaultDisplay( nodeName ) {
-
-	if ( !elemdisplay[ nodeName ] ) {
-
-		var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ),
-			display = elem.css( "display" );
-
-		elem.remove();
-
-		// If the simple way fails,
-		// get element's real default display by attaching it to a temp iframe
-		if ( display === "none" || display === "" ) {
-			// No iframe to use yet, so create it
-			if ( !iframe ) {
-				iframe = document.createElement( "iframe" );
-				iframe.frameBorder = iframe.width = iframe.height = 0;
-			}
-
-			document.body.appendChild( iframe );
-
-			// Create a cacheable copy of the iframe document on first call.
-			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake html
-			// document to it, Webkit & Firefox won't allow reusing the iframe document
-			if ( !iframeDoc || !iframe.createElement ) {
-				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-				iframeDoc.write( "<!doctype><html><body></body></html>" );
-			}
-
-			elem = iframeDoc.createElement( nodeName );
-
-			iframeDoc.body.appendChild( elem );
-
-			display = jQuery.css( elem, "display" );
-
-			document.body.removeChild( iframe );
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return elemdisplay[ nodeName ];
-}
-
-
-
-
-var rtable = /^t(?:able|d|h)$/i,
-	rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0], box;
-
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		try {
-			box = elem.getBoundingClientRect();
-		} catch(e) {}
-
-		var doc = elem.ownerDocument,
-			docElem = doc.documentElement;
-
-		// Make sure we're not dealing with a disconnected DOM node
-		if ( !box || !jQuery.contains( docElem, elem ) ) {
-			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
-		}
-
-		var body = doc.body,
-			win = getWindow(doc),
-			clientTop  = docElem.clientTop  || body.clientTop  || 0,
-			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
-			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
-			top  = box.top  + scrollTop  - clientTop,
-			left = box.left + scrollLeft - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var computedStyle,
-			offsetParent = elem.offsetParent,
-			prevOffsetParent = elem,
-			doc = elem.ownerDocument,
-			docElem = doc.documentElement,
-			body = doc.body,
-			defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop,
-			left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent;
-				offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed";
-		checkDiv.style.top = "20px";
-
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden";
-		innerDiv.style.position = "relative";
-
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if (options.top != null) {
-			props.top = (options.top - curOffset.top) + curTop;
-		}
-		if (options.left != null) {
-			props.left = (options.left - curOffset.left) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function( val ) {
-		var elem, win;
-
-		if ( val === undefined ) {
-			elem = this[ 0 ];
-
-			if ( !elem ) {
-				return null;
-			}
-
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
-
-		// Set the scroll offset
-		return this.each(function() {
-			win = getWindow( this );
-
-			if ( win ) {
-				win.scrollTo(
-					!i ? val : jQuery( win ).scrollLeft(),
-					 i ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				this[ method ] = val;
-			}
-		});
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-
-
-
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
-
-		if ( jQuery.isWindow( elem ) ) {
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
-			var docElemProp = elem.document.documentElement[ "client" + name ];
-			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
-				elem.document.body[ "client" + name ] || docElemProp;
-
-		// Get document width or height
-		} else if ( elem.nodeType === 9 ) {
-			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-			return Math.max(
-				elem.documentElement["client" + name],
-				elem.body["scroll" + name], elem.documentElement["scroll" + name],
-				elem.body["offset" + name], elem.documentElement["offset" + name]
-			);
-
-		// Get or set width or height on the element
-		} else if ( size === undefined ) {
-			var orig = jQuery.css( elem, type ),
-				ret = parseFloat( orig );
-
-			return jQuery.isNaN( ret ) ? orig : ret;
-
-		// Set the width or height on the element (default to pixels if value is unitless)
-		} else {
-			return this.css( type, typeof size === "string" ? size : size + "px" );
-		}
-	};
-
-});
-
-
-window.jQuery = window.$ = jQuery;
-})(window);
-(function() {
-
-	var joey = this.joey = function joey(elementDef, parentNode) {
-		return createNode( elementDef, parentNode, parentNode ? parentNode.ownerDocument : this.document );
-	};
-
-	var shortcuts = joey.shortcuts = {
-		"text" : "textContent",
-		"cls" : "className"
-	};
-
-	var plugins = joey.plugins = [
-		function( obj, context ) {
-			if( typeof obj === 'string' ) {
-				return context.createTextNode( obj );
-			}
-		},
-		function( obj, context ) {
-			if( "tag" in obj ) {
-				var el = context.createElement( obj.tag );
-				for( var attr in obj ) {
-					addAttr( el, attr, obj[ attr ], context );
-				}
-				return el;
-			}
-		}
-	];
-
-	function addAttr( el, attr, value, context ) {
-		attr = shortcuts[attr] || attr;
-		if( attr === 'children' ) {
-			for( var i = 0; i < value.length; i++) {
-				createNode( value[i], el, context );
-			}
-		} else if( attr === 'style' || attr === 'dataset' ) {
-			for( var prop in value ) {
-				el[ attr ][ prop ] = value[ prop ];
-			}
-		} else if( attr.indexOf("on") === 0 ) {
-			el.addEventListener( attr.substr(2), value, false );
-		} else if( value !== undefined ) {
-			el[ attr ] = value;
-		}
-	}
-
-	function createNode( obj, parent, context ) {
-		var el;
-		if( obj != null ) {
-			plugins.some( function( plug ) {
-				return ( el = plug( obj, context ) );
-			});
-			parent && parent.appendChild( el );
-			return el;
-		}
-	}
-
-}());
-
-(function($, document) {
-
-	var create = $.create = (function() {
-
-		function addAttrs( el, obj, context ) {
-			for( var attr in obj ){
-				switch( attr ) {
-				case 'tag' :
-					break;
-				case 'html' :
-					el.innerHTML = obj[ attr ];
-					break;
-				case 'css' :
-					for( var style in obj.css ) {
-						$.attr( el.style, style, obj.css[ style ] );
-					}
-					break;
-				case 'text' : case 'child' : case 'children' :
-					createNode( obj[attr], el, context );
-					break;
-				case 'cls' :
-					el.className = obj[attr];
-					break;
-				case 'data' :
-					for( var data in obj.data ) {
-						$.data( el, data, obj.data[data] );
-					}
-					break;
-				default :
-					if( attr.indexOf("on") === 0 && $.isFunction(obj[attr]) ) {
-						$.event.add( el, attr.substr(2).replace(/^[A-Z]/, function(a) { return a.toLowerCase(); }), obj[attr] );
-					} else {
-						$.attr( el, attr, obj[attr] );
-					}
-				}
-			}
-		}
-
-		function createNode(obj, parent, context) {
-			if(obj && ($.isArray(obj) || obj instanceof $)) {
-				for(var ret = [], i = 0; i < obj.length; i++) {
-					var newNode = createNode(obj[i], parent, context);
-					if(newNode) {
-						ret.push(newNode);
-					}
-				}
-				return ret;
-			}
-			var el;
-			if(typeof(obj) === 'string') {
-				el = context.createTextNode( obj );
-			} else if(!obj) {
-				return undefined;
-			} else if(obj.nodeType === 1) {
-				el = obj;
-			} else if( obj instanceof app.ui.AbstractWidget ) {
-				el = obj.el[0];
-			} else {
-				el = context.createElement( obj.tag || 'DIV' );
-				addAttrs(el, obj, context);
-			}
-			if(parent){ parent.appendChild(el); }
-			return el;
-		}
-
-		return function(elementDef, parentNode) {
-			return createNode(elementDef, parentNode, (parentNode && parentNode.ownerDocument) || document);
-		};
-		
-	})();
-	
-
-	// inject create into jquery internals so object definitions are treated as first class constructors (overrides non-public methods)
-	var clean = $.clean,
-		init = $.fn.init;
-
-	$.clean = function( elems, context, fragment, scripts ) {
-		for(var i = 0; i < elems.length; i++) {
-			if( elems[i].tag || elems[i] instanceof app.ui.AbstractWidget ) {
-				elems[i] = create( elems[i], null, context );
-			}
-		}
-		return clean( elems, context, fragment, scripts );
-	};
-
-	$.fn.init = function( selector, context, rootjQuery ) {
-		if ( selector && ( selector.tag || selector instanceof app.ui.AbstractWidget )) {
-			selector = create( selector, null, context );
-		}
-		return init.call( this, selector, context, rootjQuery );
-	};
-
-	$.fn.init.prototype = $.fn;
-
-})(jQuery, window.document);
-
-
-/*!
- * Raphael 1.5.2 - JavaScript Vector Library
- *
- * Copyright (c) 2010 Dmitry Baranovskiy (http://raphaeljs.com)
- * Licensed under the MIT (http://raphaeljs.com/license.html) license.
- * from fork at git@github.com:mobz/g.raphael.git
- */
-(function () {
-    function R() {
-        if (R.is(arguments[0], array)) {
-            var a = arguments[0],
-                cnv = create[apply](R, a.splice(0, 3 + R.is(a[0], nu))),
-                res = cnv.set();
-            for (var i = 0, ii = a[length]; i < ii; i++) {
-                var j = a[i] || {};
-                elements[has](j.type) && res[push](cnv[j.type]().attr(j));
-            }
-            return res;
-        }
-        return create[apply](R, arguments);
-    }
-    R.version = "1.5.2";
-    var separator = /[, ]+/,
-        elements = {circle: 1, rect: 1, path: 1, ellipse: 1, text: 1, image: 1},
-        formatrg = /\{(\d+)\}/g,
-        proto = "prototype",
-        has = "hasOwnProperty",
-        doc = document,
-        win = window,
-        oldRaphael = {
-            was: Object[proto][has].call(win, "Raphael"),
-            is: win.Raphael
-        },
-        Paper = function () {
-            this.customAttributes = {};
-        },
-        paperproto,
-        appendChild = "appendChild",
-        apply = "apply",
-        concat = "concat",
-        supportsTouch = "createTouch" in doc,
-        E = "",
-        S = " ",
-        Str = String,
-        split = "split",
-        events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend"[split](S),
-        touchMap = {
-            mousedown: "touchstart",
-            mousemove: "touchmove",
-            mouseup: "touchend"
-        },
-        join = "join",
-        length = "length",
-        lowerCase = Str[proto].toLowerCase,
-        math = Math,
-        mmax = math.max,
-        mmin = math.min,
-        abs = math.abs,
-        pow = math.pow,
-        PI = math.PI,
-        nu = "number",
-        string = "string",
-        array = "array",
-        toString = "toString",
-        fillString = "fill",
-        objectToString = Object[proto][toString],
-        paper = {},
-        push = "push",
-        ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i,
-        colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,
-        isnan = {"NaN": 1, "Infinity": 1, "-Infinity": 1},
-        bezierrg = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,
-        round = math.round,
-        setAttribute = "setAttribute",
-        toFloat = parseFloat,
-        toInt = parseInt,
-        ms = " progid:DXImageTransform.Microsoft",
-        upperCase = Str[proto].toUpperCase,
-        availableAttrs = {blur: 0, "clip-rect": "0 0 1e9 1e9", cursor: "default", cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
-        availableAnimAttrs = {along: "along", blur: nu, "clip-rect": "csv", cx: nu, cy: nu, fill: "colour", "fill-opacity": nu, "font-size": nu, height: nu, opacity: nu, path: "path", r: nu, rotation: "csv", rx: nu, ry: nu, scale: "csv", stroke: "colour", "stroke-opacity": nu, "stroke-width": nu, translation: "csv", width: nu, x: nu, y: nu},
-        rp = "replace",
-        animKeyFrames= /^(from|to|\d+%?)$/,
-        commaSpaces = /\s*,\s*/,
-        hsrg = {hs: 1, rg: 1},
-        p2s = /,?([achlmqrstvxz]),?/gi,
-        pathCommand = /([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,
-        pathValues = /(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,
-        radial_gradient = /^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/,
-        sortByKey = function (a, b) {
-            return a.key - b.key;
-        };
-
-    R.type = (win.SVGAngle || doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
-    if (R.type == "VML") {
-        var d = doc.createElement("div"),
-            b;
-        d.innerHTML = '<v:shape adj="1"/>';
-        b = d.firstChild;
-        b.style.behavior = "url(#default#VML)";
-        if (!(b && typeof b.adj == "object")) {
-            return R.type = null;
-        }
-        d = null;
-    }
-    R.svg = !(R.vml = R.type == "VML");
-    Paper[proto] = R[proto];
-    paperproto = Paper[proto];
-    R._id = 0;
-    R._oid = 0;
-    R.fn = {};
-    R.is = function (o, type) {
-        type = lowerCase.call(type);
-        if (type == "finite") {
-            return !isnan[has](+o);
-        }
-        return  (type == "null" && o === null) ||
-                (type == typeof o) ||
-                (type == "object" && o === Object(o)) ||
-                (type == "array" && Array.isArray && Array.isArray(o)) ||
-                objectToString.call(o).slice(8, -1).toLowerCase() == type;
-    };
-    R.angle = function (x1, y1, x2, y2, x3, y3) {
-        if (x3 == null) {
-            var x = x1 - x2,
-                y = y1 - y2;
-            if (!x && !y) {
-                return 0;
-            }
-            return ((x < 0) * 180 + math.atan(-y / -x) * 180 / PI + 360) % 360;
-        } else {
-            return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3);
-        }
-    };
-    R.rad = function (deg) {
-        return deg % 360 * PI / 180;
-    };
-    R.deg = function (rad) {
-        return rad * 180 / PI % 360;
-    };
-    R.snapTo = function (values, value, tolerance) {
-        tolerance = R.is(tolerance, "finite") ? tolerance : 10;
-        if (R.is(values, array)) {
-            var i = values.length;
-            while (i--) if (abs(values[i] - value) <= tolerance) {
-                return values[i];
-            }
-        } else {
-            values = +values;
-            var rem = value % values;
-            if (rem < tolerance) {
-                return value - rem;
-            }
-            if (rem > values - tolerance) {
-                return value - rem + values;
-            }
-        }
-        return value;
-    };
-    function createUUID() {
-        // http://www.ietf.org/rfc/rfc4122.txt
-        var s = [],
-            i = 0;
-        for (; i < 32; i++) {
-            s[i] = (~~(math.random() * 16))[toString](16);
-        }
-        s[12] = 4;  // bits 12-15 of the time_hi_and_version field to 0010
-        s[16] = ((s[16] & 3) | 8)[toString](16);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
-        return "r-" + s[join]("");
-    }
-
-    R.setWindow = function (newwin) {
-        win = newwin;
-        doc = win.document;
-    };
-    // colour utilities
-    var toHex = function (color) {
-        if (R.vml) {
-            // http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
-            var trim = /^\s+|\s+$/g;
-            var bod;
-            try {
-                var docum = new ActiveXObject("htmlfile");
-                docum.write("<body>");
-                docum.close();
-                bod = docum.body;
-            } catch(e) {
-                bod = createPopup().document.body;
-            }
-            var range = bod.createTextRange();
-            toHex = cacher(function (color) {
-                try {
-                    bod.style.color = Str(color)[rp](trim, E);
-                    var value = range.queryCommandValue("ForeColor");
-                    value = ((value & 255) << 16) | (value & 65280) | ((value & 16711680) >>> 16);
-                    return "#" + ("000000" + value[toString](16)).slice(-6);
-                } catch(e) {
-                    return "none";
-                }
-            });
-        } else {
-            var i = doc.createElement("i");
-            i.title = "Rapha\xebl Colour Picker";
-            i.style.display = "none";
-            doc.body[appendChild](i);
-            toHex = cacher(function (color) {
-                i.style.color = color;
-                return doc.defaultView.getComputedStyle(i, E).getPropertyValue("color");
-            });
-        }
-        return toHex(color);
-    },
-    hsbtoString = function () {
-        return "hsb(" + [this.h, this.s, this.b] + ")";
-    },
-    hsltoString = function () {
-        return "hsl(" + [this.h, this.s, this.l] + ")";
-    },
-    rgbtoString = function () {
-        return this.hex;
-    };
-    R.hsb2rgb = function (h, s, b, o) {
-        if (R.is(h, "object") && "h" in h && "s" in h && "b" in h) {
-            b = h.b;
-            s = h.s;
-            h = h.h;
-            o = h.o;
-        }
-        return R.hsl2rgb(h, s, b / 2, o);
-    };
-    R.hsl2rgb = function (h, s, l, o) {
-        if (R.is(h, "object") && "h" in h && "s" in h && "l" in h) {
-            l = h.l;
-            s = h.s;
-            h = h.h;
-        }
-        if (h > 1 || s > 1 || l > 1) {
-            h /= 360;
-            s /= 100;
-            l /= 100;
-        }
-        var rgb = {},
-            channels = ["r", "g", "b"],
-            t2, t1, t3, r, g, b;
-        if (!s) {
-            rgb = {
-                r: l,
-                g: l,
-                b: l
-            };
-        } else {
-            if (l < .5) {
-                t2 = l * (1 + s);
-            } else {
-                t2 = l + s - l * s;
-            }
-            t1 = 2 * l - t2;
-            for (var i = 0; i < 3; i++) {
-                t3 = h + 1 / 3 * -(i - 1);
-                t3 < 0 && t3++;
-                t3 > 1 && t3--;
-                if (t3 * 6 < 1) {
-                    rgb[channels[i]] = t1 + (t2 - t1) * 6 * t3;
-                } else if (t3 * 2 < 1) {
-                    rgb[channels[i]] = t2;
-                } else if (t3 * 3 < 2) {
-                    rgb[channels[i]] = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-                } else {
-                    rgb[channels[i]] = t1;
-                }
-            }
-        }
-        rgb.r *= 255;
-        rgb.g *= 255;
-        rgb.b *= 255;
-        rgb.hex = "#" + (16777216 | rgb.b | (rgb.g << 8) | (rgb.r << 16)).toString(16).slice(1);
-        R.is(o, "finite") && (rgb.opacity = o);
-        rgb.toString = rgbtoString;
-        return rgb;
-    };
-    R.rgb2hsb = function (red, green, blue) {
-        if (green == null && R.is(red, "object") && "r" in red && "g" in red && "b" in red) {
-            blue = red.b;
-            green = red.g;
-            red = red.r;
-        }
-        if (green == null && R.is(red, string)) {
-            var clr = R.getRGB(red);
-            red = clr.r;
-            green = clr.g;
-            blue = clr.b;
-        }
-        if (red > 1 || green > 1 || blue > 1) {
-            red /= 255;
-            green /= 255;
-            blue /= 255;
-        }
-        var max = mmax(red, green, blue),
-            min = mmin(red, green, blue),
-            hue,
-            saturation,
-            brightness = max;
-        if (min == max) {
-            return {h: 0, s: 0, b: max, toString: hsbtoString};
-        } else {
-            var delta = (max - min);
-            saturation = delta / max;
-            if (red == max) {
-                hue = (green - blue) / delta;
-            } else if (green == max) {
-                hue = 2 + ((blue - red) / delta);
-            } else {
-                hue = 4 + ((red - green) / delta);
-            }
-            hue /= 6;
-            hue < 0 && hue++;
-            hue > 1 && hue--;
-        }
-        return {h: hue, s: saturation, b: brightness, toString: hsbtoString};
-    };
-    R.rgb2hsl = function (red, green, blue) {
-        if (green == null && R.is(red, "object") && "r" in red && "g" in red && "b" in red) {
-            blue = red.b;
-            green = red.g;
-            red = red.r;
-        }
-        if (green == null && R.is(red, string)) {
-            var clr = R.getRGB(red);
-            red = clr.r;
-            green = clr.g;
-            blue = clr.b;
-        }
-        if (red > 1 || green > 1 || blue > 1) {
-            red /= 255;
-            green /= 255;
-            blue /= 255;
-        }
-        var max = mmax(red, green, blue),
-            min = mmin(red, green, blue),
-            h,
-            s,
-            l = (max + min) / 2,
-            hsl;
-        if (min == max) {
-            hsl =  {h: 0, s: 0, l: l};
-        } else {
-            var delta = max - min;
-            s = l < .5 ? delta / (max + min) : delta / (2 - max - min);
-            if (red == max) {
-                h = (green - blue) / delta;
-            } else if (green == max) {
-                h = 2 + (blue - red) / delta;
-            } else {
-                h = 4 + (red - green) / delta;
-            }
-            h /= 6;
-            h < 0 && h++;
-            h > 1 && h--;
-            hsl = {h: h, s: s, l: l};
-        }
-        hsl.toString = hsltoString;
-        return hsl;
-    };
-    R._path2string = function () {
-        return this.join(",")[rp](p2s, "$1");
-    };
-    function cacher(f, scope, postprocessor) {
-        function newf() {
-            var arg = Array[proto].slice.call(arguments, 0),
-                args = arg[join]("\u25ba"),
-                cache = newf.cache = newf.cache || {},
-                count = newf.count = newf.count || [];
-            if (cache[has](args)) {
-                return postprocessor ? postprocessor(cache[args]) : cache[args];
-            }
-            count[length] >= 1e3 && delete cache[count.shift()];
-            count[push](args);
-            cache[args] = f[apply](scope, arg);
-            return postprocessor ? postprocessor(cache[args]) : cache[args];
-        }
-        return newf;
-    }
- 
-    R.getRGB = cacher(function (colour) {
-        if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) {
-            return {r: -1, g: -1, b: -1, hex: "none", error: 1};
-        }
-        if (colour == "none") {
-            return {r: -1, g: -1, b: -1, hex: "none"};
-        }
-        !(hsrg[has](colour.toLowerCase().substring(0, 2)) || colour.charAt() == "#") && (colour = toHex(colour));
-        var res,
-            red,
-            green,
-            blue,
-            opacity,
-            t,
-            values,
-            rgb = colour.match(colourRegExp);
-        if (rgb) {
-            if (rgb[2]) {
-                blue = toInt(rgb[2].substring(5), 16);
-                green = toInt(rgb[2].substring(3, 5), 16);
-                red = toInt(rgb[2].substring(1, 3), 16);
-            }
-            if (rgb[3]) {
-                blue = toInt((t = rgb[3].charAt(3)) + t, 16);
-                green = toInt((t = rgb[3].charAt(2)) + t, 16);
-                red = toInt((t = rgb[3].charAt(1)) + t, 16);
-            }
-            if (rgb[4]) {
-                values = rgb[4][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                rgb[1].toLowerCase().slice(0, 4) == "rgba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-            }
-            if (rgb[5]) {
-                values = rgb[5][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsb2rgb(red, green, blue, opacity);
-            }
-            if (rgb[6]) {
-                values = rgb[6][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsla" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsl2rgb(red, green, blue, opacity);
-            }
-            rgb = {r: red, g: green, b: blue};
-            rgb.hex = "#" + (16777216 | blue | (green << 8) | (red << 16)).toString(16).slice(1);
-            R.is(opacity, "finite") && (rgb.opacity = opacity);
-            return rgb;
-        }
-        return {r: -1, g: -1, b: -1, hex: "none", error: 1};
-    }, R);
-    R.getColor = function (value) {
-        var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
-            rgb = this.hsb2rgb(start.h, start.s, start.b);
-        start.h += .075;
-        if (start.h > 1) {
-            start.h = 0;
-            start.s -= .2;
-            start.s <= 0 && (this.getColor.start = {h: 0, s: 1, b: start.b});
-        }
-        return rgb.hex;
-    };
-    R.getColor.reset = function () {
-        delete this.start;
-    };
-    // path utilities
-    R.parsePathString = cacher(function (pathString) {
-        if (!pathString) {
-            return null;
-        }
-        var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, q: 4, s: 4, t: 2, v: 1, z: 0},
-            data = [];
-        if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
-            data = pathClone(pathString);
-        }
-        if (!data[length]) {
-            Str(pathString)[rp](pathCommand, function (a, b, c) {
-                var params = [],
-                    name = lowerCase.call(b);
-                c[rp](pathValues, function (a, b) {
-                    b && params[push](+b);
-                });
-                if (name == "m" && params[length] > 2) {
-                    data[push]([b][concat](params.splice(0, 2)));
-                    name = "l";
-                    b = b == "m" ? "l" : "L";
-                }
-                while (params[length] >= paramCounts[name]) {
-                    data[push]([b][concat](params.splice(0, paramCounts[name])));
-                    if (!paramCounts[name]) {
-                        break;
-                    }
-                }
-            });
-        }
-        data[toString] = R._path2string;
-        return data;
-    });
-    R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-        var t1 = 1 - t,
-            x = pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
-            y = pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y,
-            mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x),
-            my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y),
-            nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x),
-            ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y),
-            ax = (1 - t) * p1x + t * c1x,
-            ay = (1 - t) * p1y + t * c1y,
-            cx = (1 - t) * c2x + t * p2x,
-            cy = (1 - t) * c2y + t * p2y,
-            alpha = (90 - math.atan((mx - nx) / (my - ny)) * 180 / PI);
-        (mx > nx || my < ny) && (alpha += 180);
-        return {x: x, y: y, m: {x: mx, y: my}, n: {x: nx, y: ny}, start: {x: ax, y: ay}, end: {x: cx, y: cy}, alpha: alpha};
-    };
-    var pathDimensions = cacher(function (path) {
-        if (!path) {
-            return {x: 0, y: 0, width: 0, height: 0};
-        }
-        path = path2curve(path);
-        var x = 0, 
-            y = 0,
-            X = [],
-            Y = [],
-            p;
-        for (var i = 0, ii = path[length]; i < ii; i++) {
-            p = path[i];
-            if (p[0] == "M") {
-                x = p[1];
-                y = p[2];
-                X[push](x);
-                Y[push](y);
-            } else {
-                var dim = curveDim(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                X = X[concat](dim.min.x, dim.max.x);
-                Y = Y[concat](dim.min.y, dim.max.y);
-                x = p[5];
-                y = p[6];
-            }
-        }
-        var xmin = mmin[apply](0, X),
-            ymin = mmin[apply](0, Y);
-        return {
-            x: xmin,
-            y: ymin,
-            width: mmax[apply](0, X) - xmin,
-            height: mmax[apply](0, Y) - ymin
-        };
-    }),
-        pathClone = function (pathArray) {
-            var res = [];
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            for (var i = 0, ii = pathArray[length]; i < ii; i++) {
-                res[i] = [];
-                for (var j = 0, jj = pathArray[i][length]; j < jj; j++) {
-                    res[i][j] = pathArray[i][j];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        },
-        pathToRelative = cacher(function (pathArray) {
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = pathArray[0][1];
-                y = pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res[push](["M", x, y]);
-            }
-            for (var i = start, ii = pathArray[length]; i < ii; i++) {
-                var r = res[i] = [],
-                    pa = pathArray[i];
-                if (pa[0] != lowerCase.call(pa[0])) {
-                    r[0] = lowerCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "a":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] - x).toFixed(3);
-                            r[7] = +(pa[7] - y).toFixed(3);
-                            break;
-                        case "v":
-                            r[1] = +(pa[1] - y).toFixed(3);
-                            break;
-                        case "m":
-                            mx = pa[1];
-                            my = pa[2];
-                        default:
-                            for (var j = 1, jj = pa[length]; j < jj; j++) {
-                                r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
-                            }
-                    }
-                } else {
-                    r = res[i] = [];
-                    if (pa[0] == "m") {
-                        mx = pa[1] + x;
-                        my = pa[2] + y;
-                    }
-                    for (var k = 0, kk = pa[length]; k < kk; k++) {
-                        res[i][k] = pa[k];
-                    }
-                }
-                var len = res[i][length];
-                switch (res[i][0]) {
-                    case "z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "h":
-                        x += +res[i][len - 1];
-                        break;
-                    case "v":
-                        y += +res[i][len - 1];
-                        break;
-                    default:
-                        x += +res[i][len - 2];
-                        y += +res[i][len - 1];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        }, 0, pathClone),
-        pathToAbsolute = cacher(function (pathArray) {
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = +pathArray[0][1];
-                y = +pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res[0] = ["M", x, y];
-            }
-            for (var i = start, ii = pathArray[length]; i < ii; i++) {
-                var r = res[i] = [],
-                    pa = pathArray[i];
-                if (pa[0] != upperCase.call(pa[0])) {
-                    r[0] = upperCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "A":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] + x);
-                            r[7] = +(pa[7] + y);
-                            break;
-                        case "V":
-                            r[1] = +pa[1] + y;
-                            break;
-                        case "H":
-                            r[1] = +pa[1] + x;
-                            break;
-                        case "M":
-                            mx = +pa[1] + x;
-                            my = +pa[2] + y;
-                        default:
-                            for (var j = 1, jj = pa[length]; j < jj; j++) {
-                                r[j] = +pa[j] + ((j % 2) ? x : y);
-                            }
-                    }
-                } else {
-                    for (var k = 0, kk = pa[length]; k < kk; k++) {
-                        res[i][k] = pa[k];
-                    }
-                }
-                switch (r[0]) {
-                    case "Z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "H":
-                        x = r[1];
-                        break;
-                    case "V":
-                        y = r[1];
-                        break;
-                    case "M":
-                        mx = res[i][res[i][length] - 2];
-                        my = res[i][res[i][length] - 1];
-                    default:
-                        x = res[i][res[i][length] - 2];
-                        y = res[i][res[i][length] - 1];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        }, null, pathClone),
-        l2c = function (x1, y1, x2, y2) {
-            return [x1, y1, x2, y2, x2, y2];
-        },
-        q2c = function (x1, y1, ax, ay, x2, y2) {
-            var _13 = 1 / 3,
-                _23 = 2 / 3;
-            return [
-                    _13 * x1 + _23 * ax,
-                    _13 * y1 + _23 * ay,
-                    _13 * x2 + _23 * ax,
-                    _13 * y2 + _23 * ay,
-                    x2,
-                    y2
-                ];
-        },
-        a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
-            // for more information of where this math came from visit:
-            // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
-            var _120 = PI * 120 / 180,
-                rad = PI / 180 * (+angle || 0),
-                res = [],
-                xy,
-                rotate = cacher(function (x, y, rad) {
-                    var X = x * math.cos(rad) - y * math.sin(rad),
-                        Y = x * math.sin(rad) + y * math.cos(rad);
-                    return {x: X, y: Y};
-                });
-            if (!recursive) {
-                xy = rotate(x1, y1, -rad);
-                x1 = xy.x;
-                y1 = xy.y;
-                xy = rotate(x2, y2, -rad);
-                x2 = xy.x;
-                y2 = xy.y;
-                var cos = math.cos(PI / 180 * angle),
-                    sin = math.sin(PI / 180 * angle),
-                    x = (x1 - x2) / 2,
-                    y = (y1 - y2) / 2;
-                var h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
-                if (h > 1) {
-                    h = math.sqrt(h);
-                    rx = h * rx;
-                    ry = h * ry;
-                }
-                var rx2 = rx * rx,
-                    ry2 = ry * ry,
-                    k = (large_arc_flag == sweep_flag ? -1 : 1) *
-                        math.sqrt(abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
-                    cx = k * rx * y / ry + (x1 + x2) / 2,
-                    cy = k * -ry * x / rx + (y1 + y2) / 2,
-                    f1 = math.asin(((y1 - cy) / ry).toFixed(9)),
-                    f2 = math.asin(((y2 - cy) / ry).toFixed(9));
-
-                f1 = x1 < cx ? PI - f1 : f1;
-                f2 = x2 < cx ? PI - f2 : f2;
-                f1 < 0 && (f1 = PI * 2 + f1);
-                f2 < 0 && (f2 = PI * 2 + f2);
-                if (sweep_flag && f1 > f2) {
-                    f1 = f1 - PI * 2;
-                }
-                if (!sweep_flag && f2 > f1) {
-                    f2 = f2 - PI * 2;
-                }
-            } else {
-                f1 = recursive[0];
-                f2 = recursive[1];
-                cx = recursive[2];
-                cy = recursive[3];
-            }
-            var df = f2 - f1;
-            if (abs(df) > _120) {
-                var f2old = f2,
-                    x2old = x2,
-                    y2old = y2;
-                f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
-                x2 = cx + rx * math.cos(f2);
-                y2 = cy + ry * math.sin(f2);
-                res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
-            }
-            df = f2 - f1;
-            var c1 = math.cos(f1),
-                s1 = math.sin(f1),
-                c2 = math.cos(f2),
-                s2 = math.sin(f2),
-                t = math.tan(df / 4),
-                hx = 4 / 3 * rx * t,
-                hy = 4 / 3 * ry * t,
-                m1 = [x1, y1],
-                m2 = [x1 + hx * s1, y1 - hy * c1],
-                m3 = [x2 + hx * s2, y2 - hy * c2],
-                m4 = [x2, y2];
-            m2[0] = 2 * m1[0] - m2[0];
-            m2[1] = 2 * m1[1] - m2[1];
-            if (recursive) {
-                return [m2, m3, m4][concat](res);
-            } else {
-                res = [m2, m3, m4][concat](res)[join]()[split](",");
-                var newres = [];
-                for (var i = 0, ii = res[length]; i < ii; i++) {
-                    newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
-                }
-                return newres;
-            }
-        },
-        findDotAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-            var t1 = 1 - t;
-            return {
-                x: pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
-                y: pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y
-            };
-        },
-        curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
-            var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
-                b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
-                c = p1x - c1x,
-                t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                y = [p1y, p2y],
-                x = [p1x, p2x],
-                dot;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
-            b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
-            c = p1y - c1y;
-            t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            return {
-                min: {x: mmin[apply](0, x), y: mmin[apply](0, y)},
-                max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
-            };
-        }),
-        path2curve = cacher(function (path, path2) {
-            var p = pathToAbsolute(path),
-                p2 = path2 && pathToAbsolute(path2),
-                attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                processPath = function (path, d) {
-                    var nx, ny;
-                    if (!path) {
-                        return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
-                    }
-                    !(path[0] in {T:1, Q:1}) && (d.qx = d.qy = null);
-                    switch (path[0]) {
-                        case "M":
-                            d.X = path[1];
-                            d.Y = path[2];
-                            break;
-                        case "A":
-                            path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
-                            break;
-                        case "S":
-                            nx = d.x + (d.x - (d.bx || d.x));
-                            ny = d.y + (d.y - (d.by || d.y));
-                            path = ["C", nx, ny][concat](path.slice(1));
-                            break;
-                        case "T":
-                            d.qx = d.x + (d.x - (d.qx || d.x));
-                            d.qy = d.y + (d.y - (d.qy || d.y));
-                            path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
-                            break;
-                        case "Q":
-                            d.qx = path[1];
-                            d.qy = path[2];
-                            path = ["C"][concat](q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
-                            break;
-                        case "L":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], path[2]));
-                            break;
-                        case "H":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], d.y));
-                            break;
-                        case "V":
-                            path = ["C"][concat](l2c(d.x, d.y, d.x, path[1]));
-                            break;
-                        case "Z":
-                            path = ["C"][concat](l2c(d.x, d.y, d.X, d.Y));
-                            break;
-                    }
-                    return path;
-                },
-                fixArc = function (pp, i) {
-                    if (pp[i][length] > 7) {
-                        pp[i].shift();
-                        var pi = pp[i];
-                        while (pi[length]) {
-                            pp.splice(i++, 0, ["C"][concat](pi.splice(0, 6)));
-                        }
-                        pp.splice(i, 1);
-                        ii = mmax(p[length], p2 && p2[length] || 0);
-                    }
-                },
-                fixM = function (path1, path2, a1, a2, i) {
-                    if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
-                        path2.splice(i, 0, ["M", a2.x, a2.y]);
-                        a1.bx = 0;
-                        a1.by = 0;
-                        a1.x = path1[i][1];
-                        a1.y = path1[i][2];
-                        ii = mmax(p[length], p2 && p2[length] || 0);
-                    }
-                };
-            for (var i = 0, ii = mmax(p[length], p2 && p2[length] || 0); i < ii; i++) {
-                p[i] = processPath(p[i], attrs);
-                fixArc(p, i);
-                p2 && (p2[i] = processPath(p2[i], attrs2));
-                p2 && fixArc(p2, i);
-                fixM(p, p2, attrs, attrs2, i);
-                fixM(p2, p, attrs2, attrs, i);
-                var seg = p[i],
-                    seg2 = p2 && p2[i],
-                    seglen = seg[length],
-                    seg2len = p2 && seg2[length];
-                attrs.x = seg[seglen - 2];
-                attrs.y = seg[seglen - 1];
-                attrs.bx = toFloat(seg[seglen - 4]) || attrs.x;
-                attrs.by = toFloat(seg[seglen - 3]) || attrs.y;
-                attrs2.bx = p2 && (toFloat(seg2[seg2len - 4]) || attrs2.x);
-                attrs2.by = p2 && (toFloat(seg2[seg2len - 3]) || attrs2.y);
-                attrs2.x = p2 && seg2[seg2len - 2];
-                attrs2.y = p2 && seg2[seg2len - 1];
-            }
-            return p2 ? [p, p2] : p;
-        }, null, pathClone),
-        parseDots = cacher(function (gradient) {
-            var dots = [];
-            for (var i = 0, ii = gradient[length]; i < ii; i++) {
-                var dot = {},
-                    par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
-                dot.color = R.getRGB(par[1]);
-                if (dot.color.error) {
-                    return null;
-                }
-                dot.color = dot.color.hex;
-                par[2] && (dot.offset = par[2] + "%");
-                dots[push](dot);
-            }
-            for (i = 1, ii = dots[length] - 1; i < ii; i++) {
-                if (!dots[i].offset) {
-                    var start = toFloat(dots[i - 1].offset || 0),
-                        end = 0;
-                    for (var j = i + 1; j < ii; j++) {
-                        if (dots[j].offset) {
-                            end = dots[j].offset;
-                            break;
-                        }
-                    }
-                    if (!end) {
-                        end = 100;
-                        j = ii;
-                    }
-                    end = toFloat(end);
-                    var d = (end - start) / (j - i + 1);
-                    for (; i < j; i++) {
-                        start += d;
-                        dots[i].offset = start + "%";
-                    }
-                }
-            }
-            return dots;
-        }),
-        getContainer = function (x, y, w, h) {
-            var container;
-            if (R.is(x, string) || R.is(x, "object")) {
-                container = R.is(x, string) ? doc.getElementById(x) : x;
-                if (container.tagName) {
-                    if (y == null) {
-                        return {
-                            container: container,
-                            width: container.style.pixelWidth || container.offsetWidth,
-                            height: container.style.pixelHeight || container.offsetHeight
-                        };
-                    } else {
-                        return {container: container, width: y, height: w};
-                    }
-                }
-            } else {
-                return {container: 1, x: x, y: y, width: w, height: h};
-            }
-        },
-        plugins = function (con, add) {
-            var that = this;
-            for (var prop in add) {
-                if (add[has](prop) && !(prop in con)) {
-                    switch (typeof add[prop]) {
-                        case "function":
-                            (function (f) {
-                                con[prop] = con === that ? f : function () { return f[apply](that, arguments); };
-                            })(add[prop]);
-                        break;
-                        case "object":
-                            con[prop] = con[prop] || {};
-                            plugins.call(this, con[prop], add[prop]);
-                        break;
-                        default:
-                            con[prop] = add[prop];
-                        break;
-                    }
-                }
-            }
-        },
-        tear = function (el, paper) {
-            el == paper.top && (paper.top = el.prev);
-            el == paper.bottom && (paper.bottom = el.next);
-            el.next && (el.next.prev = el.prev);
-            el.prev && (el.prev.next = el.next);
-        },
-        tofront = function (el, paper) {
-            if (paper.top === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = null;
-            el.prev = paper.top;
-            paper.top.next = el;
-            paper.top = el;
-        },
-        toback = function (el, paper) {
-            if (paper.bottom === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = paper.bottom;
-            el.prev = null;
-            paper.bottom.prev = el;
-            paper.bottom = el;
-        },
-        insertafter = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.top && (paper.top = el);
-            el2.next && (el2.next.prev = el);
-            el.next = el2.next;
-            el.prev = el2;
-            el2.next = el;
-        },
-        insertbefore = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.bottom && (paper.bottom = el);
-            el2.prev && (el2.prev.next = el);
-            el.prev = el2.prev;
-            el2.prev = el;
-            el.next = el2;
-        },
-        removed = function (methodname) {
-            return function () {
-                throw new Error("Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object");
-            };
-        };
-    R.pathToRelative = pathToRelative;
-    // SVG
-    if (R.svg) {
-        paperproto.svgns = "http://www.w3.org/2000/svg";
-        paperproto.xlink = "http://www.w3.org/1999/xlink";
-        round = function (num) {
-            return +num + (~~num === num) * .5;
-        };
-        var $ = function (el, attr) {
-            if (attr) {
-                for (var key in attr) {
-                    if (attr[has](key)) {
-                        el[setAttribute](key, Str(attr[key]));
-                    }
-                }
-            } else {
-                el = doc.createElementNS(paperproto.svgns, el);
-                el.style.webkitTapHighlightColor = "rgba(0,0,0,0)";
-                return el;
-            }
-        };
-        R[toString] = function () {
-            return  "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version;
-        };
-        var thePath = function (pathString, SVG) {
-            var el = $("path");
-            SVG.canvas && SVG.canvas[appendChild](el);
-            var p = new Element(el, SVG);
-            p.type = "path";
-            setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString});
-            return p;
-        };
-        var addGradientFill = function (o, gradient, SVG) {
-            var type = "linear",
-                fx = .5, fy = .5,
-                s = o.style;
-            gradient = Str(gradient)[rp](radial_gradient, function (all, _fx, _fy) {
-                type = "radial";
-                if (_fx && _fy) {
-                    fx = toFloat(_fx);
-                    fy = toFloat(_fy);
-                    var dir = ((fy > .5) * 2 - 1);
-                    pow(fx - .5, 2) + pow(fy - .5, 2) > .25 &&
-                        (fy = math.sqrt(.25 - pow(fx - .5, 2)) * dir + .5) &&
-                        fy != .5 &&
-                        (fy = fy.toFixed(5) - 1e-5 * dir);
-                }
-                return E;
-            });
-            gradient = gradient[split](/\s*\-\s*/);
-            if (type == "linear") {
-                var angle = gradient.shift();
-                angle = -toFloat(angle);
-                if (isNaN(angle)) {
-                    return null;
-                }
-                var vector = [0, 0, math.cos(angle * PI / 180), math.sin(angle * PI / 180)],
-                    max = 1 / (mmax(abs(vector[2]), abs(vector[3])) || 1);
-                vector[2] *= max;
-                vector[3] *= max;
-                if (vector[2] < 0) {
-                    vector[0] = -vector[2];
-                    vector[2] = 0;
-                }
-                if (vector[3] < 0) {
-                    vector[1] = -vector[3];
-                    vector[3] = 0;
-                }
-            }
-            var dots = parseDots(gradient);
-            if (!dots) {
-                return null;
-            }
-            var id = o.getAttribute(fillString);
-            id = id.match(/^url\(#(.*)\)$/);
-            id && SVG.defs.removeChild(doc.getElementById(id[1]));
-
-            var el = $(type + "Gradient");
-            el.id = createUUID();
-            $(el, type == "radial" ? {fx: fx, fy: fy} : {x1: vector[0], y1: vector[1], x2: vector[2], y2: vector[3]});
-            SVG.defs[appendChild](el);
-            for (var i = 0, ii = dots[length]; i < ii; i++) {
-                var stop = $("stop");
-                $(stop, {
-                    offset: dots[i].offset ? dots[i].offset : !i ? "0%" : "100%",
-                    "stop-color": dots[i].color || "#fff"
-                });
-                el[appendChild](stop);
-            }
-            $(o, {
-                fill: "url(#" + el.id + ")",
-                opacity: 1,
-                "fill-opacity": 1
-            });
-            s.fill = E;
-            s.opacity = 1;
-            s.fillOpacity = 1;
-            return 1;
-        };
-        var updatePosition = function (o) {
-            var bbox = o.getBBox();
-            $(o.pattern, {patternTransform: R.format("translate({0},{1})", bbox.x, bbox.y)});
-        };
-        var setFillAndStroke = function (o, params) {
-            var dasharray = {
-                    "": [0],
-                    "none": [0],
-                    "-": [3, 1],
-                    ".": [1, 1],
-                    "-.": [3, 1, 1, 1],
-                    "-..": [3, 1, 1, 1, 1, 1],
-                    ". ": [1, 3],
-                    "- ": [4, 3],
-                    "--": [8, 3],
-                    "- .": [4, 3, 1, 3],
-                    "--.": [8, 3, 1, 3],
-                    "--..": [8, 3, 1, 3, 1, 3]
-                },
-                node = o.node,
-                attrs = o.attrs,
-                rot = o.rotate(),
-                addDashes = function (o, value) {
-                    value = dasharray[lowerCase.call(value)];
-                    if (value) {
-                        var width = o.attrs["stroke-width"] || "1",
-                            butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
-                            dashes = [];
-                        var i = value[length];
-                        while (i--) {
-                            dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
-                        }
-                        $(node, {"stroke-dasharray": dashes[join](",")});
-                    }
-                };
-            params[has]("rotation") && (rot = params.rotation);
-            var rotxy = Str(rot)[split](separator);
-            if (!(rotxy.length - 1)) {
-                rotxy = null;
-            } else {
-                rotxy[1] = +rotxy[1];
-                rotxy[2] = +rotxy[2];
-            }
-            toFloat(rot) && o.rotate(0, true);
-            for (var att in params) {
-                if (params[has](att)) {
-                    if (!availableAttrs[has](att)) {
-                        continue;
-                    }
-                    var value = params[att];
-                    attrs[att] = value;
-                    switch (att) {
-                        case "blur":
-                            o.blur(value);
-                            break;
-                        case "rotation":
-                            o.rotate(value, true);
-                            break;
-                        case "href":
-                        case "title":
-                        case "target":
-                            var pn = node.parentNode;
-                            if (lowerCase.call(pn.tagName) != "a") {
-                                var hl = $("a");
-                                pn.insertBefore(hl, node);
-                                hl[appendChild](node);
-                                pn = hl;
-                            }
-                            if (att == "target" && value == "blank") {
-                                pn.setAttributeNS(o.paper.xlink, "show", "new");
-                            } else {
-                                pn.setAttributeNS(o.paper.xlink, att, value);
-                            }
-                            break;
-                        case "cursor":
-                            node.style.cursor = value;
-                            break;
-                        case "clip-rect":
-                            var rect = Str(value)[split](separator);
-                            if (rect[length] == 4) {
-                                o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
-                                var el = $("clipPath"),
-                                    rc = $("rect");
-                                el.id = createUUID();
-                                $(rc, {
-                                    x: rect[0],
-                                    y: rect[1],
-                                    width: rect[2],
-                                    height: rect[3]
-                                });
-                                el[appendChild](rc);
-                                o.paper.defs[appendChild](el);
-                                $(node, {"clip-path": "url(#" + el.id + ")"});
-                                o.clip = rc;
-                            }
-                            if (!value) {
-                                var clip = doc.getElementById(node.getAttribute("clip-path")[rp](/(^url\(#|\)$)/g, E));
-                                clip && clip.parentNode.removeChild(clip);
-                                $(node, {"clip-path": E});
-                                delete o.clip;
-                            }
-                        break;
-                        case "path":
-                            if (o.type == "path") {
-                                $(node, {d: value ? attrs.path = pathToAbsolute(value) : "M0,0"});
-                            }
-                            break;
-                        case "width":
-                            node[setAttribute](att, value);
-                            if (attrs.fx) {
-                                att = "x";
-                                value = attrs.x;
-                            } else {
-                                break;
-                            }
-                        case "x":
-                            if (attrs.fx) {
-                                value = -attrs.x - (attrs.width || 0);
-                            }
-                        case "rx":
-                            if (att == "rx" && o.type == "rect") {
-                                break;
-                            }
-                        case "cx":
-                            rotxy && (att == "x" || att == "cx") && (rotxy[1] += value - attrs[att]);
-                            node[setAttribute](att, value);
-                            o.pattern && updatePosition(o);
-                            break;
-                        case "height":
-                            node[setAttribute](att, value);
-                            if (attrs.fy) {
-                                att = "y";
-                                value = attrs.y;
-                            } else {
-                                break;
-                            }
-                        case "y":
-                            if (attrs.fy) {
-                                value = -attrs.y - (attrs.height || 0);
-                            }
-                        case "ry":
-                            if (att == "ry" && o.type == "rect") {
-                                break;
-                            }
-                        case "cy":
-                            rotxy && (att == "y" || att == "cy") && (rotxy[2] += value - attrs[att]);
-                            node[setAttribute](att, value);
-                            o.pattern && updatePosition(o);
-                            break;
-                        case "r":
-                            if (o.type == "rect") {
-                                $(node, {rx: value, ry: value});
-                            } else {
-                                node[setAttribute](att, value);
-                            }
-                            break;
-                        case "src":
-                            if (o.type == "image") {
-                                node.setAttributeNS(o.paper.xlink, "href", value);
-                            }
-                            break;
-                        case "stroke-width":
-                            node.style.strokeWidth = value;
-                            // Need following line for Firefox
-                            node[setAttribute](att, value);
-                            if (attrs["stroke-dasharray"]) {
-                                addDashes(o, attrs["stroke-dasharray"]);
-                            }
-                            break;
-                        case "stroke-dasharray":
-                            addDashes(o, value);
-                            break;
-                        case "translation":
-                            var xy = Str(value)[split](separator);
-                            xy[0] = +xy[0] || 0;
-                            xy[1] = +xy[1] || 0;
-                            if (rotxy) {
-                                rotxy[1] += xy[0];
-                                rotxy[2] += xy[1];
-                            }
-                            translate.call(o, xy[0], xy[1]);
-                            break;
-                        case "scale":
-                            xy = Str(value)[split](separator);
-                            o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, isNaN(toFloat(xy[2])) ? null : +xy[2], isNaN(toFloat(xy[3])) ? null : +xy[3]);
-                            break;
-                        case fillString:
-                            var isURL = Str(value).match(ISURL);
-                            if (isURL) {
-                                el = $("pattern");
-                                var ig = $("image");
-                                el.id = createUUID();
-                                $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
-                                $(ig, {x: 0, y: 0});
-                                ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
-                                el[appendChild](ig);
- 
-                                var img = doc.createElement("img");
-                                img.style.cssText = "position:absolute;left:-9999em;top-9999em";
-                                img.onload = function () {
-                                    $(el, {width: this.offsetWidth, height: this.offsetHeight});
-                                    $(ig, {width: this.offsetWidth, height: this.offsetHeight});
-                                    doc.body.removeChild(this);
-                                    o.paper.safari();
-                                };
-                                doc.body[appendChild](img);
-                                img.src = isURL[1];
-                                o.paper.defs[appendChild](el);
-                                node.style.fill = "url(#" + el.id + ")";
-                                $(node, {fill: "url(#" + el.id + ")"});
-                                o.pattern = el;
-                                o.pattern && updatePosition(o);
-                                break;
-                            }
-                            var clr = R.getRGB(value);
-                            if (!clr.error) {
-                                delete params.gradient;
-                                delete attrs.gradient;
-                                !R.is(attrs.opacity, "undefined") &&
-                                    R.is(params.opacity, "undefined") &&
-                                    $(node, {opacity: attrs.opacity});
-                                !R.is(attrs["fill-opacity"], "undefined") &&
-                                    R.is(params["fill-opacity"], "undefined") &&
-                                    $(node, {"fill-opacity": attrs["fill-opacity"]});
-                            } else if ((({circle: 1, ellipse: 1})[has](o.type) || Str(value).charAt() != "r") && addGradientFill(node, value, o.paper)) {
-                                attrs.gradient = value;
-                                attrs.fill = "none";
-                                break;
-                            }
-                            clr[has]("opacity") && $(node, {"fill-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                        case "stroke":
-                            clr = R.getRGB(value);
-                            node[setAttribute](att, clr.hex);
-                            att == "stroke" && clr[has]("opacity") && $(node, {"stroke-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                            break;
-                        case "gradient":
-                            (({circle: 1, ellipse: 1})[has](o.type) || Str(value).charAt() != "r") && addGradientFill(node, value, o.paper);
-                            break;
-                        case "opacity":
-                            if (attrs.gradient && !attrs[has]("stroke-opacity")) {
-                                $(node, {"stroke-opacity": value > 1 ? value / 100 : value});
-                            }
-                            // fall
-                        case "fill-opacity":
-                            if (attrs.gradient) {
-                                var gradient = doc.getElementById(node.getAttribute(fillString)[rp](/^url\(#|\)$/g, E));
-                                if (gradient) {
-                                    var stops = gradient.getElementsByTagName("stop");
-                                    stops[stops[length] - 1][setAttribute]("stop-opacity", value);
-                                }
-                                break;
-                            }
-                        default:
-                            att == "font-size" && (value = toInt(value, 10) + "px");
-                            var cssrule = att[rp](/(\-.)/g, function (w) {
-                                return upperCase.call(w.substring(1));
-                            });
-                            node.style[cssrule] = value;
-                            // Need following line for Firefox
-                            node[setAttribute](att, value);
-                            break;
-                    }
-                }
-            }
-            
-            tuneText(o, params);
-            if (rotxy) {
-                o.rotate(rotxy.join(S));
-            } else {
-                toFloat(rot) && o.rotate(rot, true);
-            }
-        };
-        var leading = 1.2,
-        tuneText = function (el, params) {
-            if (el.type != "text" || !(params[has]("text") || params[has]("font") || params[has]("font-size") || params[has]("x") || params[has]("y"))) {
-                return;
-            }
-            var a = el.attrs,
-                node = el.node,
-                fontSize = node.firstChild ? toInt(doc.defaultView.getComputedStyle(node.firstChild, E).getPropertyValue("font-size"), 10) : 10;
- 
-            if (params[has]("text")) {
-                a.text = params.text;
-                while (node.firstChild) {
-                    node.removeChild(node.firstChild);
-                }
-                var texts = Str(params.text)[split]("\n");
-                for (var i = 0, ii = texts[length]; i < ii; i++) if (texts[i]) {
-                    var tspan = $("tspan");
-                    i && $(tspan, {dy: fontSize * leading, x: a.x});
-                    tspan[appendChild](doc.createTextNode(texts[i]));
-                    node[appendChild](tspan);
-                }
-            } else {
-                texts = node.getElementsByTagName("tspan");
-                for (i = 0, ii = texts[length]; i < ii; i++) {
-                    i && $(texts[i], {dy: fontSize * leading, x: a.x});
-                }
-            }
-            $(node, {y: a.y});
-            var bb = el.getBBox(),
-                dif = a.y - (bb.y + bb.height / 2);
-            dif && R.is(dif, "finite") && $(node, {y: a.y + dif});
-        },
-        Element = function (node, svg) {
-            var X = 0,
-                Y = 0;
-            this[0] = node;
-            this.id = R._oid++;
-            this.node = node;
-            node.raphael = this;
-            this.paper = svg;
-            this.attrs = this.attrs || {};
-            this.transformations = []; // rotate, translate, scale
-            this._ = {
-                tx: 0,
-                ty: 0,
-                rt: {deg: 0, cx: 0, cy: 0},
-                sx: 1,
-                sy: 1
-            };
-            !svg.bottom && (svg.bottom = this);
-            this.prev = svg.top;
-            svg.top && (svg.top.next = this);
-            svg.top = this;
-            this.next = null;
-        };
-        var elproto = Element[proto];
-        Element[proto].rotate = function (deg, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            if (deg == null) {
-                if (this._.rt.cx) {
-                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy][join](S);
-                }
-                return this._.rt.deg;
-            }
-            var bbox = this.getBBox();
-            deg = Str(deg)[split](separator);
-            if (deg[length] - 1) {
-                cx = toFloat(deg[1]);
-                cy = toFloat(deg[2]);
-            }
-            deg = toFloat(deg[0]);
-            if (cx != null && cx !== false) {
-                this._.rt.deg = deg;
-            } else {
-                this._.rt.deg += deg;
-            }
-            (cy == null) && (cx = null);
-            this._.rt.cx = cx;
-            this._.rt.cy = cy;
-            cx = cx == null ? bbox.x + bbox.width / 2 : cx;
-            cy = cy == null ? bbox.y + bbox.height / 2 : cy;
-            if (this._.rt.deg) {
-                this.transformations[0] = R.format("rotate({0} {1} {2})", this._.rt.deg, cx, cy);
-                this.clip && $(this.clip, {transform: R.format("rotate({0} {1} {2})", -this._.rt.deg, cx, cy)});
-            } else {
-                this.transformations[0] = E;
-                this.clip && $(this.clip, {transform: E});
-            }
-            $(this.node, {transform: this.transformations[join](S)});
-            return this;
-        };
-        Element[proto].hide = function () {
-            !this.removed && (this.node.style.display = "none");
-            return this;
-        };
-        Element[proto].show = function () {
-            !this.removed && (this.node.style.display = "");
-            return this;
-        };
-        Element[proto].remove = function () {
-            if (this.removed) {
-                return;
-            }
-            tear(this, this.paper);
-            this.node.parentNode.removeChild(this.node);
-            for (var i in this) {
-                delete this[i];
-            }
-            this.removed = true;
-        };
-        Element[proto].getBBox = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.type == "path") {
-                return pathDimensions(this.attrs.path);
-            }
-            if (this.node.style.display == "none") {
-                this.show();
-                var hide = true;
-            }
-            var bbox = {};
-            try {
-                bbox = this.node.getBBox();
-            } catch(e) {
-                // Firefox 3.0.x plays badly here
-            } finally {
-                bbox = bbox || {};
-            }
-            if (this.type == "text") {
-                bbox = {x: bbox.x, y: Infinity, width: 0, height: 0};
-                for (var i = 0, ii = this.node.getNumberOfChars(); i < ii; i++) {
-                    var bb = this.node.getExtentOfChar(i);
-                    (bb.y < bbox.y) && (bbox.y = bb.y);
-                    (bb.y + bb.height - bbox.y > bbox.height) && (bbox.height = bb.y + bb.height - bbox.y);
-                    (bb.x + bb.width - bbox.x > bbox.width) && (bbox.width = bb.x + bb.width - bbox.x);
-                }
-            }
-            hide && this.hide();
-            return bbox;
-        };
-        Element[proto].attr = function (name, value) {
-            if (this.removed) {
-                return this;
-            }
-            if (name == null) {
-                var res = {};
-                for (var i in this.attrs) if (this.attrs[has](i)) {
-                    res[i] = this.attrs[i];
-                }
-                this._.rt.deg && (res.rotation = this.rotate());
-                (this._.sx != 1 || this._.sy != 1) && (res.scale = this.scale());
-                res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-                return res;
-            }
-            if (value == null && R.is(name, string)) {
-                if (name == "translation") {
-                    return translate.call(this);
-                }
-                if (name == "rotation") {
-                    return this.rotate();
-                }
-                if (name == "scale") {
-                    return this.scale();
-                }
-                if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
-                    return this.attrs.gradient;
-                }
-                return this.attrs[name];
-            }
-            if (value == null && R.is(name, array)) {
-                var values = {};
-                for (var j = 0, jj = name.length; j < jj; j++) {
-                    values[name[j]] = this.attr(name[j]);
-                }
-                return values;
-            }
-            if (value != null) {
-                var params = {};
-                params[name] = value;
-            } else if (name != null && R.is(name, "object")) {
-                params = name;
-            }
-            for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-                var par = this.paper.customAttributes[key].apply(this, [][concat](params[key]));
-                this.attrs[key] = params[key];
-                for (var subkey in par) if (par[has](subkey)) {
-                    params[subkey] = par[subkey];
-                }
-            }
-            setFillAndStroke(this, params);
-            return this;
-        };
-        Element[proto].toFront = function () {
-            if (this.removed) {
-                return this;
-            }
-            this.node.parentNode[appendChild](this.node);
-            var svg = this.paper;
-            svg.top != this && tofront(this, svg);
-            return this;
-        };
-        Element[proto].toBack = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.node.parentNode.firstChild != this.node) {
-                this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
-                toback(this, this.paper);
-                var svg = this.paper;
-            }
-            return this;
-        };
-        Element[proto].insertAfter = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            var node = element.node || element[element.length - 1].node;
-            if (node.nextSibling) {
-                node.parentNode.insertBefore(this.node, node.nextSibling);
-            } else {
-                node.parentNode[appendChild](this.node);
-            }
-            insertafter(this, element, this.paper);
-            return this;
-        };
-        Element[proto].insertBefore = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            var node = element.node || element[0].node;
-            node.parentNode.insertBefore(this.node, node);
-            insertbefore(this, element, this.paper);
-            return this;
-        };
-        Element[proto].blur = function (size) {
-            // Experimental. No Safari support. Use it on your own risk.
-            var t = this;
-            if (+size !== 0) {
-                var fltr = $("filter"),
-                    blur = $("feGaussianBlur");
-                t.attrs.blur = size;
-                fltr.id = createUUID();
-                $(blur, {stdDeviation: +size || 1.5});
-                fltr.appendChild(blur);
-                t.paper.defs.appendChild(fltr);
-                t._blur = fltr;
-                $(t.node, {filter: "url(#" + fltr.id + ")"});
-            } else {
-                if (t._blur) {
-                    t._blur.parentNode.removeChild(t._blur);
-                    delete t._blur;
-                    delete t.attrs.blur;
-                }
-                t.node.removeAttribute("filter");
-            }
-        };
-        var theCircle = function (svg, x, y, r) {
-            var el = $("circle");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
-            res.type = "circle";
-            $(el, res.attrs);
-            return res;
-        },
-        theRect = function (svg, x, y, w, h, r) {
-            var el = $("rect");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
-            res.type = "rect";
-            $(el, res.attrs);
-            return res;
-        },
-        theEllipse = function (svg, x, y, rx, ry) {
-            var el = $("ellipse");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
-            res.type = "ellipse";
-            $(el, res.attrs);
-            return res;
-        },
-        theImage = function (svg, src, x, y, w, h) {
-            var el = $("image");
-            $(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
-            el.setAttributeNS(svg.xlink, "href", src);
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, width: w, height: h, src: src};
-            res.type = "image";
-            return res;
-        },
-        theText = function (svg, x, y, text) {
-            var el = $("text");
-            $(el, {x: x, y: y, "text-anchor": "middle"});
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, "text-anchor": "middle", text: text, font: availableAttrs.font, stroke: "none", fill: "#000"};
-            res.type = "text";
-            setFillAndStroke(res, res.attrs);
-            return res;
-        },
-        setSize = function (width, height) {
-            this.width = width || this.width;
-            this.height = height || this.height;
-            this.canvas[setAttribute]("width", this.width);
-            this.canvas[setAttribute]("height", this.height);
-            return this;
-        },
-        create = function () {
-            var con = getContainer[apply](0, arguments),
-                container = con && con.container,
-                x = con.x,
-                y = con.y,
-                width = con.width,
-                height = con.height;
-            if (!container) {
-                throw new Error("SVG container not found.");
-            }
-            var cnvs = $("svg");
-            x = x || 0;
-            y = y || 0;
-            width = width || 512;
-            height = height || 342;
-            $(cnvs, {
-                xmlns: "http://www.w3.org/2000/svg",
-                version: 1.1,
-                width: width,
-                height: height
-            });
-            if (container == 1) {
-                cnvs.style.cssText = "position:absolute;left:" + x + "px;top:" + y + "px";
-                doc.body[appendChild](cnvs);
-            } else {
-                if (container.firstChild) {
-                    container.insertBefore(cnvs, container.firstChild);
-                } else {
-                    container[appendChild](cnvs);
-                }
-            }
-            container = new Paper;
-            container.width = width;
-            container.height = height;
-            container.canvas = cnvs;
-            plugins.call(container, container, R.fn);
-            container.clear();
-            return container;
-        };
-        paperproto.clear = function () {
-            var c = this.canvas;
-            while (c.firstChild) {
-                c.removeChild(c.firstChild);
-            }
-            this.bottom = this.top = null;
-            (this.desc = $("desc"))[appendChild](doc.createTextNode("Created with Rapha\xebl"));
-            c[appendChild](this.desc);
-            c[appendChild](this.defs = $("defs"));
-        };
-        paperproto.remove = function () {
-            this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
-            for (var i in this) {
-                this[i] = removed(i);
-            }
-        };
-    }
-
-    // VML
-    if (R.vml) {
-        var map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
-            bites = /([clmz]),?([^clmz]*)/gi,
-            blurregexp = / progid:\S+Blur\([^\)]+\)/g,
-            val = /-?[^,\s-]+/g,
-            coordsize = 1e3 + S + 1e3,
-            zoom = 10,
-            pathlike = {path: 1, rect: 1},
-            path2vml = function (path) {
-                var total =  /[ahqstv]/ig,
-                    command = pathToAbsolute;
-                Str(path).match(total) && (command = path2curve);
-                total = /[clmz]/g;
-                if (command == pathToAbsolute && !Str(path).match(total)) {
-                    var res = Str(path)[rp](bites, function (all, command, args) {
-                        var vals = [],
-                            isMove = lowerCase.call(command) == "m",
-                            res = map[command];
-                        args[rp](val, function (value) {
-                            if (isMove && vals[length] == 2) {
-                                res += vals + map[command == "m" ? "l" : "L"];
-                                vals = [];
-                            }
-                            vals[push](round(value * zoom));
-                        });
-                        return res + vals;
-                    });
-                    return res;
-                }
-                var pa = command(path), p, r;
-                res = [];
-                for (var i = 0, ii = pa[length]; i < ii; i++) {
-                    p = pa[i];
-                    r = lowerCase.call(pa[i][0]);
-                    r == "z" && (r = "x");
-                    for (var j = 1, jj = p[length]; j < jj; j++) {
-                        r += round(p[j] * zoom) + (j != jj - 1 ? "," : E);
-                    }
-                    res[push](r);
-                }
-                return res[join](S);
-            };
-        
-        R[toString] = function () {
-            return  "Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl " + this.version;
-        };
-        thePath = function (pathString, vml) {
-            var g = createNode("group");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = vml.coordsize;
-            g.coordorigin = vml.coordorigin;
-            var el = createNode("shape"), ol = el.style;
-            ol.width = vml.width + "px";
-            ol.height = vml.height + "px";
-            el.coordsize = coordsize;
-            el.coordorigin = vml.coordorigin;
-            g[appendChild](el);
-            var p = new Element(el, g, vml),
-                attr = {fill: "none", stroke: "#000"};
-            pathString && (attr.path = pathString);
-            p.type = "path";
-            p.path = [];
-            p.Path = E;
-            setFillAndStroke(p, attr);
-            vml.canvas[appendChild](g);
-            return p;
-        };
-        setFillAndStroke = function (o, params) {
-            o.attrs = o.attrs || {};
-            var node = o.node,
-                a = o.attrs,
-                s = node.style,
-                xy,
-                newpath = (params.x != a.x || params.y != a.y || params.width != a.width || params.height != a.height || params.r != a.r) && o.type == "rect",
-                res = o;
-
-            for (var par in params) if (params[has](par)) {
-                a[par] = params[par];
-            }
-            if (newpath) {
-                a.path = rectPath(a.x, a.y, a.width, a.height, a.r);
-                o.X = a.x;
-                o.Y = a.y;
-                o.W = a.width;
-                o.H = a.height;
-            }
-            params.href && (node.href = params.href);
-            params.title && (node.title = params.title);
-            params.target && (node.target = params.target);
-            params.cursor && (s.cursor = params.cursor);
-            "blur" in params && o.blur(params.blur);
-            if (params.path && o.type == "path" || newpath) {
-                node.path = path2vml(a.path);
-            }
-            if (params.rotation != null) {
-                o.rotate(params.rotation, true);
-            }
-            if (params.translation) {
-                xy = Str(params.translation)[split](separator);
-                translate.call(o, xy[0], xy[1]);
-                if (o._.rt.cx != null) {
-                    o._.rt.cx +=+ xy[0];
-                    o._.rt.cy +=+ xy[1];
-                    o.setBox(o.attrs, xy[0], xy[1]);
-                }
-            }
-            if (params.scale) {
-                xy = Str(params.scale)[split](separator);
-                o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
-            }
-            if ("clip-rect" in params) {
-                var rect = Str(params["clip-rect"])[split](separator);
-                if (rect[length] == 4) {
-                    rect[2] = +rect[2] + (+rect[0]);
-                    rect[3] = +rect[3] + (+rect[1]);
-                    var div = node.clipRect || doc.createElement("div"),
-                        dstyle = div.style,
-                        group = node.parentNode;
-                    dstyle.clip = R.format("rect({1}px {2}px {3}px {0}px)", rect);
-                    if (!node.clipRect) {
-                        dstyle.position = "absolute";
-                        dstyle.top = 0;
-                        dstyle.left = 0;
-                        dstyle.width = o.paper.width + "px";
-                        dstyle.height = o.paper.height + "px";
-                        group.parentNode.insertBefore(div, group);
-                        div[appendChild](group);
-                        node.clipRect = div;
-                    }
-                }
-                if (!params["clip-rect"]) {
-                    node.clipRect && (node.clipRect.style.clip = E);
-                }
-            }
-            if (o.type == "image" && params.src) {
-                node.src = params.src;
-            }
-            if (o.type == "image" && params.opacity) {
-                node.filterOpacity = ms + ".Alpha(opacity=" + (params.opacity * 100) + ")";
-                s.filter = (node.filterMatrix || E) + (node.filterOpacity || E);
-            }
-            params.font && (s.font = params.font);
-            params["font-family"] && (s.fontFamily = '"' + params["font-family"][split](",")[0][rp](/^['"]+|['"]+$/g, E) + '"');
-            params["font-size"] && (s.fontSize = params["font-size"]);
-            params["font-weight"] && (s.fontWeight = params["font-weight"]);
-            params["font-style"] && (s.fontStyle = params["font-style"]);
-            if (params.opacity != null || 
-                params["stroke-width"] != null ||
-                params.fill != null ||
-                params.stroke != null ||
-                params["stroke-width"] != null ||
-                params["stroke-opacity"] != null ||
-                params["fill-opacity"] != null ||
-                params["stroke-dasharray"] != null ||
-                params["stroke-miterlimit"] != null ||
-                params["stroke-linejoin"] != null ||
-                params["stroke-linecap"] != null) {
-                node = o.shape || node;
-                var fill = (node.getElementsByTagName(fillString) && node.getElementsByTagName(fillString)[0]),
-                    newfill = false;
-                !fill && (newfill = fill = createNode(fillString));
-                if ("fill-opacity" in params || "opacity" in params) {
-                    var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+R.getRGB(params.fill).o + 1 || 2) - 1);
-                    opacity = mmin(mmax(opacity, 0), 1);
-                    fill.opacity = opacity;
-                }
-                params.fill && (fill.on = true);
-                if (fill.on == null || params.fill == "none") {
-                    fill.on = false;
-                }
-                if (fill.on && params.fill) {
-                    var isURL = params.fill.match(ISURL);
-                    if (isURL) {
-                        fill.src = isURL[1];
-                        fill.type = "tile";
-                    } else {
-                        fill.color = R.getRGB(params.fill).hex;
-                        fill.src = E;
-                        fill.type = "solid";
-                        if (R.getRGB(params.fill).error && (res.type in {circle: 1, ellipse: 1} || Str(params.fill).charAt() != "r") && addGradientFill(res, params.fill)) {
-                            a.fill = "none";
-                            a.gradient = params.fill;
-                        }
-                    }
-                }
-                newfill && node[appendChild](fill);
-                var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
-                newstroke = false;
-                !stroke && (newstroke = stroke = createNode("stroke"));
-                if ((params.stroke && params.stroke != "none") ||
-                    params["stroke-width"] ||
-                    params["stroke-opacity"] != null ||
-                    params["stroke-dasharray"] ||
-                    params["stroke-miterlimit"] ||
-                    params["stroke-linejoin"] ||
-                    params["stroke-linecap"]) {
-                    stroke.on = true;
-                }
-                (params.stroke == "none" || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
-                var strokeColor = R.getRGB(params.stroke);
-                stroke.on && params.stroke && (stroke.color = strokeColor.hex);
-                opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+strokeColor.o + 1 || 2) - 1);
-                var width = (toFloat(params["stroke-width"]) || 1) * .75;
-                opacity = mmin(mmax(opacity, 0), 1);
-                params["stroke-width"] == null && (width = a["stroke-width"]);
-                params["stroke-width"] && (stroke.weight = width);
-                width && width < 1 && (opacity *= width) && (stroke.weight = 1);
-                stroke.opacity = opacity;
-                
-                params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
-                stroke.miterlimit = params["stroke-miterlimit"] || 8;
-                params["stroke-linecap"] && (stroke.endcap = params["stroke-linecap"] == "butt" ? "flat" : params["stroke-linecap"] == "square" ? "square" : "round");
-                if (params["stroke-dasharray"]) {
-                    var dasharray = {
-                        "-": "shortdash",
-                        ".": "shortdot",
-                        "-.": "shortdashdot",
-                        "-..": "shortdashdotdot",
-                        ". ": "dot",
-                        "- ": "dash",
-                        "--": "longdash",
-                        "- .": "dashdot",
-                        "--.": "longdashdot",
-                        "--..": "longdashdotdot"
-                    };
-                    stroke.dashstyle = dasharray[has](params["stroke-dasharray"]) ? dasharray[params["stroke-dasharray"]] : E;
-                }
-                newstroke && node[appendChild](stroke);
-            }
-            if (res.type == "text") {
-                s = res.paper.span.style;
-                a.font && (s.font = a.font);
-                a["font-family"] && (s.fontFamily = a["font-family"]);
-                a["font-size"] && (s.fontSize = a["font-size"]);
-                a["font-weight"] && (s.fontWeight = a["font-weight"]);
-                a["font-style"] && (s.fontStyle = a["font-style"]);
-                res.node.string && (res.paper.span.innerHTML = Str(res.node.string)[rp](/</g, "&#60;")[rp](/&/g, "&#38;")[rp](/\n/g, "<br>"));
-                res.W = a.w = res.paper.span.offsetWidth;
-                res.H = a.h = res.paper.span.offsetHeight;
-                res.X = a.x;
-                res.Y = a.y + round(res.H / 2);
- 
-                // text-anchor emulationm
-                switch (a["text-anchor"]) {
-                    case "start":
-                        res.node.style["v-text-align"] = "left";
-                        res.bbx = round(res.W / 2);
-                    break;
-                    case "end":
-                        res.node.style["v-text-align"] = "right";
-                        res.bbx = -round(res.W / 2);
-                    break;
-                    default:
-                        res.node.style["v-text-align"] = "center";
-                    break;
-                }
-            }
-        };
-        addGradientFill = function (o, gradient) {
-            o.attrs = o.attrs || {};
-            var attrs = o.attrs,
-                fill,
-                type = "linear",
-                fxfy = ".5 .5";
-            o.attrs.gradient = gradient;
-            gradient = Str(gradient)[rp](radial_gradient, function (all, fx, fy) {
-                type = "radial";
-                if (fx && fy) {
-                    fx = toFloat(fx);
-                    fy = toFloat(fy);
-                    pow(fx - .5, 2) + pow(fy - .5, 2) > .25 && (fy = math.sqrt(.25 - pow(fx - .5, 2)) * ((fy > .5) * 2 - 1) + .5);
-                    fxfy = fx + S + fy;
-                }
-                return E;
-            });
-            gradient = gradient[split](/\s*\-\s*/);
-            if (type == "linear") {
-                var angle = gradient.shift();
-                angle = -toFloat(angle);
-                if (isNaN(angle)) {
-                    return null;
-                }
-            }
-            var dots = parseDots(gradient);
-            if (!dots) {
-                return null;
-            }
-            o = o.shape || o.node;
-            fill = o.getElementsByTagName(fillString)[0] || createNode(fillString);
-            !fill.parentNode && o.appendChild(fill);
-            if (dots[length]) {
-                fill.on = true;
-                fill.method = "none";
-                fill.color = dots[0].color;
-                fill.color2 = dots[dots[length] - 1].color;
-                var clrs = [];
-                for (var i = 0, ii = dots[length]; i < ii; i++) {
-                    dots[i].offset && clrs[push](dots[i].offset + S + dots[i].color);
-                }
-                fill.colors && (fill.colors.value = clrs[length] ? clrs[join]() : "0% " + fill.color);
-                if (type == "radial") {
-                    fill.type = "gradientradial";
-                    fill.focus = "100%";
-                    fill.focussize = fxfy;
-                    fill.focusposition = fxfy;
-                } else {
-                    fill.type = "gradient";
-                    fill.angle = (270 - angle) % 360;
-                }
-            }
-            return 1;
-        };
-        Element = function (node, group, vml) {
-            var Rotation = 0,
-                RotX = 0,
-                RotY = 0,
-                Scale = 1;
-            this[0] = node;
-            this.id = R._oid++;
-            this.node = node;
-            node.raphael = this;
-            this.X = 0;
-            this.Y = 0;
-            this.attrs = {};
-            this.Group = group;
-            this.paper = vml;
-            this._ = {
-                tx: 0,
-                ty: 0,
-                rt: {deg:0},
-                sx: 1,
-                sy: 1
-            };
-            !vml.bottom && (vml.bottom = this);
-            this.prev = vml.top;
-            vml.top && (vml.top.next = this);
-            vml.top = this;
-            this.next = null;
-        };
-        elproto = Element[proto];
-        elproto.rotate = function (deg, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            if (deg == null) {
-                if (this._.rt.cx) {
-                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy][join](S);
-                }
-                return this._.rt.deg;
-            }
-            deg = Str(deg)[split](separator);
-            if (deg[length] - 1) {
-                cx = toFloat(deg[1]);
-                cy = toFloat(deg[2]);
-            }
-            deg = toFloat(deg[0]);
-            if (cx != null) {
-                this._.rt.deg = deg;
-            } else {
-                this._.rt.deg += deg;
-            }
-            cy == null && (cx = null);
-            this._.rt.cx = cx;
-            this._.rt.cy = cy;
-            this.setBox(this.attrs, cx, cy);
-            this.Group.style.rotation = this._.rt.deg;
-            // gradient fix for rotation. TODO
-            // var fill = (this.shape || this.node).getElementsByTagName(fillString);
-            // fill = fill[0] || {};
-            // var b = ((360 - this._.rt.deg) - 270) % 360;
-            // !R.is(fill.angle, "undefined") && (fill.angle = b);
-            return this;
-        };
-        elproto.setBox = function (params, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            var gs = this.Group.style,
-                os = (this.shape && this.shape.style) || this.node.style;
-            params = params || {};
-            for (var i in params) if (params[has](i)) {
-                this.attrs[i] = params[i];
-            }
-            cx = cx || this._.rt.cx;
-            cy = cy || this._.rt.cy;
-            var attr = this.attrs,
-                x,
-                y,
-                w,
-                h;
-            switch (this.type) {
-                case "circle":
-                    x = attr.cx - attr.r;
-                    y = attr.cy - attr.r;
-                    w = h = attr.r * 2;
-                    break;
-                case "ellipse":
-                    x = attr.cx - attr.rx;
-                    y = attr.cy - attr.ry;
-                    w = attr.rx * 2;
-                    h = attr.ry * 2;
-                    break;
-                case "image":
-                    x = +attr.x;
-                    y = +attr.y;
-                    w = attr.width || 0;
-                    h = attr.height || 0;
-                    break;
-                case "text":
-                    this.textpath.v = ["m", round(attr.x), ", ", round(attr.y - 2), "l", round(attr.x) + 1, ", ", round(attr.y - 2)][join](E);
-                    x = attr.x - round(this.W / 2);
-                    y = attr.y - this.H / 2;
-                    w = this.W;
-                    h = this.H;
-                    break;
-                case "rect":
-                case "path":
-                    if (!this.attrs.path) {
-                        x = 0;
-                        y = 0;
-                        w = this.paper.width;
-                        h = this.paper.height;
-                    } else {
-                        var dim = pathDimensions(this.attrs.path);
-                        x = dim.x;
-                        y = dim.y;
-                        w = dim.width;
-                        h = dim.height;
-                    }
-                    break;
-                default:
-                    x = 0;
-                    y = 0;
-                    w = this.paper.width;
-                    h = this.paper.height;
-                    break;
-            }
-            cx = (cx == null) ? x + w / 2 : cx;
-            cy = (cy == null) ? y + h / 2 : cy;
-            var left = cx - this.paper.width / 2,
-                top = cy - this.paper.height / 2, t;
-            gs.left != (t = left + "px") && (gs.left = t);
-            gs.top != (t = top + "px") && (gs.top = t);
-            this.X = pathlike[has](this.type) ? -left : x;
-            this.Y = pathlike[has](this.type) ? -top : y;
-            this.W = w;
-            this.H = h;
-            if (pathlike[has](this.type)) {
-                os.left != (t = -left * zoom + "px") && (os.left = t);
-                os.top != (t = -top * zoom + "px") && (os.top = t);
-            } else if (this.type == "text") {
-                os.left != (t = -left + "px") && (os.left = t);
-                os.top != (t = -top + "px") && (os.top = t);
-            } else {
-                gs.width != (t = this.paper.width + "px") && (gs.width = t);
-                gs.height != (t = this.paper.height + "px") && (gs.height = t);
-                os.left != (t = x - left + "px") && (os.left = t);
-                os.top != (t = y - top + "px") && (os.top = t);
-                os.width != (t = w + "px") && (os.width = t);
-                os.height != (t = h + "px") && (os.height = t);
-            }
-        };
-        elproto.hide = function () {
-            !this.removed && (this.Group.style.display = "none");
-            return this;
-        };
-        elproto.show = function () {
-            !this.removed && (this.Group.style.display = "block");
-            return this;
-        };
-        elproto.getBBox = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (pathlike[has](this.type)) {
-                return pathDimensions(this.attrs.path);
-            }
-            return {
-                x: this.X + (this.bbx || 0),
-                y: this.Y,
-                width: this.W,
-                height: this.H
-            };
-        };
-        elproto.remove = function () {
-            if (this.removed) {
-                return;
-            }
-            tear(this, this.paper);
-            this.node.parentNode.removeChild(this.node);
-            this.Group.parentNode.removeChild(this.Group);
-            this.shape && this.shape.parentNode.removeChild(this.shape);
-            for (var i in this) {
-                delete this[i];
-            }
-            this.removed = true;
-        };
-        elproto.attr = function (name, value) {
-            if (this.removed) {
-                return this;
-            }
-            if (name == null) {
-                var res = {};
-                for (var i in this.attrs) if (this.attrs[has](i)) {
-                    res[i] = this.attrs[i];
-                }
-                this._.rt.deg && (res.rotation = this.rotate());
-                (this._.sx != 1 || this._.sy != 1) && (res.scale = this.scale());
-                res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-                return res;
-            }
-            if (value == null && R.is(name, "string")) {
-                if (name == "translation") {
-                    return translate.call(this);
-                }
-                if (name == "rotation") {
-                    return this.rotate();
-                }
-                if (name == "scale") {
-                    return this.scale();
-                }
-                if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
-                    return this.attrs.gradient;
-                }
-                return this.attrs[name];
-            }
-            if (this.attrs && value == null && R.is(name, array)) {
-                var ii, values = {};
-                for (i = 0, ii = name[length]; i < ii; i++) {
-                    values[name[i]] = this.attr(name[i]);
-                }
-                return values;
-            }
-            var params;
-            if (value != null) {
-                params = {};
-                params[name] = value;
-            }
-            value == null && R.is(name, "object") && (params = name);
-            if (params) {
-                for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-                    var par = this.paper.customAttributes[key].apply(this, [][concat](params[key]));
-                    this.attrs[key] = params[key];
-                    for (var subkey in par) if (par[has](subkey)) {
-                        params[subkey] = par[subkey];
-                    }
-                }
-                if (params.text && this.type == "text") {
-                    this.node.string = params.text;
-                }
-                setFillAndStroke(this, params);
-                if (params.gradient && (({circle: 1, ellipse: 1})[has](this.type) || Str(params.gradient).charAt() != "r")) {
-                    addGradientFill(this, params.gradient);
-                }
-                (!pathlike[has](this.type) || this._.rt.deg) && this.setBox(this.attrs);
-            }
-            return this;
-        };
-        elproto.toFront = function () {
-            !this.removed && this.Group.parentNode[appendChild](this.Group);
-            this.paper.top != this && tofront(this, this.paper);
-            return this;
-        };
-        elproto.toBack = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.Group.parentNode.firstChild != this.Group) {
-                this.Group.parentNode.insertBefore(this.Group, this.Group.parentNode.firstChild);
-                toback(this, this.paper);
-            }
-            return this;
-        };
-        elproto.insertAfter = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            if (element.constructor == Set) {
-                element = element[element.length - 1];
-            }
-            if (element.Group.nextSibling) {
-                element.Group.parentNode.insertBefore(this.Group, element.Group.nextSibling);
-            } else {
-                element.Group.parentNode[appendChild](this.Group);
-            }
-            insertafter(this, element, this.paper);
-            return this;
-        };
-        elproto.insertBefore = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            if (element.constructor == Set) {
-                element = element[0];
-            }
-            element.Group.parentNode.insertBefore(this.Group, element.Group);
-            insertbefore(this, element, this.paper);
-            return this;
-        };
-        elproto.blur = function (size) {
-            var s = this.node.runtimeStyle,
-                f = s.filter;
-            f = f.replace(blurregexp, E);
-            if (+size !== 0) {
-                this.attrs.blur = size;
-                s.filter = f + S + ms + ".Blur(pixelradius=" + (+size || 1.5) + ")";
-                s.margin = R.format("-{0}px 0 0 -{0}px", round(+size || 1.5));
-            } else {
-                s.filter = f;
-                s.margin = 0;
-                delete this.attrs.blur;
-            }
-        };
- 
-        theCircle = function (vml, x, y, r) {
-            var g = createNode("group"),
-                o = createNode("oval"),
-                ol = o.style;
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "circle";
-            setFillAndStroke(res, {stroke: "#000", fill: "none"});
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.r = r;
-            res.setBox({x: x - r, y: y - r, width: r * 2, height: r * 2});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        function rectPath(x, y, w, h, r) {
-            if (r) {
-                return R.format("M{0},{1}l{2},0a{3},{3},0,0,1,{3},{3}l0,{5}a{3},{3},0,0,1,{4},{3}l{6},0a{3},{3},0,0,1,{4},{4}l0,{7}a{3},{3},0,0,1,{3},{4}z", x + r, y, w - r * 2, r, -r, h - r * 2, r * 2 - w, r * 2 - h);
-            } else {
-                return R.format("M{0},{1}l{2},0,0,{3},{4},0z", x, y, w, h, -w);
-            }
-        }
-        theRect = function (vml, x, y, w, h, r) {
-            var path = rectPath(x, y, w, h, r),
-                res = vml.path(path),
-                a = res.attrs;
-            res.X = a.x = x;
-            res.Y = a.y = y;
-            res.W = a.width = w;
-            res.H = a.height = h;
-            a.r = r;
-            a.path = path;
-            res.type = "rect";
-            return res;
-        };
-        theEllipse = function (vml, x, y, rx, ry) {
-            var g = createNode("group"),
-                o = createNode("oval"),
-                ol = o.style;
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "ellipse";
-            setFillAndStroke(res, {stroke: "#000"});
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.rx = rx;
-            res.attrs.ry = ry;
-            res.setBox({x: x - rx, y: y - ry, width: rx * 2, height: ry * 2});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        theImage = function (vml, src, x, y, w, h) {
-            var g = createNode("group"),
-                o = createNode("image");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            o.src = src;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "image";
-            res.attrs.src = src;
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.w = w;
-            res.attrs.h = h;
-            res.setBox({x: x, y: y, width: w, height: h});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        theText = function (vml, x, y, text) {
-            var g = createNode("group"),
-                el = createNode("shape"),
-                ol = el.style,
-                path = createNode("path"),
-                ps = path.style,
-                o = createNode("textpath");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            path.v = R.format("m{0},{1}l{2},{1}", round(x * 10), round(y * 10), round(x * 10) + 1);
-            path.textpathok = true;
-            ol.width = vml.width;
-            ol.height = vml.height;
-            o.string = Str(text);
-            o.on = true;
-            el[appendChild](o);
-            el[appendChild](path);
-            g[appendChild](el);
-            var res = new Element(o, g, vml);
-            res.shape = el;
-            res.textpath = path;
-            res.type = "text";
-            res.attrs.text = text;
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.w = 1;
-            res.attrs.h = 1;
-            setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000"});
-            res.setBox();
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        setSize = function (width, height) {
-            var cs = this.canvas.style;
-            width == +width && (width += "px");
-            height == +height && (height += "px");
-            cs.width = width;
-            cs.height = height;
-            cs.clip = "rect(0 " + width + " " + height + " 0)";
-            return this;
-        };
-        var createNode;
-        doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-        try {
-            !doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-            createNode = function (tagName) {
-                return doc.createElement('<rvml:' + tagName + ' class="rvml">');
-            };
-        } catch (e) {
-            createNode = function (tagName) {
-                return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-            };
-        }
-        create = function () {
-            var con = getContainer[apply](0, arguments),
-                container = con.container,
-                height = con.height,
-                s,
-                width = con.width,
-                x = con.x,
-                y = con.y;
-            if (!container) {
-                throw new Error("VML container not found.");
-            }
-            var res = new Paper,
-                c = res.canvas = doc.createElement("div"),
-                cs = c.style;
-            x = x || 0;
-            y = y || 0;
-            width = width || 512;
-            height = height || 342;
-            width == +width && (width += "px");
-            height == +height && (height += "px");
-            res.width = 1e3;
-            res.height = 1e3;
-            res.coordsize = zoom * 1e3 + S + zoom * 1e3;
-            res.coordorigin = "0 0";
-            res.span = doc.createElement("span");
-            res.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
-            c[appendChild](res.span);
-            cs.cssText = R.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden", width, height);
-            if (container == 1) {
-                doc.body[appendChild](c);
-                cs.left = x + "px";
-                cs.top = y + "px";
-                cs.position = "absolute";
-            } else {
-                if (container.firstChild) {
-                    container.insertBefore(c, container.firstChild);
-                } else {
-                    container[appendChild](c);
-                }
-            }
-            plugins.call(res, res, R.fn);
-            return res;
-        };
-        paperproto.clear = function () {
-            this.canvas.innerHTML = E;
-            this.span = doc.createElement("span");
-            this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
-            this.canvas[appendChild](this.span);
-            this.bottom = this.top = null;
-        };
-        paperproto.remove = function () {
-            this.canvas.parentNode.removeChild(this.canvas);
-            for (var i in this) {
-                this[i] = removed(i);
-            }
-            return true;
-        };
-    }
- 
-    // rest
-    // WebKit rendering bug workaround method
-    var version = navigator.userAgent.match(/Version\/(.*?)\s/);
-    if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP")) {
-        paperproto.safari = function () {
-            var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"});
-            win.setTimeout(function () {rect.remove();});
-        };
-    } else {
-        paperproto.safari = function () {};
-    }
- 
-    // Events
-    var preventDefault = function () {
-        this.returnValue = false;
-    },
-    preventTouch = function () {
-        return this.originalEvent.preventDefault();
-    },
-    stopPropagation = function () {
-        this.cancelBubble = true;
-    },
-    stopTouch = function () {
-        return this.originalEvent.stopPropagation();
-    },
-    addEvent = (function () {
-        if (doc.addEventListener) {
-            return function (obj, type, fn, element) {
-                var realName = supportsTouch && touchMap[type] ? touchMap[type] : type;
-                var f = function (e) {
-                    if (supportsTouch && touchMap[has](type)) {
-                        for (var i = 0, ii = e.targetTouches && e.targetTouches.length; i < ii; i++) {
-                            if (e.targetTouches[i].target == obj) {
-                                var olde = e;
-                                e = e.targetTouches[i];
-                                e.originalEvent = olde;
-                                e.preventDefault = preventTouch;
-                                e.stopPropagation = stopTouch;
-                                break;
-                            }
-                        }
-                    }
-                    return fn.call(element, e);
-                };
-                obj.addEventListener(realName, f, false);
-                return function () {
-                    obj.removeEventListener(realName, f, false);
-                    return true;
-                };
-            };
-        } else if (doc.attachEvent) {
-            return function (obj, type, fn, element) {
-                var f = function (e) {
-                    e = e || win.event;
-                    e.preventDefault = e.preventDefault || preventDefault;
-                    e.stopPropagation = e.stopPropagation || stopPropagation;
-                    return fn.call(element, e);
-                };
-                obj.attachEvent("on" + type, f);
-                var detacher = function () {
-                    obj.detachEvent("on" + type, f);
-                    return true;
-                };
-                return detacher;
-            };
-        }
-    })(),
-    drag = [],
-    dragMove = function (e) {
-        var x = e.clientX,
-            y = e.clientY,
-            scrollY = doc.documentElement.scrollTop || doc.body.scrollTop,
-            scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft,
-            dragi,
-            j = drag.length;
-        while (j--) {
-            dragi = drag[j];
-            if (supportsTouch) {
-                var i = e.touches.length,
-                    touch;
-                while (i--) {
-                    touch = e.touches[i];
-                    if (touch.identifier == dragi.el._drag.id) {
-                        x = touch.clientX;
-                        y = touch.clientY;
-                        (e.originalEvent ? e.originalEvent : e).preventDefault();
-                        break;
-                    }
-                }
-            } else {
-                e.preventDefault();
-            }
-            x += scrollX;
-            y += scrollY;
-            dragi.move && dragi.move.call(dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
-        }
-    },
-    dragUp = function (e) {
-        R.unmousemove(dragMove).unmouseup(dragUp);
-        var i = drag.length,
-            dragi;
-        while (i--) {
-            dragi = drag[i];
-            dragi.el._drag = {};
-            dragi.end && dragi.end.call(dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
-        }
-        drag = [];
-    };
-    for (var i = events[length]; i--;) {
-        (function (eventName) {
-            R[eventName] = Element[proto][eventName] = function (fn, scope) {
-                if (R.is(fn, "function")) {
-                    this.events = this.events || [];
-                    this.events.push({name: eventName, f: fn, unbind: addEvent(this.shape || this.node || doc, eventName, fn, scope || this)});
-                }
-                return this;
-            };
-            R["un" + eventName] = Element[proto]["un" + eventName] = function (fn) {
-                var events = this.events,
-                    l = events[length];
-                while (l--) if (events[l].name == eventName && events[l].f == fn) {
-                    events[l].unbind();
-                    events.splice(l, 1);
-                    !events.length && delete this.events;
-                    return this;
-                }
-                return this;
-            };
-        })(events[i]);
-    }
-    elproto.hover = function (f_in, f_out, scope_in, scope_out) {
-        return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in);
-    };
-    elproto.unhover = function (f_in, f_out) {
-        return this.unmouseover(f_in).unmouseout(f_out);
-    };
-    elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) {
-        this._drag = {};
-        this.mousedown(function (e) {
-            (e.originalEvent || e).preventDefault();
-            var scrollY = doc.documentElement.scrollTop || doc.body.scrollTop,
-                scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft;
-            this._drag.x = e.clientX + scrollX;
-            this._drag.y = e.clientY + scrollY;
-            this._drag.id = e.identifier;
-            onstart && onstart.call(start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
-            !drag.length && R.mousemove(dragMove).mouseup(dragUp);
-            drag.push({el: this, move: onmove, end: onend, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
-        });
-        return this;
-    };
-    elproto.undrag = function (onmove, onstart, onend) {
-        var i = drag.length;
-        while (i--) {
-            drag[i].el == this && (drag[i].move == onmove && drag[i].end == onend) && drag.splice(i++, 1);
-        }
-        !drag.length && R.unmousemove(dragMove).unmouseup(dragUp);
-    };
-    paperproto.circle = function (x, y, r) {
-        return theCircle(this, x || 0, y || 0, r || 0);
-    };
-    paperproto.rect = function (x, y, w, h, r) {
-        return theRect(this, x || 0, y || 0, w || 0, h || 0, r || 0);
-    };
-    paperproto.ellipse = function (x, y, rx, ry) {
-        return theEllipse(this, x || 0, y || 0, rx || 0, ry || 0);
-    };
-    paperproto.path = function (pathString) {
-        pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
-        return thePath(R.format[apply](R, arguments), this);
-    };
-    paperproto.image = function (src, x, y, w, h) {
-        return theImage(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0);
-    };
-    paperproto.text = function (x, y, text) {
-        return theText(this, x || 0, y || 0, Str(text));
-    };
-    paperproto.set = function (itemsArray) {
-        arguments[length] > 1 && (itemsArray = Array[proto].splice.call(arguments, 0, arguments[length]));
-        return new Set(itemsArray);
-    };
-    paperproto.setSize = setSize;
-    paperproto.top = paperproto.bottom = null;
-    paperproto.raphael = R;
-    function x_y() {
-        return this.x + S + this.y;
-    }
-    elproto.resetScale = function () {
-        if (this.removed) {
-            return this;
-        }
-        this._.sx = 1;
-        this._.sy = 1;
-        this.attrs.scale = "1 1";
-    };
-    elproto.scale = function (x, y, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        if (x == null && y == null) {
-            return {
-                x: this._.sx,
-                y: this._.sy,
-                toString: x_y
-            };
-        }
-        y = y || x;
-        !+y && (y = x);
-        var dx,
-            dy,
-            dcx,
-            dcy,
-            a = this.attrs;
-        if (x != 0) {
-            var bb = this.getBBox(),
-                rcx = bb.x + bb.width / 2,
-                rcy = bb.y + bb.height / 2,
-                kx = abs(x / this._.sx),
-                ky = abs(y / this._.sy);
-            cx = (+cx || cx == 0) ? cx : rcx;
-            cy = (+cy || cy == 0) ? cy : rcy;
-            var posx = this._.sx > 0,
-                posy = this._.sy > 0,
-                dirx = ~~(x / abs(x)),
-                diry = ~~(y / abs(y)),
-                dkx = kx * dirx,
-                dky = ky * diry,
-                s = this.node.style,
-                ncx = cx + abs(rcx - cx) * dkx * (rcx > cx == posx ? 1 : -1),
-                ncy = cy + abs(rcy - cy) * dky * (rcy > cy == posy ? 1 : -1),
-                fr = (x * dirx > y * diry ? ky : kx);
-            switch (this.type) {
-                case "rect":
-                case "image":
-                    var neww = a.width * kx,
-                        newh = a.height * ky;
-                    this.attr({
-                        height: newh,
-                        r: a.r * fr,
-                        width: neww,
-                        x: ncx - neww / 2,
-                        y: ncy - newh / 2
-                    });
-                    break;
-                case "circle":
-                case "ellipse":
-                    this.attr({
-                        rx: a.rx * kx,
-                        ry: a.ry * ky,
-                        r: a.r * fr,
-                        cx: ncx,
-                        cy: ncy
-                    });
-                    break;
-                case "text":
-                    this.attr({
-                        x: ncx,
-                        y: ncy
-                    });
-                    break;
-                case "path":
-                    var path = pathToRelative(a.path),
-                        skip = true,
-                        fx = posx ? dkx : kx,
-                        fy = posy ? dky : ky;
-                    for (var i = 0, ii = path[length]; i < ii; i++) {
-                        var p = path[i],
-                            P0 = upperCase.call(p[0]);
-                        if (P0 == "M" && skip) {
-                            continue;
-                        } else {
-                            skip = false;
-                        }
-                        if (P0 == "A") {
-                            p[path[i][length] - 2] *= fx;
-                            p[path[i][length] - 1] *= fy;
-                            p[1] *= kx;
-                            p[2] *= ky;
-                            p[5] = +(dirx + diry ? !!+p[5] : !+p[5]);
-                        } else if (P0 == "H") {
-                            for (var j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= fx;
-                            }
-                        } else if (P0 == "V") {
-                            for (j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= fy;
-                            }
-                         } else {
-                            for (j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= (j % 2) ? fx : fy;
-                            }
-                        }
-                    }
-                    var dim2 = pathDimensions(path);
-                    dx = ncx - dim2.x - dim2.width / 2;
-                    dy = ncy - dim2.y - dim2.height / 2;
-                    path[0][1] += dx;
-                    path[0][2] += dy;
-                    this.attr({path: path});
-                break;
-            }
-            if (this.type in {text: 1, image:1} && (dirx != 1 || diry != 1)) {
-                if (this.transformations) {
-                    this.transformations[2] = "scale("[concat](dirx, ",", diry, ")");
-                    this.node[setAttribute]("transform", this.transformations[join](S));
-                    dx = (dirx == -1) ? -a.x - (neww || 0) : a.x;
-                    dy = (diry == -1) ? -a.y - (newh || 0) : a.y;
-                    this.attr({x: dx, y: dy});
-                    a.fx = dirx - 1;
-                    a.fy = diry - 1;
-                } else {
-                    this.node.filterMatrix = ms + ".Matrix(M11="[concat](dirx,
-                        ", M12=0, M21=0, M22=", diry,
-                        ", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");
-                    s.filter = (this.node.filterMatrix || E) + (this.node.filterOpacity || E);
-                }
-            } else {
-                if (this.transformations) {
-                    this.transformations[2] = E;
-                    this.node[setAttribute]("transform", this.transformations[join](S));
-                    a.fx = 0;
-                    a.fy = 0;
-                } else {
-                    this.node.filterMatrix = E;
-                    s.filter = (this.node.filterMatrix || E) + (this.node.filterOpacity || E);
-                }
-            }
-            a.scale = [x, y, cx, cy][join](S);
-            this._.sx = x;
-            this._.sy = y;
-        }
-        return this;
-    };
-    elproto.clone = function () {
-        if (this.removed) {
-            return null;
-        }
-        var attr = this.attr();
-        delete attr.scale;
-        delete attr.translation;
-        return this.paper[this.type]().attr(attr);
-    };
-    var curveslengths = {},
-    getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
-        var len = 0,
-            precision = 100,
-            name = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y].join(),
-            cache = curveslengths[name],
-            old, dot;
-        !cache && (curveslengths[name] = cache = {data: []});
-        cache.timer && clearTimeout(cache.timer);
-        cache.timer = setTimeout(function () {delete curveslengths[name];}, 2000);
-        if (length != null) {
-            var total = getPointAtSegmentLength(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
-            precision = ~~total * 10;
-        }
-        for (var i = 0; i < precision + 1; i++) {
-            if (cache.data[length] > i) {
-                dot = cache.data[i * precision];
-            } else {
-                dot = R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i / precision);
-                cache.data[i] = dot;
-            }
-            i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
-            if (length != null && len >= length) {
-                return dot;
-            }
-            old = dot;
-        }
-        if (length == null) {
-            return len;
-        }
-    },
-    getLengthFactory = function (istotal, subpath) {
-        return function (path, length, onlystart) {
-            path = path2curve(path);
-            var x, y, p, l, sp = "", subpaths = {}, point,
-                len = 0;
-            for (var i = 0, ii = path.length; i < ii; i++) {
-                p = path[i];
-                if (p[0] == "M") {
-                    x = +p[1];
-                    y = +p[2];
-                } else {
-                    l = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                    if (len + l > length) {
-                        if (subpath && !subpaths.start) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            sp += ["C", point.start.x, point.start.y, point.m.x, point.m.y, point.x, point.y];
-                            if (onlystart) {return sp;}
-                            subpaths.start = sp;
-                            sp = ["M", point.x, point.y + "C", point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]][join]();
-                            len += l;
-                            x = +p[5];
-                            y = +p[6];
-                            continue;
-                        }
-                        if (!istotal && !subpath) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            return {x: point.x, y: point.y, alpha: point.alpha};
-                        }
-                    }
-                    len += l;
-                    x = +p[5];
-                    y = +p[6];
-                }
-                sp += p;
-            }
-            subpaths.end = sp;
-            point = istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], 1);
-            point.alpha && (point = {x: point.x, y: point.y, alpha: point.alpha});
-            return point;
-        };
-    };
-    var getTotalLength = getLengthFactory(1),
-        getPointAtLength = getLengthFactory(),
-        getSubpathsAtLength = getLengthFactory(0, 1);
-    elproto.getTotalLength = function () {
-        if (this.type != "path") {return;}
-        if (this.node.getTotalLength) {
-            return this.node.getTotalLength();
-        }
-        return getTotalLength(this.attrs.path);
-    };
-    elproto.getPointAtLength = function (length) {
-        if (this.type != "path") {return;}
-        return getPointAtLength(this.attrs.path, length);
-    };
-    elproto.getSubpath = function (from, to) {
-        if (this.type != "path") {return;}
-        if (abs(this.getTotalLength() - to) < "1e-6") {
-            return getSubpathsAtLength(this.attrs.path, from).end;
-        }
-        var a = getSubpathsAtLength(this.attrs.path, to, 1);
-        return from ? getSubpathsAtLength(a, from).end : a;
-    };
-
-    // animation easing formulas
-    R.easing_formulas = {
-        linear: function (n) {
-            return n;
-        },
-        "<": function (n) {
-            return pow(n, 3);
-        },
-        ">": function (n) {
-            return pow(n - 1, 3) + 1;
-        },
-        "<>": function (n) {
-            n = n * 2;
-            if (n < 1) {
-                return pow(n, 3) / 2;
-            }
-            n -= 2;
-            return (pow(n, 3) + 2) / 2;
-        },
-        backIn: function (n) {
-            var s = 1.70158;
-            return n * n * ((s + 1) * n - s);
-        },
-        backOut: function (n) {
-            n = n - 1;
-            var s = 1.70158;
-            return n * n * ((s + 1) * n + s) + 1;
-        },
-        elastic: function (n) {
-            if (n == 0 || n == 1) {
-                return n;
-            }
-            var p = .3,
-                s = p / 4;
-            return pow(2, -10 * n) * math.sin((n - s) * (2 * PI) / p) + 1;
-        },
-        bounce: function (n) {
-            var s = 7.5625,
-                p = 2.75,
-                l;
-            if (n < (1 / p)) {
-                l = s * n * n;
-            } else {
-                if (n < (2 / p)) {
-                    n -= (1.5 / p);
-                    l = s * n * n + .75;
-                } else {
-                    if (n < (2.5 / p)) {
-                        n -= (2.25 / p);
-                        l = s * n * n + .9375;
-                    } else {
-                        n -= (2.625 / p);
-                        l = s * n * n + .984375;
-                    }
-                }
-            }
-            return l;
-        }
-    };
-
-    var animationElements = [],
-        animation = function () {
-            var Now = +new Date;
-            for (var l = 0; l < animationElements[length]; l++) {
-                var e = animationElements[l];
-                if (e.stop || e.el.removed) {
-                    continue;
-                }
-                var time = Now - e.start,
-                    ms = e.ms,
-                    easing = e.easing,
-                    from = e.from,
-                    diff = e.diff,
-                    to = e.to,
-                    t = e.t,
-                    that = e.el,
-                    set = {},
-                    now;
-                if (time < ms) {
-                    var pos = easing(time / ms);
-                    for (var attr in from) if (from[has](attr)) {
-                        switch (availableAnimAttrs[attr]) {
-                            case "along":
-                                now = pos * ms * diff[attr];
-                                to.back && (now = to.len - now);
-                                var point = getPointAtLength(to[attr], now);
-                                that.translate(diff.sx - diff.x || 0, diff.sy - diff.y || 0);
-                                diff.x = point.x;
-                                diff.y = point.y;
-                                that.translate(point.x - diff.sx, point.y - diff.sy);
-                                to.rot && that.rotate(diff.r + point.alpha, point.x, point.y);
-                                break;
-                            case nu:
-                                now = +from[attr] + pos * ms * diff[attr];
-                                break;
-                            case "colour":
-                                now = "rgb(" + [
-                                    upto255(round(from[attr].r + pos * ms * diff[attr].r)),
-                                    upto255(round(from[attr].g + pos * ms * diff[attr].g)),
-                                    upto255(round(from[attr].b + pos * ms * diff[attr].b))
-                                ][join](",") + ")";
-                                break;
-                            case "path":
-                                now = [];
-                                for (var i = 0, ii = from[attr][length]; i < ii; i++) {
-                                    now[i] = [from[attr][i][0]];
-                                    for (var j = 1, jj = from[attr][i][length]; j < jj; j++) {
-                                        now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
-                                    }
-                                    now[i] = now[i][join](S);
-                                }
-                                now = now[join](S);
-                                break;
-                            case "csv":
-                                switch (attr) {
-                                    case "translation":
-                                        var x = pos * ms * diff[attr][0] - t.x,
-                                            y = pos * ms * diff[attr][1] - t.y;
-                                        t.x += x;
-                                        t.y += y;
-                                        now = x + S + y;
-                                    break;
-                                    case "rotation":
-                                        now = +from[attr][0] + pos * ms * diff[attr][0];
-                                        from[attr][1] && (now += "," + from[attr][1] + "," + from[attr][2]);
-                                    break;
-                                    case "scale":
-                                        now = [+from[attr][0] + pos * ms * diff[attr][0], +from[attr][1] + pos * ms * diff[attr][1], (2 in to[attr] ? to[attr][2] : E), (3 in to[attr] ? to[attr][3] : E)][join](S);
-                                    break;
-                                    case "clip-rect":
-                                        now = [];
-                                        i = 4;
-                                        while (i--) {
-                                            now[i] = +from[attr][i] + pos * ms * diff[attr][i];
-                                        }
-                                    break;
-                                }
-                                break;
-                            default:
-                              var from2 = [].concat(from[attr]);
-                                now = [];
-                                i = that.paper.customAttributes[attr].length;
-                                while (i--) {
-                                    now[i] = +from2[i] + pos * ms * diff[attr][i];
-                                }
-                                break;
-                        }
-                        set[attr] = now;
-                    }
-                    that.attr(set);
-                    that._run && that._run.call(that);
-                } else {
-                    if (to.along) {
-                        point = getPointAtLength(to.along, to.len * !to.back);
-                        that.translate(diff.sx - (diff.x || 0) + point.x - diff.sx, diff.sy - (diff.y || 0) + point.y - diff.sy);
-                        to.rot && that.rotate(diff.r + point.alpha, point.x, point.y);
-                    }
-                    (t.x || t.y) && that.translate(-t.x, -t.y);
-                    to.scale && (to.scale += E);
-                    that.attr(to);
-                    animationElements.splice(l--, 1);
-                }
-            }
-            R.svg && that && that.paper && that.paper.safari();
-            animationElements[length] && setTimeout(animation);
-        },
-        keyframesRun = function (attr, element, time, prev, prevcallback) {
-            var dif = time - prev;
-            element.timeouts.push(setTimeout(function () {
-                R.is(prevcallback, "function") && prevcallback.call(element);
-                element.animate(attr, dif, attr.easing);
-            }, prev));
-        },
-        upto255 = function (color) {
-            return mmax(mmin(color, 255), 0);
-        },
-        translate = function (x, y) {
-            if (x == null) {
-                return {x: this._.tx, y: this._.ty, toString: x_y};
-            }
-            this._.tx += +x;
-            this._.ty += +y;
-            switch (this.type) {
-                case "circle":
-                case "ellipse":
-                    this.attr({cx: +x + this.attrs.cx, cy: +y + this.attrs.cy});
-                    break;
-                case "rect":
-                case "image":
-                case "text":
-                    this.attr({x: +x + this.attrs.x, y: +y + this.attrs.y});
-                    break;
-                case "path":
-                    var path = pathToRelative(this.attrs.path);
-                    path[0][1] += +x;
-                    path[0][2] += +y;
-                    this.attr({path: path});
-                break;
-            }
-            return this;
-        };
-    elproto.animateWith = function (element, params, ms, easing, callback) {
-        for (var i = 0, ii = animationElements.length; i < ii; i++) {
-            if (animationElements[i].el.id == element.id) {
-                params.start = animationElements[i].start;
-            }
-        }
-        return this.animate(params, ms, easing, callback);
-    };
-    elproto.animateAlong = along();
-    elproto.animateAlongBack = along(1);
-    function along(isBack) {
-        return function (path, ms, rotate, callback) {
-            var params = {back: isBack};
-            R.is(rotate, "function") ? (callback = rotate) : (params.rot = rotate);
-            path && path.constructor == Element && (path = path.attrs.path);
-            path && (params.along = path);
-            return this.animate(params, ms, callback);
-        };
-    }
-    function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
-        var cx = 3 * p1x,
-            bx = 3 * (p2x - p1x) - cx,
-            ax = 1 - cx - bx,
-            cy = 3 * p1y,
-            by = 3 * (p2y - p1y) - cy,
-            ay = 1 - cy - by;
-        function sampleCurveX(t) {
-            return ((ax * t + bx) * t + cx) * t;
-        }
-        function solve(x, epsilon) {
-            var t = solveCurveX(x, epsilon);
-            return ((ay * t + by) * t + cy) * t;
-        }
-        function solveCurveX(x, epsilon) {
-            var t0, t1, t2, x2, d2, i;
-            for(t2 = x, i = 0; i < 8; i++) {
-                x2 = sampleCurveX(t2) - x;
-                if (abs(x2) < epsilon) {
-                    return t2;
-                }
-                d2 = (3 * ax * t2 + 2 * bx) * t2 + cx;
-                if (abs(d2) < 1e-6) {
-                    break;
-                }
-                t2 = t2 - x2 / d2;
-            }
-            t0 = 0;
-            t1 = 1;
-            t2 = x;
-            if (t2 < t0) {
-                return t0;
-            }
-            if (t2 > t1) {
-                return t1;
-            }
-            while (t0 < t1) {
-                x2 = sampleCurveX(t2);
-                if (abs(x2 - x) < epsilon) {
-                    return t2;
-                }
-                if (x > x2) {
-                    t0 = t2;
-                } else {
-                    t1 = t2;
-                }
-                t2 = (t1 - t0) / 2 + t0;
-            }
-            return t2;
-        }
-        return solve(t, 1 / (200 * duration));
-    }
-    elproto.onAnimation = function (f) {
-        this._run = f || 0;
-        return this;
-    };
-    elproto.animate = function (params, ms, easing, callback) {
-        var element = this;
-        element.timeouts = element.timeouts || [];
-        if (R.is(easing, "function") || !easing) {
-            callback = easing || null;
-        }
-        if (element.removed) {
-            callback && callback.call(element);
-            return element;
-        }
-        var from = {},
-            to = {},
-            animateable = false,
-            diff = {};
-        for (var attr in params) if (params[has](attr)) {
-            if (availableAnimAttrs[has](attr) || element.paper.customAttributes[has](attr)) {
-                animateable = true;
-                from[attr] = element.attr(attr);
-                (from[attr] == null) && (from[attr] = availableAttrs[attr]);
-                to[attr] = params[attr];
-                switch (availableAnimAttrs[attr]) {
-                    case "along":
-                        var len = getTotalLength(params[attr]);
-                        var point = getPointAtLength(params[attr], len * !!params.back);
-                        var bb = element.getBBox();
-                        diff[attr] = len / ms;
-                        diff.tx = bb.x;
-                        diff.ty = bb.y;
-                        diff.sx = point.x;
-                        diff.sy = point.y;
-                        to.rot = params.rot;
-                        to.back = params.back;
-                        to.len = len;
-                        params.rot && (diff.r = toFloat(element.rotate()) || 0);
-                        break;
-                    case nu:
-                        diff[attr] = (to[attr] - from[attr]) / ms;
-                        break;
-                    case "colour":
-                        from[attr] = R.getRGB(from[attr]);
-                        var toColour = R.getRGB(to[attr]);
-                        diff[attr] = {
-                            r: (toColour.r - from[attr].r) / ms,
-                            g: (toColour.g - from[attr].g) / ms,
-                            b: (toColour.b - from[attr].b) / ms
-                        };
-                        break;
-                    case "path":
-                        var pathes = path2curve(from[attr], to[attr]);
-                        from[attr] = pathes[0];
-                        var toPath = pathes[1];
-                        diff[attr] = [];
-                        for (var i = 0, ii = from[attr][length]; i < ii; i++) {
-                            diff[attr][i] = [0];
-                            for (var j = 1, jj = from[attr][i][length]; j < jj; j++) {
-                                diff[attr][i][j] = (toPath[i][j] - from[attr][i][j]) / ms;
-                            }
-                        }
-                        break;
-                    case "csv":
-                        var values = Str(params[attr])[split](separator),
-                            from2 = Str(from[attr])[split](separator);
-                        switch (attr) {
-                            case "translation":
-                                from[attr] = [0, 0];
-                                diff[attr] = [values[0] / ms, values[1] / ms];
-                            break;
-                            case "rotation":
-                                from[attr] = (from2[1] == values[1] && from2[2] == values[2]) ? from2 : [0, values[1], values[2]];
-                                diff[attr] = [(values[0] - from[attr][0]) / ms, 0, 0];
-                            break;
-                            case "scale":
-                                params[attr] = values;
-                                from[attr] = Str(from[attr])[split](separator);
-                                diff[attr] = [(values[0] - from[attr][0]) / ms, (values[1] - from[attr][1]) / ms, 0, 0];
-                            break;
-                            case "clip-rect":
-                                from[attr] = Str(from[attr])[split](separator);
-                                diff[attr] = [];
-                                i = 4;
-                                while (i--) {
-                                    diff[attr][i] = (values[i] - from[attr][i]) / ms;
-                                }
-                            break;
-                        }
-                        to[attr] = values;
-                        break;
-                    default:
-                        values = [].concat(params[attr]);
-                        from2 = [].concat(from[attr]);
-                        diff[attr] = [];
-                        i = element.paper.customAttributes[attr][length];
-                        while (i--) {
-                            diff[attr][i] = ((values[i] || 0) - (from2[i] || 0)) / ms;
-                        }
-                        break;
-                }
-            }
-        }
-        if (!animateable) {
-            var attrs = [],
-                lastcall;
-            for (var key in params) if (params[has](key) && animKeyFrames.test(key)) {
-                attr = {value: params[key]};
-                key == "from" && (key = 0);
-                key == "to" && (key = 100);
-                attr.key = toInt(key, 10);
-                attrs.push(attr);
-            }
-            attrs.sort(sortByKey);
-            if (attrs[0].key) {
-                attrs.unshift({key: 0, value: element.attrs});
-            }
-            for (i = 0, ii = attrs[length]; i < ii; i++) {
-                keyframesRun(attrs[i].value, element, ms / 100 * attrs[i].key, ms / 100 * (attrs[i - 1] && attrs[i - 1].key || 0), attrs[i - 1] && attrs[i - 1].value.callback);
-            }
-            lastcall = attrs[attrs[length] - 1].value.callback;
-            if (lastcall) {
-                element.timeouts.push(setTimeout(function () {lastcall.call(element);}, ms));
-            }
-        } else {
-            var easyeasy = R.easing_formulas[easing];
-            if (!easyeasy) {
-                easyeasy = Str(easing).match(bezierrg);
-                if (easyeasy && easyeasy[length] == 5) {
-                    var curve = easyeasy;
-                    easyeasy = function (t) {
-                        return CubicBezierAtTime(t, +curve[1], +curve[2], +curve[3], +curve[4], ms);
-                    };
-                } else {
-                    easyeasy = function (t) {
-                        return t;
-                    };
-                }
-            }
-            animationElements.push({
-                start: params.start || +new Date,
-                ms: ms,
-                easing: easyeasy,
-                from: from,
-                diff: diff,
-                to: to,
-                el: element,
-                t: {x: 0, y: 0}
-            });
-            R.is(callback, "function") && (element._ac = setTimeout(function () {
-                callback.call(element);
-            }, ms));
-            animationElements[length] == 1 && setTimeout(animation);
-        }
-        return this;
-    };
-    elproto.stop = function () {
-        for (var i = 0; i < animationElements.length; i++) {
-            animationElements[i].el.id == this.id && animationElements.splice(i--, 1);
-        }
-        for (i = 0, ii = this.timeouts && this.timeouts.length; i < ii; i++) {
-            clearTimeout(this.timeouts[i]);
-        }
-        this.timeouts = [];
-        clearTimeout(this._ac);
-        delete this._ac;
-        return this;
-    };
-    elproto.translate = function (x, y) {
-        return this.attr({translation: x + " " + y});
-    };
-    elproto[toString] = function () {
-        return "Rapha\xebl\u2019s object";
-    };
-    R.ae = animationElements;
- 
-    // Set
-    var Set = function (items) {
-        this.items = [];
-        this[length] = 0;
-        this.type = "set";
-        if (items) {
-            for (var i = 0, ii = items[length]; i < ii; i++) {
-                if (items[i] && (items[i].constructor == Element || items[i].constructor == Set)) {
-                    this[this.items[length]] = this.items[this.items[length]] = items[i];
-                    this[length]++;
-                }
-            }
-        }
-    };
-    Set[proto][push] = function () {
-        var item,
-            len;
-        for (var i = 0, ii = arguments[length]; i < ii; i++) {
-            item = arguments[i];
-            if (item && (item.constructor == Element || item.constructor == Set)) {
-                len = this.items[length];
-                this[len] = this.items[len] = item;
-                this[length]++;
-            }
-        }
-        return this;
-    };
-    Set[proto].pop = function () {
-        delete this[this[length]--];
-        return this.items.pop();
-    };
-    for (var method in elproto) if (elproto[has](method)) {
-        Set[proto][method] = (function (methodname) {
-            return function () {
-                for (var i = 0, ii = this.items[length]; i < ii; i++) {
-                    this.items[i][methodname][apply](this.items[i], arguments);
-                }
-                return this;
-            };
-        })(method);
-    }
-    Set[proto].attr = function (name, value) {
-        if (name && R.is(name, array) && R.is(name[0], "object")) {
-            for (var j = 0, jj = name[length]; j < jj; j++) {
-                this.items[j].attr(name[j]);
-            }
-        } else {
-            for (var i = 0, ii = this.items[length]; i < ii; i++) {
-                this.items[i].attr(name, value);
-            }
-        }
-        return this;
-    };
-    Set[proto].animate = function (params, ms, easing, callback) {
-        (R.is(easing, "function") || !easing) && (callback = easing || null);
-        var len = this.items[length],
-            i = len,
-            item,
-            set = this,
-            collector;
-        callback && (collector = function () {
-            !--len && callback.call(set);
-        });
-        easing = R.is(easing, string) ? easing : collector;
-        item = this.items[--i].animate(params, ms, easing, collector);
-        while (i--) {
-            this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, params, ms, easing, collector);
-        }
-        return this;
-    };
-    Set[proto].insertAfter = function (el) {
-        var i = this.items[length];
-        while (i--) {
-            this.items[i].insertAfter(el);
-        }
-        return this;
-    };
-    Set[proto].getBBox = function () {
-        var x = [],
-            y = [],
-            w = [],
-            h = [];
-        for (var i = this.items[length]; i--;) {
-            var box = this.items[i].getBBox();
-            x[push](box.x);
-            y[push](box.y);
-            w[push](box.x + box.width);
-            h[push](box.y + box.height);
-        }
-        x = mmin[apply](0, x);
-        y = mmin[apply](0, y);
-        return {
-            x: x,
-            y: y,
-            width: mmax[apply](0, w) - x,
-            height: mmax[apply](0, h) - y
-        };
-    };
-    Set[proto].clone = function (s) {
-        s = new Set;
-        for (var i = 0, ii = this.items[length]; i < ii; i++) {
-            s[push](this.items[i].clone());
-        }
-        return s;
-    };
-
-    R.registerFont = function (font) {
-        if (!font.face) {
-            return font;
-        }
-        this.fonts = this.fonts || {};
-        var fontcopy = {
-                w: font.w,
-                face: {},
-                glyphs: {}
-            },
-            family = font.face["font-family"];
-        for (var prop in font.face) if (font.face[has](prop)) {
-            fontcopy.face[prop] = font.face[prop];
-        }
-        if (this.fonts[family]) {
-            this.fonts[family][push](fontcopy);
-        } else {
-            this.fonts[family] = [fontcopy];
-        }
-        if (!font.svg) {
-            fontcopy.face["units-per-em"] = toInt(font.face["units-per-em"], 10);
-            for (var glyph in font.glyphs) if (font.glyphs[has](glyph)) {
-                var path = font.glyphs[glyph];
-                fontcopy.glyphs[glyph] = {
-                    w: path.w,
-                    k: {},
-                    d: path.d && "M" + path.d[rp](/[mlcxtrv]/g, function (command) {
-                            return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
-                        }) + "z"
-                };
-                if (path.k) {
-                    for (var k in path.k) if (path[has](k)) {
-                        fontcopy.glyphs[glyph].k[k] = path.k[k];
-                    }
-                }
-            }
-        }
-        return font;
-    };
-    paperproto.getFont = function (family, weight, style, stretch) {
-        stretch = stretch || "normal";
-        style = style || "normal";
-        weight = +weight || {normal: 400, bold: 700, lighter: 300, bolder: 800}[weight] || 400;
-        if (!R.fonts) {
-            return;
-        }
-        var font = R.fonts[family];
-        if (!font) {
-            var name = new RegExp("(^|\\s)" + family[rp](/[^\w\d\s+!~.:_-]/g, E) + "(\\s|$)", "i");
-            for (var fontName in R.fonts) if (R.fonts[has](fontName)) {
-                if (name.test(fontName)) {
-                    font = R.fonts[fontName];
-                    break;
-                }
-            }
-        }
-        var thefont;
-        if (font) {
-            for (var i = 0, ii = font[length]; i < ii; i++) {
-                thefont = font[i];
-                if (thefont.face["font-weight"] == weight && (thefont.face["font-style"] == style || !thefont.face["font-style"]) && thefont.face["font-stretch"] == stretch) {
-                    break;
-                }
-            }
-        }
-        return thefont;
-    };
-    paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
-        origin = origin || "middle"; // baseline|middle
-        letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
-        var out = this.set(),
-            letters = Str(string)[split](E),
-            shift = 0,
-            path = E,
-            scale;
-        R.is(font, string) && (font = this.getFont(font));
-        if (font) {
-            scale = (size || 16) / font.face["units-per-em"];
-            var bb = font.face.bbox.split(separator),
-                top = +bb[0],
-                height = +bb[1] + (origin == "baseline" ? bb[3] - bb[1] + (+font.face.descent) : (bb[3] - bb[1]) / 2);
-            for (var i = 0, ii = letters[length]; i < ii; i++) {
-                var prev = i && font.glyphs[letters[i - 1]] || {},
-                    curr = font.glyphs[letters[i]];
-                shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
-                curr && curr.d && out[push](this.path(curr.d).attr({fill: "#000", stroke: "none", translation: [shift, 0]}));
-            }
-            out.scale(scale, scale, top, height).translate(x - top, y - height);
-        }
-        return out;
-    };
-
-    R.format = function (token, params) {
-        var args = R.is(params, array) ? [0][concat](params) : arguments;
-        token && R.is(token, string) && args[length] - 1 && (token = token[rp](formatrg, function (str, i) {
-            return args[++i] == null ? E : args[i];
-        }));
-        return token || E;
-    };
-    R.ninja = function () {
-        oldRaphael.was ? (win.Raphael = oldRaphael.is) : delete Raphael;
-        return R;
-    };
-    R.el = elproto;
-    R.st = Set[proto];
-
-    oldRaphael.was ? (win.Raphael = R) : (Raphael = R);
-})();/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
- 
- 
-(function () {
-    var mmax = Math.max,
-        mmin = Math.min;
-    Raphael.fn.g = Raphael.fn.g || {};
-    Raphael.fn.g.markers = {
-        disc: "disc",
-        o: "disc",
-        flower: "flower",
-        f: "flower",
-        diamond: "diamond",
-        d: "diamond",
-        square: "square",
-        s: "square",
-        triangle: "triangle",
-        t: "triangle",
-        star: "star",
-        "*": "star",
-        cross: "cross",
-        x: "cross",
-        plus: "plus",
-        "+": "plus",
-        arrow: "arrow",
-        "->": "arrow"
-    };
-    Raphael.fn.g.shim = {stroke: "none", fill: "#000", "fill-opacity": 0};
-    Raphael.fn.g.txtattr = {font: "12px Arial, sans-serif"};
-    Raphael.fn.g.colors = [];
-    var hues = [.6, .2, .05, .1333, .75, 0];
-    for (var i = 0; i < 10; i++) {
-        if (i < hues.length) {
-            Raphael.fn.g.colors.push("hsb(" + hues[i] + ", .75, .75)");
-        } else {
-            Raphael.fn.g.colors.push("hsb(" + hues[i - hues.length] + ", 1, .5)");
-        }
-    }
-    Raphael.fn.g.text = function (x, y, text) {
-        return this.text(x, y, text).attr(this.g.txtattr);
-    };
-    Raphael.fn.g.labelise = function (label, val, total) {
-        if (label) {
-            return (label + "").replace(/(##+(?:\.#+)?)|(%%+(?:\.%+)?)/g, function (all, value, percent) {
-                if (value) {
-                    return (+val).toFixed(value.replace(/^#+\.?/g, "").length);
-                }
-                if (percent) {
-                    return (val * 100 / total).toFixed(percent.replace(/^%+\.?/g, "").length) + "%";
-                }
-            });
-        } else {
-            return (+val).toFixed(0);
-        }
-    };
-
-    Raphael.fn.g.finger = function (x, y, width, height, dir, ending, isPath) {
-        // dir 0 for horisontal and 1 for vertical
-        if ((dir && !height) || (!dir && !width)) {
-            return isPath ? "" : this.path();
-        }
-        ending = {square: "square", sharp: "sharp", soft: "soft"}[ending] || "round";
-        var path;
-        height = Math.round(height);
-        width = Math.round(width);
-        x = Math.round(x);
-        y = Math.round(y);
-        switch (ending) {
-            case "round":
-            if (!dir) {
-                var r = ~~(height / 2);
-                if (width < r) {
-                    r = width;
-                    path = ["M", x + .5, y + .5 - ~~(height / 2), "l", 0, 0, "a", r, ~~(height / 2), 0, 0, 1, 0, height, "l", 0, 0, "z"];
-                } else {
-                    path = ["M", x + .5, y + .5 - r, "l", width - r, 0, "a", r, r, 0, 1, 1, 0, height, "l", r - width, 0, "z"];
-                }
-            } else {
-                r = ~~(width / 2);
-                if (height < r) {
-                    r = height;
-                    path = ["M", x - ~~(width / 2), y, "l", 0, 0, "a", ~~(width / 2), r, 0, 0, 1, width, 0, "l", 0, 0, "z"];
-                } else {
-                    path = ["M", x - r, y, "l", 0, r - height, "a", r, r, 0, 1, 1, width, 0, "l", 0, height - r, "z"];
-                }
-            }
-            break;
-            case "sharp":
-            if (!dir) {
-                var half = ~~(height / 2);
-                path = ["M", x, y + half, "l", 0, -height, mmax(width - half, 0), 0, mmin(half, width), half, -mmin(half, width), half + (half * 2 < height), "z"];
-            } else {
-                half = ~~(width / 2);
-                path = ["M", x + half, y, "l", -width, 0, 0, -mmax(height - half, 0), half, -mmin(half, height), half, mmin(half, height), half, "z"];
-            }
-            break;
-            case "square":
-            if (!dir) {
-                path = ["M", x, y + ~~(height / 2), "l", 0, -height, width, 0, 0, height, "z"];
-            } else {
-                path = ["M", x + ~~(width / 2), y, "l", 1 - width, 0, 0, -height, width - 1, 0, "z"];
-            }
-            break;
-            case "soft":
-            if (!dir) {
-                r = mmin(width, Math.round(height / 5));
-                path = ["M", x + .5, y + .5 - ~~(height / 2), "l", width - r, 0, "a", r, r, 0, 0, 1, r, r, "l", 0, height - r * 2, "a", r, r, 0, 0, 1, -r, r, "l", r - width, 0, "z"];
-            } else {
-                r = mmin(Math.round(width / 5), height);
-                path = ["M", x - ~~(width / 2), y, "l", 0, r - height, "a", r, r, 0, 0, 1, r, -r, "l", width - 2 * r, 0, "a", r, r, 0, 0, 1, r, r, "l", 0, height - r, "z"];
-            }
-        }
-        if (isPath) {
-            return path.join(",");
-        } else {
-            return this.path(path);
-        }
-    };
-
-    // Symbols
-    Raphael.fn.g.disc = function (cx, cy, r) {
-        return this.circle(cx, cy, r);
-    };
-    Raphael.fn.g.line = function (cx, cy, r) {
-        return this.rect(cx - r, cy - r / 5, 2 * r, 2 * r / 5);
-    };
-    Raphael.fn.g.square = function (cx, cy, r) {
-        r = r * .7;
-        return this.rect(cx - r, cy - r, 2 * r, 2 * r);
-    };
-    Raphael.fn.g.triangle = function (cx, cy, r) {
-        r *= 1.75;
-        return this.path("M".concat(cx, ",", cy, "m0-", r * .58, "l", r * .5, ",", r * .87, "-", r, ",0z"));
-    };
-    Raphael.fn.g.diamond = function (cx, cy, r) {
-        return this.path(["M", cx, cy - r, "l", r, r, -r, r, -r, -r, r, -r, "z"]);
-    };
-    Raphael.fn.g.flower = function (cx, cy, r, n) {
-        r = r * 1.25;
-        var rout = r,
-            rin = rout * .5;
-        n = +n < 3 || !n ? 5 : n;
-        var points = ["M", cx, cy + rin, "Q"],
-            R;
-        for (var i = 1; i < n * 2 + 1; i++) {
-            R = i % 2 ? rout : rin;
-            points = points.concat([+(cx + R * Math.sin(i * Math.PI / n)).toFixed(3), +(cy + R * Math.cos(i * Math.PI / n)).toFixed(3)]);
-        }
-        points.push("z");
-        return this.path(points.join(","));
-    };
-    Raphael.fn.g.star = function (cx, cy, r, r2, rays) {
-        r2 = r2 || r * .382;
-        rays = rays || 5;
-        var points = ["M", cx, cy + r2, "L"],
-            R;
-        for (var i = 1; i < rays * 2; i++) {
-            R = i % 2 ? r : r2;
-            points = points.concat([(cx + R * Math.sin(i * Math.PI / rays)), (cy + R * Math.cos(i * Math.PI / rays))]);
-        }
-        points.push("z");
-        return this.path(points.join(","));
-    };
-    Raphael.fn.g.cross = function (cx, cy, r) {
-        r = r / 2.5;
-        return this.path("M".concat(cx - r, ",", cy, "l", [-r, -r, r, -r, r, r, r, -r, r, r, -r, r, r, r, -r, r, -r, -r, -r, r, -r, -r, "z"]));
-    };
-    Raphael.fn.g.plus = function (cx, cy, r) {
-        r = r / 2;
-        return this.path("M".concat(cx - r / 2, ",", cy - r / 2, "l", [0, -r, r, 0, 0, r, r, 0, 0, r, -r, 0, 0, r, -r, 0, 0, -r, -r, 0, 0, -r, "z"]));
-    };
-    Raphael.fn.g.arrow = function (cx, cy, r) {
-        return this.path("M".concat(cx - r * .7, ",", cy - r * .4, "l", [r * .6, 0, 0, -r * .4, r, r * .8, -r, r * .8, 0, -r * .4, -r * .6, 0], "z"));
-    };
-
-    // Tooltips
-    Raphael.fn.g.tag = function (x, y, text, angle, r) {
-        angle = angle || 0;
-        r = r == null ? 5 : r;
-        text = text == null ? "$9.99" : text;
-        var R = .5522 * r,
-            res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function () {
-            this.rotate(0, x, y);
-            var bb = this[1].getBBox();
-            if (bb.height >= r * 2) {
-                this[0].attr({path: ["M", x, y + r, "a", r, r, 0, 1, 1, 0, -r * 2, r, r, 0, 1, 1, 0, r * 2, "m", 0, -r * 2 -d, "a", r + d, r + d, 0, 1, 0, 0, (r + d) * 2, "L", x + r + d, y + bb.height / 2 + d, "l", bb.width + 2 * d, 0, 0, -bb.height - 2 * d, -bb.width - 2 * d, 0, "L", x, y - r - d].join(",")});
-            } else {
-                var dx = Math.sqrt(Math.pow(r + d, 2) - Math.pow(bb.height / 2 + d, 2));
-                this[0].attr({path: ["M", x, y + r, "c", -R, 0, -r, R - r, -r, -r, 0, -R, r - R, -r, r, -r, R, 0, r, r - R, r, r, 0, R, R - r, r, -r, r, "M", x + dx, y - bb.height / 2 - d, "a", r + d, r + d, 0, 1, 0, 0, bb.height + 2 * d, "l", r + d - dx + bb.width + 2 * d, 0, 0, -bb.height - 2 * d, "L", x + dx, y - bb.height / 2 - d].join(",")});
-            }
-            this[1].attr({x: x + r + d + bb.width / 2, y: y});
-            angle = (360 - angle) % 360;
-            this.rotate(angle, x, y);
-            angle > 90 && angle < 270 && this[1].attr({x: x - r - d - bb.width / 2, y: y, rotation: [180 + angle, x, y]});
-            return this;
-        };
-        res.update();
-        return res;
-    };
-    Raphael.fn.g.popupit = function (x, y, set, dir, size) {
-        dir = dir == null ? 2 : dir;
-        size = size || 5;
-        x = Math.round(x);
-        y = Math.round(y);
-        var bb = set.getBBox(),
-            w = Math.round(bb.width / 2),
-            h = Math.round(bb.height / 2),
-            dx = [0, w + size * 2, 0, -w - size * 2],
-            dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
-            p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
-                "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
-                "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
-                "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
-                "l", -mmax(w - size, 0), 0, "z"].join(","),
-            xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir];
-        set.translate(xy.x - w - bb.x, xy.y - h - bb.y);
-        return this.path(p).attr({fill: "#000", stroke: "none"}).insertBefore(set.node ? set : set[0]);
-    };
-    Raphael.fn.g.popup = function (x, y, text, dir, size) {
-        dir = dir == null ? 2 : dir > 3 ? 3 : dir;
-        size = size || 5;
-        text = text || "$9.99";
-        var res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function (X, Y, withAnimation) {
-            X = X || x;
-            Y = Y || y;
-            var bb = this[1].getBBox(),
-                w = bb.width / 2,
-                h = bb.height / 2,
-                dx = [0, w + size * 2, 0, -w - size * 2],
-                dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
-                p = ["M", X - dx[dir], Y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
-                    "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
-                    "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
-                    "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
-                    "l", -mmax(w - size, 0), 0, "z"].join(","),
-                xy = [{x: X, y: Y + size * 2 + h}, {x: X - size * 2 - w, y: Y}, {x: X, y: Y - size * 2 - h}, {x: X + size * 2 + w, y: Y}][dir];
-            xy.path = p;
-            if (withAnimation) {
-                this.animate(xy, 500, ">");
-            } else {
-                this.attr(xy);
-            }
-            return this;
-        };
-        return res.update(x, y);
-    };
-    Raphael.fn.g.flag = function (x, y, text, angle) {
-        angle = angle || 0;
-        text = text || "$9.99";
-        var res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function (x, y) {
-            this.rotate(0, x, y);
-            var bb = this[1].getBBox(),
-                h = bb.height / 2;
-            this[0].attr({path: ["M", x, y, "l", h + d, -h - d, bb.width + 2 * d, 0, 0, bb.height + 2 * d, -bb.width - 2 * d, 0, "z"].join(",")});
-            this[1].attr({x: x + h + d + bb.width / 2, y: y});
-            angle = 360 - angle;
-            this.rotate(angle, x, y);
-            angle > 90 && angle < 270 && this[1].attr({x: x - r - d - bb.width / 2, y: y, rotation: [180 + angle, x, y]});
-            return this;
-        };
-        return res.update(x, y);
-    };
-    Raphael.fn.g.label = function (x, y, text) {
-        var res = this.set();
-        res.push(this.rect(x, y, 10, 10).attr({stroke: "none", fill: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff"}));
-        res.update = function () {
-            var bb = this[1].getBBox(),
-                r = mmin(bb.width + 10, bb.height + 10) / 2;
-            this[0].attr({x: bb.x - r / 2, y: bb.y - r / 2, width: bb.width + r, height: bb.height + r, r: r});
-        };
-        res.update();
-        return res;
-    };
-    Raphael.fn.g.labelit = function (set) {
-        var bb = set.getBBox(),
-            r = mmin(20, bb.width + 10, bb.height + 10) / 2;
-        return this.rect(bb.x - r / 2, bb.y - r / 2, bb.width + r, bb.height + r, r).attr({stroke: "none", fill: "#000"}).insertBefore(set.node ? set : set[0]);
-    };
-    Raphael.fn.g.drop = function (x, y, text, size, angle) {
-        size = size || 30;
-        angle = angle || 0;
-        var res = this.set();
-        res.push(this.path(["M", x, y, "l", size, 0, "A", size * .4, size * .4, 0, 1, 0, x + size * .7, y - size * .7, "z"]).attr({fill: "#000", stroke: "none", rotation: [22.5 - angle, x, y]}));
-        angle = (angle + 90) * Math.PI / 180;
-        res.push(this.text(x + size * Math.sin(angle), y + size * Math.cos(angle), text).attr(this.g.txtattr).attr({"font-size": size * 12 / 30, fill: "#fff"}));
-        res.drop = res[0];
-        res.text = res[1];
-        return res;
-    };
-    Raphael.fn.g.blob = function (x, y, text, angle, size) {
-        angle = (+angle + 1 ? angle : 45) + 90;
-        size = size || 12;
-        var rad = Math.PI / 180,
-            fontSize = size * 12 / 12;
-        var res = this.set();
-        res.push(this.path().attr({fill: "#000", stroke: "none"}));
-        res.push(this.text(x + size * Math.sin((angle) * rad), y + size * Math.cos((angle) * rad) - fontSize / 2, text).attr(this.g.txtattr).attr({"font-size": fontSize, fill: "#fff"}));
-        res.update = function (X, Y, withAnimation) {
-            X = X || x;
-            Y = Y || y;
-            var bb = this[1].getBBox(),
-                w = mmax(bb.width + fontSize, size * 25 / 12),
-                h = mmax(bb.height + fontSize, size * 25 / 12),
-                x2 = X + size * Math.sin((angle - 22.5) * rad),
-                y2 = Y + size * Math.cos((angle - 22.5) * rad),
-                x1 = X + size * Math.sin((angle + 22.5) * rad),
-                y1 = Y + size * Math.cos((angle + 22.5) * rad),
-                dx = (x1 - x2) / 2,
-                dy = (y1 - y2) / 2,
-                rx = w / 2,
-                ry = h / 2,
-                k = -Math.sqrt(Math.abs(rx * rx * ry * ry - rx * rx * dy * dy - ry * ry * dx * dx) / (rx * rx * dy * dy + ry * ry * dx * dx)),
-                cx = k * rx * dy / ry + (x1 + x2) / 2,
-                cy = k * -ry * dx / rx + (y1 + y2) / 2;
-            if (withAnimation) {
-                this.animate({x: cx, y: cy, path: ["M", x, y, "L", x1, y1, "A", rx, ry, 0, 1, 1, x2, y2, "z"].join(",")}, 500, ">");
-            } else {
-                this.attr({x: cx, y: cy, path: ["M", x, y, "L", x1, y1, "A", rx, ry, 0, 1, 1, x2, y2, "z"].join(",")});
-            }
-            return this;
-        };
-        res.update(x, y);
-        return res;
-    };
-
-    Raphael.fn.g.colorValue = function (value, total, s, b) {
-        return "hsb(" + [mmin((1 - value / total) * .4, 1), s || .75, b || .75] + ")";
-    };
-
-    Raphael.fn.g.snapEnds = function (from, to, steps) {
-        var f = from,
-            t = to;
-        if (f == t) {
-            return {from: f, to: t, power: 0};
-        }
-        function round(a) {
-            return Math.abs(a - .5) < .25 ? ~~(a) + .5 : Math.round(a);
-        }
-        var d = (t - f) / steps,
-            r = ~~(d),
-            R = r,
-            i = 0;
-        if (r) {
-            while (R) {
-                i--;
-                R = ~~(d * Math.pow(10, i)) / Math.pow(10, i);
-            }
-            i ++;
-        } else {
-            while (!r) {
-                i = i || 1;
-                r = ~~(d * Math.pow(10, i)) / Math.pow(10, i);
-                i++;
-            }
-            i && i--;
-        }
-        t = round(to * Math.pow(10, i)) / Math.pow(10, i);
-        if (t < to) {
-            t = round((to + .5) * Math.pow(10, i)) / Math.pow(10, i);
-        }
-        f = round((from - (i > 0 ? 0 : .5)) * Math.pow(10, i)) / Math.pow(10, i);
-        return {from: f, to: t, power: i};
-    };
-    Raphael.fn.g.axis = function (x, y, length, from, to, steps, orientation, labels, type, dashsize) {
-        dashsize = dashsize == null ? 2 : dashsize;
-        type = type || "t";
-        steps = steps || 10;
-        var path = type == "|" || type == " " ? ["M", x + .5, y, "l", 0, .001] : orientation == 1 || orientation == 3 ? ["M", x + .5, y, "l", 0, -length] : ["M", x, y + .5, "l", length, 0],
-            ends = this.g.snapEnds(from, to, steps),
-            f = ends.from,
-            t = ends.to,
-            i = ends.power,
-            j = 0,
-            text = this.set();
-        d = (t - f) / steps;
-        var label = f,
-            rnd = i > 0 ? i : 0;
-            dx = length / steps;
-        if (+orientation == 1 || +orientation == 3) {
-            var Y = y,
-                addon = (orientation - 1 ? 1 : -1) * (dashsize + 3 + !!(orientation - 1));
-            while (Y >= y - length) {
-                type != "-" && type != " " && (path = path.concat(["M", x - (type == "+" || type == "|" ? dashsize : !(orientation - 1) * dashsize * 2), Y + .5, "l", dashsize * 2 + 1, 0]));
-                text.push(this.text(x + addon, Y, (labels && labels[j++]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr).attr({"text-anchor": orientation - 1 ? "start" : "end"}));
-                label += d;
-                Y -= dx;
-            }
-            if (Math.round(Y + dx - (y - length))) {
-                type != "-" && type != " " && (path = path.concat(["M", x - (type == "+" || type == "|" ? dashsize : !(orientation - 1) * dashsize * 2), y - length + .5, "l", dashsize * 2 + 1, 0]));
-                text.push(this.text(x + addon, y - length, (labels && labels[j]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr).attr({"text-anchor": orientation - 1 ? "start" : "end"}));
-            }
-        } else {
-            label = f;
-            rnd = (i > 0) * i;
-            addon = (orientation ? -1 : 1) * (dashsize + 9 + !orientation);
-            var X = x,
-                dx = length / steps,
-                txt = 0,
-                prev = 0;
-            while (X <= x + length) {
-                type != "-" && type != " " && (path = path.concat(["M", X + .5, y - (type == "+" ? dashsize : !!orientation * dashsize * 2), "l", 0, dashsize * 2 + 1]));
-                text.push(txt = this.text(X, y + addon, (labels && labels[j++]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr));
-                var bb = txt.getBBox();
-                if (prev >= bb.x - 5) {
-                    text.pop(text.length - 1).remove();
-                } else {
-                    prev = bb.x + bb.width;
-                }
-                label += d;
-                X += dx;
-            }
-            if (Math.round(X - dx - x - length)) {
-                type != "-" && type != " " && (path = path.concat(["M", x + length + .5, y - (type == "+" ? dashsize : !!orientation * dashsize * 2), "l", 0, dashsize * 2 + 1]));
-                text.push(this.text(x + length, y + addon, (labels && labels[j]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr));
-            }
-        }
-        var res = this.path(path);
-        res.text = text;
-        res.all = this.set([res, text]);
-        res.remove = function () {
-            this.text.remove();
-            this.constructor.prototype.remove.call(this);
-        };
-        return res;
-    };
-
-    Raphael.el.lighter = function (times) {
-        times = times || 2;
-        var fs = [this.attrs.fill, this.attrs.stroke];
-        this.fs = this.fs || [fs[0], fs[1]];
-        fs[0] = Raphael.rgb2hsb(Raphael.getRGB(fs[0]).hex);
-        fs[1] = Raphael.rgb2hsb(Raphael.getRGB(fs[1]).hex);
-        fs[0].b = mmin(fs[0].b * times, 1);
-        fs[0].s = fs[0].s / times;
-        fs[1].b = mmin(fs[1].b * times, 1);
-        fs[1].s = fs[1].s / times;
-        this.attr({fill: "hsb(" + [fs[0].h, fs[0].s, fs[0].b] + ")", stroke: "hsb(" + [fs[1].h, fs[1].s, fs[1].b] + ")"});
-    };
-    Raphael.el.darker = function (times) {
-        times = times || 2;
-        var fs = [this.attrs.fill, this.attrs.stroke];
-        this.fs = this.fs || [fs[0], fs[1]];
-        fs[0] = Raphael.rgb2hsb(Raphael.getRGB(fs[0]).hex);
-        fs[1] = Raphael.rgb2hsb(Raphael.getRGB(fs[1]).hex);
-        fs[0].s = mmin(fs[0].s * times, 1);
-        fs[0].b = fs[0].b / times;
-        fs[1].s = mmin(fs[1].s * times, 1);
-        fs[1].b = fs[1].b / times;
-        this.attr({fill: "hsb(" + [fs[0].h, fs[0].s, fs[0].b] + ")", stroke: "hsb(" + [fs[1].h, fs[1].s, fs[1].b] + ")"});
-    };
-    Raphael.el.original = function () {
-        if (this.fs) {
-            this.attr({fill: this.fs[0], stroke: this.fs[1]});
-            delete this.fs;
-        }
-    };
-})();/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.barchart = function (x, y, width, height, values, opts) {
-    opts = opts || {};
-    var type = {round: "round", sharp: "sharp", soft: "soft"}[opts.type] || "square",
-        gutter = parseFloat(opts.gutter || "20%"),
-        chart = this.set(),
-        bars = this.set(),
-        covers = this.set(),
-        covers2 = this.set(),
-        total = Math.max.apply(Math, values),
-        stacktotal = [],
-        paper = this,
-        multi = 0,
-        colors = opts.colors || this.g.colors,
-        len = values.length;
-    if (this.raphael.is(values[0], "array")) {
-        total = [];
-        multi = len;
-        len = 0;
-        for (var i = values.length; i--;) {
-            bars.push(this.set());
-            total.push(Math.max.apply(Math, values[i]));
-            len = Math.max(len, values[i].length);
-        }
-        if (opts.stacked) {
-            for (var i = len; i--;) {
-                var tot = 0;
-                for (var j = values.length; j--;) {
-                    tot +=+ values[j][i] || 0;
-                }
-                stacktotal.push(tot);
-            }
-        }
-        for (var i = values.length; i--;) {
-            if (values[i].length < len) {
-                for (var j = len; j--;) {
-                    values[i].push(0);
-                }
-            }
-        }
-        total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
-    }
-    
-    total = (opts.to) || total;
-    var barwidth = width / (len * (100 + gutter) + gutter) * 100,
-        barhgutter = barwidth * gutter / 100,
-        barvgutter = opts.vgutter == null ? 20 : opts.vgutter,
-        stack = [],
-        X = x + barhgutter,
-        Y = (height - 2 * barvgutter) / total;
-    if (!opts.stretch) {
-        barhgutter = Math.round(barhgutter);
-        barwidth = Math.floor(barwidth);
-    }
-    !opts.stacked && (barwidth /= multi || 1);
-    for (var i = 0; i < len; i++) {
-        stack = [];
-        for (var j = 0; j < (multi || 1); j++) {
-            var h = Math.round((multi ? values[j][i] : values[i]) * Y),
-                top = y + height - barvgutter - h,
-                bar = this.g.finger(Math.round(X + barwidth / 2), top + h, barwidth, h, true, type).attr({stroke: "none", fill: colors[multi ? j : i]});
-            if (multi) {
-                bars[j].push(bar);
-            } else {
-                bars.push(bar);
-            }
-            bar.y = top;
-            bar.x = Math.round(X + barwidth / 2);
-            bar.w = barwidth;
-            bar.h = h;
-						bar.index = i;
-            bar.value = multi ? values[j][i] : values[i];
-            if (!opts.stacked) {
-                X += barwidth;
-            } else {
-                stack.push(bar);
-            }
-        }
-        if (opts.stacked) {
-            var cvr;
-            covers2.push(cvr = this.rect(stack[0].x - stack[0].w / 2, y, barwidth, height).attr(this.g.shim));
-            cvr.bars = this.set();
-            var size = 0;
-            for (var s = stack.length; s--;) {
-                stack[s].toFront();
-            }
-            for (var s = 0, ss = stack.length; s < ss; s++) {
-                var bar = stack[s],
-                    cover,
-                    h = (size + bar.value) * Y,
-                    path = this.g.finger(bar.x, y + height - barvgutter - !!size * .5, barwidth, h, true, type, 1);
-                cvr.bars.push(bar);
-                size && bar.attr({path: path});
-                bar.h = h;
-                bar.y = y + height - barvgutter - !!size * .5 - h;
-                covers.push(cover = this.rect(bar.x - bar.w / 2, bar.y, barwidth, bar.value * Y).attr(this.g.shim));
-                cover.bar = bar;
-                cover.value = bar.value;
-                size += bar.value;
-            }
-            X += barwidth;
-        }
-        X += barhgutter;
-    }
-    covers2.toFront();
-    X = x + barhgutter;
-    if (!opts.stacked) {
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < (multi || 1); j++) {
-                var cover;
-                covers.push(cover = this.rect(Math.round(X), y + barvgutter, barwidth, height - barvgutter).attr(this.g.shim));
-                cover.bar = multi ? bars[j][i] : bars[i];
-                cover.value = cover.bar.value;
-                X += barwidth;
-            }
-            X += barhgutter;
-        }
-    }
-    chart.label = function (labels, isBottom, rotate) {
-        labels = labels || [];
-        isBottom = isBottom == undefined ? true : isBottom;
-	rotate = rotate == undefined ? false : rotate;
-        this.labels = paper.set();
-        var L, l = -Infinity;
-        if (opts.stacked) {
-            for (var i = 0; i < len; i++) {
-                var tot = 0;
-                for (var j = 0; j < (multi || 1); j++) {
-                    tot += multi ? values[j][i] : values[i];
-                    if (j == 0) {
-                        var label = paper.g.labelise(labels[j][i], tot, total);
-                        L = paper.g.text(bars[j][i].x, isBottom ? y + height - barvgutter / 2 : bars[j][i].y - 10, label);
-			if (rotate) {
-				L.rotate(90);
-			}
-                        var bb = L.getBBox();
-                        if (bb.x - 7 < l) {
-                            L.remove();
-                        } else {
-                            this.labels.push(L);
-                            l = bb.x + (rotate ? bb.height : bb.width);
-                        }
-                    }
-                }
-            }
-        } else {
-            for (var i = 0; i < len; i++) {
-                for (var j = 0; j < (multi || 1); j++) {
-                    // did not remove the loop because don't yet know whether to accept multi array input for arrays
-                    var label = paper.g.labelise(multi ? labels[0] && labels[0][i] : labels[i], multi ? values[0][i] : values[i], total);
-                     L = paper.g.text(bars[0][i].x, isBottom ? y + 5 + height - barvgutter / 2 : bars[0][i].y - 10, label);
-			if (rotate) {
-				L.rotate(90);
-				// If we rotated it, we need to move it as well. Still have to use the width
-				// to get the "length" of the label, divided it in two and shift down.
-				L.translate(0, (L.getBBox().width / 2));
-			}
-                    var bb = L.getBBox();
-//                    if (bb.x - 7 < l) {
-                    if (bb.x - (this.getBBox().width) < l) {
-                        L.remove();
-                    } else {
-                        this.labels.push(L);
-                        l = bb.x + (rotate ? bb.height : bb.width);
-                    }
-                }
-            }
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        covers2.hide();
-        covers.show();
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.hoverColumn = function (fin, fout) {
-        covers.hide();
-        covers2.show();
-        fout = fout || function () {};
-        covers2.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.click = function (f) {
-        covers2.hide();
-        covers.show();
-        covers.click(f);
-        return this;
-    };
-    chart.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers2.length; i--;) {
-            f.call(covers2[i]);
-        }
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        covers.hide();
-        covers2.show();
-        covers2.click(f);
-        return this;
-    };
-    chart.push(bars, covers, covers2);
-    chart.bars = bars;
-    chart.covers = covers;
-    return chart;
-};
-Raphael.fn.g.hbarchart = function (x, y, width, height, values, opts) {
-    opts = opts || {};
-    var type = {round: "round", sharp: "sharp", soft: "soft"}[opts.type] || "square",
-        gutter = parseFloat(opts.gutter || "20%"),
-        chart = this.set(),
-        bars = this.set(),
-        covers = this.set(),
-        covers2 = this.set(),
-        total = Math.max.apply(Math, values),
-        stacktotal = [],
-        paper = this,
-        multi = 0,
-        colors = opts.colors || this.g.colors,
-        len = values.length;
-    if (this.raphael.is(values[0], "array")) {
-        total = [];
-        multi = len;
-        len = 0;
-        for (var i = values.length; i--;) {
-            bars.push(this.set());
-            total.push(Math.max.apply(Math, values[i]));
-            len = Math.max(len, values[i].length);
-        }
-        if (opts.stacked) {
-            for (var i = len; i--;) {
-                var tot = 0;
-                for (var j = values.length; j--;) {
-                    tot +=+ values[j][i] || 0;
-                }
-                stacktotal.push(tot);
-            }
-        }
-        for (var i = values.length; i--;) {
-            if (values[i].length < len) {
-                for (var j = len; j--;) {
-                    values[i].push(0);
-                }
-            }
-        }
-        total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
-    }
-    
-    total = (opts.to) || total;
-    var barheight = Math.floor(height / (len * (100 + gutter) + gutter) * 100),
-        bargutter = Math.floor(barheight * gutter / 100),
-        stack = [],
-        Y = y + bargutter,
-        X = (width - 1) / total;
-    !opts.stacked && (barheight /= multi || 1);
-    for (var i = 0; i < len; i++) {
-        stack = [];
-        for (var j = 0; j < (multi || 1); j++) {
-            var val = multi ? values[j][i] : values[i],
-                bar = this.g.finger(x, Y + barheight / 2, Math.round(val * X), barheight - 1, false, type).attr({stroke: "none", fill: colors[multi ? j : i]});
-            if (multi) {
-                bars[j].push(bar);
-            } else {
-                bars.push(bar);
-            }
-            bar.x = x + Math.round(val * X);
-            bar.y = Y + barheight / 2;
-            bar.w = Math.round(val * X);
-            bar.h = barheight;
-            bar.value = +val;
-            if (!opts.stacked) {
-                Y += barheight;
-            } else {
-                stack.push(bar);
-            }
-        }
-        if (opts.stacked) {
-            var cvr = this.rect(x, stack[0].y - stack[0].h / 2, width, barheight).attr(this.g.shim);
-            covers2.push(cvr);
-            cvr.bars = this.set();
-            var size = 0;
-            for (var s = stack.length; s--;) {
-                stack[s].toFront();
-            }
-            for (var s = 0, ss = stack.length; s < ss; s++) {
-                var bar = stack[s],
-                    cover,
-                    val = Math.round((size + bar.value) * X),
-                    path = this.g.finger(x, bar.y, val, barheight - 1, false, type, 1);
-                cvr.bars.push(bar);
-                size && bar.attr({path: path});
-                bar.w = val;
-                bar.x = x + val;
-                covers.push(cover = this.rect(x + size * X, bar.y - bar.h / 2, bar.value * X, barheight).attr(this.g.shim));
-                cover.bar = bar;
-                size += bar.value;
-            }
-            Y += barheight;
-        }
-        Y += bargutter;
-    }
-    covers2.toFront();
-    Y = y + bargutter;
-    if (!opts.stacked) {
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < (multi || 1); j++) {
-                var cover = this.rect(x, Y, width, barheight).attr(this.g.shim);
-                covers.push(cover);
-                cover.bar = multi ? bars[j][i] : bars[i];
-                cover.value = cover.bar.value;
-                Y += barheight;
-            }
-            Y += bargutter;
-        }
-    }
-    chart.label = function (labels, isRight) {
-        labels = labels || [];
-        this.labels = paper.set();
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < multi; j++) {
-                var  label = paper.g.labelise(multi ? labels[j] && labels[j][i] : labels[i], multi ? values[j][i] : values[i], total);
-                var X = isRight ? bars[i * (multi || 1) + j].x - barheight / 2 + 3 : x + 5,
-                    A = isRight ? "end" : "start",
-                    L;
-                this.labels.push(L = paper.g.text(X, bars[i * (multi || 1) + j].y, label).attr({"text-anchor": A}).insertBefore(covers[0]));
-                if (L.getBBox().x < x + 5) {
-                    L.attr({x: x + 5, "text-anchor": "start"});
-                } else {
-                    bars[i * (multi || 1) + j].label = L;
-                }
-            }
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        covers2.hide();
-        covers.show();
-        fout = fout || function () {};
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.hoverColumn = function (fin, fout) {
-        covers.hide();
-        covers2.show();
-        fout = fout || function () {};
-        covers2.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers2.length; i--;) {
-            f.call(covers2[i]);
-        }
-        return this;
-    };
-    chart.click = function (f) {
-        covers2.hide();
-        covers.show();
-        covers.click(f);
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        covers.hide();
-        covers2.show();
-        covers2.click(f);
-        return this;
-    };
-    chart.push(bars, covers, covers2);
-    chart.bars = bars;
-    chart.covers = covers;
-    return chart;
-};
-/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.dotchart = function (x, y, width, height, valuesx, valuesy, size, opts) {
-    function drawAxis(ax) {
-        +ax[0] && (ax[0] = paper.g.axis(x + gutter, y + gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 2, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[1] && (ax[1] = paper.g.axis(x + width - gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 3, opts.axisylabels || null, opts.axisytype || "t"));
-        +ax[2] && (ax[2] = paper.g.axis(x + gutter, y + height - gutter + maxR, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[3] && (ax[3] = paper.g.axis(x + gutter - maxR, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 1, opts.axisylabels || null, opts.axisytype || "t"));
-    }
-    opts = opts || {};
-    var xdim = this.g.snapEnds(Math.min.apply(Math, valuesx), Math.max.apply(Math, valuesx), valuesx.length - 1),
-        minx = xdim.from,
-        maxx = xdim.to,
-        gutter = opts.gutter || 10,
-        ydim = this.g.snapEnds(Math.min.apply(Math, valuesy), Math.max.apply(Math, valuesy), valuesy.length - 1),
-        miny = ydim.from,
-        maxy = ydim.to,
-        len = Math.max(valuesx.length, valuesy.length, size.length),
-        symbol = this.g.markers[opts.symbol] || "disc",
-        res = this.set(),
-        series = this.set(),
-        max = opts.max || 100,
-        top = Math.max.apply(Math, size),
-        R = [],
-        paper = this,
-        k = Math.sqrt(top / Math.PI) * 2 / max;
-
-    for (var i = 0; i < len; i++) {
-        R[i] = Math.min(Math.sqrt(size[i] / Math.PI) * 2 / k, max);
-    }
-    gutter = Math.max.apply(Math, R.concat(gutter));
-    var axis = this.set(),
-        maxR = Math.max.apply(Math, R);
-    if (opts.axis) {
-        var ax = (opts.axis + "").split(/[,\s]+/);
-        drawAxis(ax);
-        var g = [], b = [];
-        for (var i = 0, ii = ax.length; i < ii; i++) {
-            var bb = ax[i].all ? ax[i].all.getBBox()[["height", "width"][i % 2]] : 0;
-            g[i] = bb + gutter;
-            b[i] = bb;
-        }
-        gutter = Math.max.apply(Math, g.concat(gutter));
-        for (var i = 0, ii = ax.length; i < ii; i++) if (ax[i].all) {
-            ax[i].remove();
-            ax[i] = 1;
-        }
-        drawAxis(ax);
-        for (var i = 0, ii = ax.length; i < ii; i++) if (ax[i].all) {
-            axis.push(ax[i].all);
-        }
-        res.axis = axis;
-    }
-    var kx = (width - gutter * 2) / ((maxx - minx) || 1),
-        ky = (height - gutter * 2) / ((maxy - miny) || 1);
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        var sym = this.raphael.is(symbol, "array") ? symbol[i] : symbol,
-            X = x + gutter + (valuesx[i] - minx) * kx,
-            Y = y + height - gutter - (valuesy[i] - miny) * ky;
-        sym && R[i] && series.push(this.g[sym](X, Y, R[i]).attr({fill: opts.heat ? this.g.colorValue(R[i], maxR) : Raphael.fn.g.colors[0], "fill-opacity": opts.opacity ? R[i] / max : 1, stroke: "none"}));
-    }
-    var covers = this.set();
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        var X = x + gutter + (valuesx[i] - minx) * kx,
-            Y = y + height - gutter - (valuesy[i] - miny) * ky;
-        covers.push(this.circle(X, Y, maxR).attr(this.g.shim));
-        opts.href && opts.href[i] && covers[i].attr({href: opts.href[i]});
-        covers[i].r = +R[i].toFixed(3);
-        covers[i].x = +X.toFixed(3);
-        covers[i].y = +Y.toFixed(3);
-        covers[i].X = valuesx[i];
-        covers[i].Y = valuesy[i];
-        covers[i].value = size[i] || 0;
-        covers[i].dot = series[i];
-    }
-    res.covers = covers;
-    res.series = series;
-    res.push(series, axis, covers);
-    res.hover = function (fin, fout) {
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    res.click = function (f) {
-        covers.click(f);
-        return this;
-    };
-    res.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    res.href = function (map) {
-        var cover;
-        for (var i = covers.length; i--;) {
-            cover = covers[i];
-            if (cover.X == map.x && cover.Y == map.y && cover.value == map.value) {
-                cover.attr({href: map.href});
-            }
-        }
-    };
-    return res;
-};
-/*!
- * g.Raphael 0.4.2 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.linechart = function (x, y, width, height, valuesx, valuesy, opts) {
-    function shrink(values, dim) {
-        var k = values.length / dim,
-            j = 0,
-            l = k,
-            sum = 0,
-            res = [];
-        while (j < values.length) {
-            l--;
-            if (l < 0) {
-                sum += values[j] * (1 + l);
-                res.push(sum / k);
-                sum = values[j++] * -l;
-                l += k;
-            } else {
-                sum += values[j++];
-            }
-        }
-        return res;
-    }
-    function getAnchors(p1x, p1y, p2x, p2y, p3x, p3y) {
-        var l1 = (p2x - p1x) / 2,
-            l2 = (p3x - p2x) / 2,
-            a = Math.atan((p2x - p1x) / Math.abs(p2y - p1y)),
-            b = Math.atan((p3x - p2x) / Math.abs(p2y - p3y));
-        a = p1y < p2y ? Math.PI - a : a;
-        b = p3y < p2y ? Math.PI - b : b;
-        var alpha = Math.PI / 2 - ((a + b) % (Math.PI * 2)) / 2,
-            dx1 = l1 * Math.sin(alpha + a),
-            dy1 = l1 * Math.cos(alpha + a),
-            dx2 = l2 * Math.sin(alpha + b),
-            dy2 = l2 * Math.cos(alpha + b);
-        return {
-            x1: p2x - dx1,
-            y1: p2y + dy1,
-            x2: p2x + dx2,
-            y2: p2y + dy2
-        };
-    }
-    opts = opts || {};
-    if (!this.raphael.is(valuesx[0], "array")) {
-        valuesx = [valuesx];
-    }
-    if (!this.raphael.is(valuesy[0], "array")) {
-        valuesy = [valuesy];
-    }
-    var gutter = opts.gutter || 10,
-        len = Math.max(valuesx[0].length, valuesy[0].length),
-        symbol = opts.symbol || "",
-        colors = opts.colors || Raphael.fn.g.colors,
-        that = this,
-        columns = null,
-        dots = null,
-        chart = this.set(),
-        path = [];
-
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        len = Math.max(len, valuesy[i].length);
-    }
-    var shades = this.set();
-    for (i = 0, ii = valuesy.length; i < ii; i++) {
-        if (opts.shade) {
-            shades.push(this.path().attr({stroke: "none", fill: colors[i], opacity: opts.nostroke ? 1 : .3}));
-        }
-        if (valuesy[i].length > width - 2 * gutter) {
-            valuesy[i] = shrink(valuesy[i], width - 2 * gutter);
-            len = width - 2 * gutter;
-        }
-        if (valuesx[i] && valuesx[i].length > width - 2 * gutter) {
-            valuesx[i] = shrink(valuesx[i], width - 2 * gutter);
-        }
-    }
-    var allx = Array.prototype.concat.apply([], valuesx),
-        ally = Array.prototype.concat.apply([], valuesy),
-        xdim = this.g.snapEnds(Math.min.apply(Math, allx), Math.max.apply(Math, allx), valuesx[0].length - 1);
-        if(opts.clip) {
-            var minx = opts.minx || xdim.from,
-                maxx = opts.maxx || xdim.to,
-                ydim = this.g.snapEnds(Math.min.apply(Math, ally), Math.max.apply(Math, ally), valuesy[0].length - 1),
-                miny = opts.miny || ydim.from,
-                maxy = opts.maxy || ydim.to;
-        } else {
-            var minx = opts.minx && Math.min(opts.minx, xdim.from) || xdim.from,
-                maxx = opts.maxx && Math.max(opts.maxx, xdimt.to) || xdim.to,
-                ydim = this.g.snapEnds(Math.min.apply(Math, ally), Math.max.apply(Math, ally), valuesy[0].length - 1),
-                miny = opts.miny && Math.min(opts.miny, ydim.from) || ydim.from,
-                maxy = opts.maxy && Math.max(opts.maxy, ydim.to) || ydim.to;
-        }
-        kx = (width - gutter * 2) / ((maxx - minx) || 1),
-        ky = (height - gutter * 2) / ((maxy - miny) || 1);
-
-    var lines = this.set(),
-        symbols = this.set(),
-        line;
-    for (i = 0, ii = valuesy.length; i < ii; i++) {
-        if (!opts.nostroke) {
-            lines.push(line = this.path().attr({
-                stroke: colors[i],
-                "stroke-width": opts.width || 2,
-                "stroke-linejoin": "round",
-                "stroke-linecap": "round",
-                "stroke-dasharray": opts.dash || ""
-            }));
-        }
-        var sym = this.raphael.is(symbol, "array") ? symbol[i] : symbol,
-            symset = this.set();
-        path = [];
-        for (var j = 0, jj = valuesy[i].length; j < jj; j++) {
-            var X = x + gutter + ((valuesx[i] || valuesx[0])[j] - minx) * kx,
-                Y = y + height - gutter - (valuesy[i][j] - miny) * ky;
-            (Raphael.is(sym, "array") ? sym[j] : sym) && symset.push(this.g[Raphael.fn.g.markers[this.raphael.is(sym, "array") ? sym[j] : sym]](X, Y, (opts.width || 2) * 3).attr({fill: colors[i], stroke: "none"}));
-            if (opts.smooth) {
-                if (j && j != jj - 1) {
-                    var X0 = x + gutter + ((valuesx[i] || valuesx[0])[j - 1] - minx) * kx,
-                        Y0 = y + height - gutter - (valuesy[i][j - 1] - miny) * ky,
-                        X2 = x + gutter + ((valuesx[i] || valuesx[0])[j + 1] - minx) * kx,
-                        Y2 = y + height - gutter - (valuesy[i][j + 1] - miny) * ky;
-                    var a = getAnchors(X0, Y0, X, Y, X2, Y2);
-                    path = path.concat([a.x1, a.y1, X, Y, a.x2, a.y2]);
-                }
-                if (!j) {
-                    path = ["M", X, Y, "C", X, Y];
-                }
-            } else {
-                path = path.concat([j ? "L" : "M", X, Y]);
-            }
-        }
-        if (opts.smooth) {
-            path = path.concat([X, Y, X, Y]);
-        }
-        symbols.push(symset);
-        if (opts.shade) {
-            shades[i].attr({path: path.concat(["L", X, y + height - gutter, "L",  x + gutter + ((valuesx[i] || valuesx[0])[0] - minx) * kx, y + height - gutter, "z"]).join(",")});
-        }
-        !opts.nostroke && line.attr({path: path.join(","), 'clip-rect': [x + gutter, y + gutter, width - 2 * gutter, height - 2 * gutter].join(",")});
-    }
-
-    function createColumns(f) {
-        // unite Xs together
-        var Xs = [];
-        for (var i = 0, ii = valuesx.length; i < ii; i++) {
-            Xs = Xs.concat(valuesx[i]);
-        }
-        Xs.sort(function(a,b) { return a - b; });
-        // remove duplicates
-        var Xs2 = [],
-            xs = [];
-        for (i = 0, ii = Xs.length; i < ii; i++) {
-            Xs[i] != Xs[i - 1] && Xs2.push(Xs[i]) && xs.push(x + gutter + (Xs[i] - minx) * kx);
-        }
-        Xs = Xs2;
-        ii = Xs.length;
-        var cvrs = f || that.set();
-        for (i = 0; i < ii; i++) {
-            var X = xs[i] - (xs[i] - (xs[i - 1] || x)) / 2,
-                w = ((xs[i + 1] || x + width) - xs[i]) / 2 + (xs[i] - (xs[i - 1] || x)) / 2,
-                C;
-            f ? (C = {}) : cvrs.push(C = that.rect(X - 1, y, Math.max(w + 1, 1), height).attr({stroke: "none", fill: "#000", opacity: 0}));
-            C.values = [];
-            C.symbols = that.set();
-            C.y = [];
-            C.x = xs[i];
-            C.axis = Xs[i];
-            for (var j = 0, jj = valuesy.length; j < jj; j++) {
-                Xs2 = valuesx[j] || valuesx[0];
-                for (var k = 0, kk = Xs2.length; k < kk; k++) {
-                    if (Xs2[k] == Xs[i]) {
-                        C.values.push(valuesy[j][k]);
-                        C.y.push(y + height - gutter - (valuesy[j][k] - miny) * ky);
-                        C.symbols.push(chart.symbols[j][k]);
-                    }
-                }
-            }
-            f && f.call(C);
-        }
-        !f && (columns = cvrs);
-    }
-    function createDots(f) {
-        var cvrs = f || that.set(),
-            C;
-        for (var i = 0, ii = valuesy.length; i < ii; i++) {
-            for (var j = 0, jj = valuesy[i].length; j < jj; j++) {
-                var X = x + gutter + ((valuesx[i] || valuesx[0])[j] - minx) * kx,
-                    nearX = x + gutter + ((valuesx[i] || valuesx[0])[j ? j - 1 : 1] - minx) * kx,
-                    Y = y + height - gutter - (valuesy[i][j] - miny) * ky;
-                f ? (C = {}) : cvrs.push(C = that.circle(X, Y, Math.abs(nearX - X) / 2).attr({stroke: "none", fill: "#000", opacity: 0}));
-                C.x = X;
-                C.y = Y;
-                C.value = valuesy[i][j];
-                C.line = chart.lines[i];
-                C.shade = chart.shades[i];
-                C.symbol = chart.symbols[i][j];
-                C.symbols = chart.symbols[i];
-                C.axis = (valuesx[i] || valuesx[0])[j];
-                f && f.call(C);
-            }
-        }
-        !f && (dots = cvrs);
-    }
-
-    var axis = this.set();
-    if (opts.axis) {
-        var ax = (opts.axis + "").split(/[,\s]+/);
-        +ax[0] && axis.push(this.g.axis(x + gutter, y + gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 2, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[1] && axis.push(this.g.axis(x + width - gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 3, opts.axisylabels || null, opts.axisytype || "t"));
-        +ax[2] && axis.push(this.g.axis(x + gutter, y + height - gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[3] && axis.push(this.g.axis(x + gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 1, opts.axisylabels || null, opts.axisytype || "t"));
-    }
-
-    chart.push(lines, shades, symbols, axis, columns, dots);
-    chart.lines = lines;
-    chart.shades = shades;
-    chart.symbols = symbols;
-    chart.axis = axis;
-    chart.hoverColumn = function (fin, fout) {
-        !columns && createColumns();
-        columns.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        !columns && createColumns();
-        columns.click(f);
-        return this;
-    };
-    chart.hrefColumn = function (cols) {
-        var hrefs = that.raphael.is(arguments[0], "array") ? arguments[0] : arguments;
-        if (!(arguments.length - 1) && typeof cols == "object") {
-            for (var x in cols) {
-                for (var i = 0, ii = columns.length; i < ii; i++) if (columns[i].axis == x) {
-                    columns[i].attr("href", cols[x]);
-                }
-            }
-        }
-        !columns && createColumns();
-        for (i = 0, ii = hrefs.length; i < ii; i++) {
-            columns[i] && columns[i].attr("href", hrefs[i]);
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        !dots && createDots();
-        dots.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.click = function (f) {
-        !dots && createDots();
-        dots.click(f);
-        return this;
-    };
-    chart.each = function (f) {
-        createDots(f);
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        createColumns(f);
-        return this;
-    };
-    return chart;
-};
-/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.piechart = function (cx, cy, r, values, opts) {
-    opts = opts || {};
-    var paper = this,
-        sectors = [],
-        covers = this.set(),
-        chart = this.set(),
-        series = this.set(),
-        order = [],
-        len = values.length,
-        angle = 0,
-        total = 0,
-        others = 0,
-        cut = 9,
-        defcut = true;
-
-    var sum = 0;
-    for (var i = 0; i < len; i++)
-        sum += values[i];
-    var single = false;
-    var single_index = -1;
-    for (var i = 0; i < len; i++)
-        if (sum == values[i]) {
-            single = true;
-            single_index = i;
-            break;
-        }
-    if (len == 1 || single == true) {
-        for(var i = 0; i < len; i++) {
-            var radius = 0.1;
-            if (i == single_index) {
-                radius = r;
-            }
-            series.push(this.circle(cx, cy, radius).attr({fill: opts.colors && opts.colors[i] || this.g.colors[i], stroke: opts.stroke || "#fff", "stroke-width": opts.strokewidth == null ? 1 : opts.strokewidth}));
-            covers.push(this.circle(cx, cy, radius).attr({href: opts.href ? opts.href[i] : null}).attr(this.g.shim));
-            values[i] = {value: values[i], order: i, valueOf: function () { return this.value; }};
-            series[i].middle = {x: cx, y: cy};
-            series[i].mangle = 180;
-        }
-        total = values[single_index];
-    } else {
-        function sector(cx, cy, r, startAngle, endAngle, fill) {
-            var rad = Math.PI / 180,
-                x1 = cx + r * Math.cos(-startAngle * rad),
-                x2 = cx + r * Math.cos(-endAngle * rad),
-                xm = cx + r / 2 * Math.cos(-(startAngle + (endAngle - startAngle) / 2) * rad),
-                y1 = cy + r * Math.sin(-startAngle * rad),
-                y2 = cy + r * Math.sin(-endAngle * rad),
-                ym = cy + r / 2 * Math.sin(-(startAngle + (endAngle - startAngle) / 2) * rad),
-                res = ["M", cx, cy, "L", x1, y1, "A", r, r, 0, +(Math.abs(endAngle - startAngle) > 180), 1, x2, y2, "z"];
-            res.middle = {x: xm, y: ym};
-            return res;
-        }
-        for (var i = 0; i < len; i++) {
-            total += values[i];
-            values[i] = {value: values[i], order: i, valueOf: function () { return this.value; }};
-        }
-        values.sort(function (a, b) {
-            return b.value - a.value;
-        });
-        for (i = 0; i < len; i++) {
-            if (defcut && values[i] * 360 / total <= 1.5) {
-                cut = i;
-                defcut = false;
-            }
-            if (i > cut) {
-                defcut = false;
-                values[cut].value += values[i];
-                values[cut].others = true;
-                others = values[cut].value;
-            }
-        }
-        len = Math.min(cut + 1, values.length);
-        others && values.splice(len) && (values[cut].others = true);
-        for (i = 0; i < len; i++) {
-            var valueOrder = values[i].order;
-            var mangle = angle - 360 * values[i] / total / 2;
-            if (!i) {
-                angle = 90 - mangle;
-                mangle = angle - 360 * values[i] / total / 2;
-            }
-            if (opts.init) {
-                var ipath = sector(cx, cy, 1, angle, angle - 360 * values[i] / total).join(",");
-            }
-            var path = sector(cx, cy, r, angle, angle -= 360 * values[i] / total);
-            var p = this.path(opts.init ? ipath : path).attr({fill: opts.colors && opts.colors[valueOrder] || this.g.colors[valueOrder] || "#666", stroke: opts.stroke || "#fff", "stroke-width": (opts.strokewidth == null ? 1 : opts.strokewidth), "stroke-linejoin": "round"});
-            p.value = values[i];
-            p.middle = path.middle;
-            p.mangle = mangle;
-            sectors.push(p);
-            series.push(p);
-            opts.init && p.animate({path: path.join(",")}, (+opts.init - 1) || 1000, ">");
-        }
-        for (i = 0; i < len; i++) {
-            p = paper.path(sectors[i].attr("path")).attr(this.g.shim);
-            var valueOrder = values[i].order;
-            opts.href && opts.href[valueOrder] && p.attr({href: opts.href[valueOrder]});
-            //p.attr = function () {}; // this breaks translate!
-            covers.push(p);
-        }
-    }
-
-    chart.hover = function (fin, fout) {
-        fout = fout || function () {};
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    mx: sector.middle.x,
-                    my: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                cover.mouseover(function () {
-                    fin.call(o);
-                }).mouseout(function () {
-                    fout.call(o);
-                });
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    // x: where label could be put
-    // y: where label could be put
-    // value: value to show
-    // total: total number to count %
-    chart.each = function (f) {
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    x: sector.middle.x,
-                    y: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                f.call(o);
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    chart.click = function (f) {
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    mx: sector.middle.x,
-                    my: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                cover.click(function () { f.call(o); });
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    chart.inject = function (element) {
-        element.insertBefore(covers[0]);
-    };
-    var legend = function (labels, otherslabel, mark, dir) {
-        var x = cx + r + r / 5,
-            y = cy,
-            h = y + 10;
-        labels = labels || [];
-        dir = (dir && dir.toLowerCase && dir.toLowerCase()) || "east";
-        mark = paper.g.markers[mark && mark.toLowerCase()] || "disc";
-        chart.labels = paper.set();
-        for (var i = 0; i < len; i++) {
-            var clr = series[i].attr("fill"),
-                j = values[i].order,
-                txt;
-            values[i].others && (labels[j] = otherslabel || "Others");
-            labels[j] = paper.g.labelise(labels[j], values[i], total);
-            chart.labels.push(paper.set());
-            chart.labels[i].push(paper.g[mark](x + 5, h, 5).attr({fill: clr, stroke: "none"}));
-            chart.labels[i].push(txt = paper.text(x + 20, h, labels[j] || values[j]).attr(paper.g.txtattr).attr({fill: opts.legendcolor || "#000", "text-anchor": "start"}));
-            covers[i].label = chart.labels[i];
-            h += txt.getBBox().height * 1.2;
-        }
-        var bb = chart.labels.getBBox(),
-            tr = {
-                east: [0, -bb.height / 2],
-                west: [-bb.width - 2 * r - 20, -bb.height / 2],
-                north: [-r - bb.width / 2, -r - bb.height - 10],
-                south: [-r - bb.width / 2, r + 10]
-            }[dir];
-        chart.labels.translate.apply(chart.labels, tr);
-        chart.push(chart.labels);
-    };
-    if (opts.legend) {
-        legend(opts.legend, opts.legendothers, opts.legendmark, opts.legendpos);
-    }
-    chart.push(series, covers);
-    chart.series = series;
-    chart.covers = covers;
-    
-    var w = paper.width,
-        h = paper.height,
-        bb = chart.getBBox(),
-        tr = [(w - bb.width)/2 - bb.x, (h - bb.height)/2 - bb.y];
-    cx += tr[0];
-    cy += tr[1];
-    chart.translate.apply(chart, tr);
-    return chart;
-};
-
-/*!
- * date-range-parser.js
- * Contributed to the Apache Software Foundation by:
- *    Ben Birch - Aconex
- * fork me at https://github.com/mobz/date-range-parser
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-
-*/
-
-(function() {
-
-	var drp = window.dateRangeParser = {};
-
-	drp.defaultRange = 1000 * 60 * 60 * 24;
-
-	drp.now = null; // set a different value for now than the time at function invocation
-
-	drp.parse = function(v) {
-		try {
-			var r = drp._parse(v);
-			r.end && r.end--; // remove 1 millisecond from the final end range
-		} catch(e) {
-			r = null;
-		}
-		return r;
-	};
-
-	drp.print = function(t, p) {
-		var format = ["", "-", "-", " ", ":", ":", "."];
-		var da = makeArray(t);
-		var str = "";
-		for(var i = 0; i <= p; i++) {
-			str += format[i] + (da[i] < 10 ? "0" : "") + da[i];
-		}
-		return str;
-	};
-
-	(function() {
-		drp._relTokens = {};
-
-		var values = {
-			"yr"  : 365*24*60*60*1000,
-			"mon" : 31*24*60*60*1000,
-			"day" : 24*60*60*1000,
-			"hr"  : 60*60*1000,
-			"min" : 60*1000,
-			"sec" : 1000
-		};
-
-		var alias_lu = {
-			"yr" : "y,yr,yrs,year,years",
-			"mon" : "mo,mon,mos,mons,month,months",
-			"day" : "d,dy,dys,day,days",
-			"hr" : "h,hr,hrs,hour,hours",
-			"min" : "m,min,mins,minute,minutes",
-			"sec" : "s,sec,secs,second,seconds"
-		};
-
-		for(var key in alias_lu) {
-			if(alias_lu.hasOwnProperty(key)) {
-				var aliases = alias_lu[key].split(",");
-				for(var i = 0; i < aliases.length; i++) {
-					drp._relTokens[aliases[i]] = values[key];
-				}
-			}
-		}
-	})();
-
-	function makeArray(d) {
-		var da = new Date(d);
-		return [ da.getUTCFullYear(), da.getUTCMonth()+1, da.getUTCDate(), da.getUTCHours(), da.getUTCMinutes(), da.getUTCSeconds(), da.getUTCMilliseconds() ];
-	}
-
-	function fromArray(a) {
-		var d = [].concat(a); d[1]--;
-		return Date.UTC.apply(null, d);
-	}
-
-	drp._parse = function parse(v) {
-		var now = this.now || new Date().getTime();
-
-		function precArray(d, p, offset) {
-			var tn = makeArray(d);
-			tn[p] += offset || 0;
-			for(var i = p+1; i < 7; i++) {
-				tn[i] = i < 3 ? 1 : 0;
-			}
-			return tn;
-		}
-		function makePrecRange(dt, p, r) {
-			var ret = { };
-			ret.start = fromArray(dt);
-			dt[p] += r || 1;
-			ret.end = fromArray(dt);
-			return ret;
-		}
-		function procTerm(term) {
-			var m = term.replace(/\s/g, "").toLowerCase().match(/^([a-z ]+)$|^([ 0-9:-]+)$|^(\d+[a-z]+)$/);
-			if(m[1]) {	// matches ([a-z ]+)
-				function dra(p, o, r) {
-					var dt = precArray(now, p, o);
-					if(r) {
-						dt[2] -= new Date(fromArray(dt)).getUTCDay();
-					}
-					return makePrecRange(dt, p, r);
-				}
-				switch( m[1]) {
-					case "now" : return { start: now, end: now, now: now };
-					case "today" : return dra( 2, 0 );
-					case "thisweek" : return dra( 2, 0, 7 );
-					case "thismonth" : return dra( 1, 0 );
-					case "thisyear" : return dra( 0, 0 );
-					case "yesterday" : return dra( 2, -1 );
-					case "lastweek" : return dra( 2, -7, 7 );
-					case "lastmonth" : return dra( 1, -1 );
-					case "lastyear" : return dra( 0, -1 );
-					case "tomorrow" : return dra( 2, 1 );
-					case "nextweek" : return dra( 2, 7, 7 );
-					case "nextmonth" : return dra( 1, 1 );
-					case "nextyear" : return dra(0, 1 );
-				}
-				throw "unknown token " +  m[1];
-			} else if(m[2]) { // matches ([ 0-9:-]+)
-				dn = makeArray(now);
-				var dt = m[2].match(/^(?:(\d{4})(?:\-(\d\d))?(?:\-(\d\d))?)? ?(?:(\d{1,2})(?:\:(\d\d)(?:\:(\d\d))?)?)?$/);
-				dt.shift();
-				for(var p = 0, z = false, i = 0; i < 7; i++) {
-					if(dt[i]) {
-						dn[i] = parseInt(dt[i], 10);
-						p = i;
-						z = true;
-					} else {
-						if(z)
-							dn[i] = i < 3 ? 1 : 0;
-					}
-				}
-				return makePrecRange(dn, p);
-			} else if(m[3]) { // matches (\d+[a-z]{1,4})
-				var dr = m[3].match(/(\d+)\s*([a-z]+)/i);
-				var n = parseInt(dr[1], 10);
-				return { rel: n * drp._relTokens[dr[2]] };
-			}
-			throw "unknown term " + term;
-		}
-
-		if(!v) {
-			return { start: null, end: null };
-		}
-		var terms = v.split(/\s*([^<>]*[^<>-])?\s*(->|<>|<)?\s*([^<>]+)?\s*/);
-
-		var term1 = terms[1] ? procTerm(terms[1]) : null;
-		var op = terms[2] || "";
-		var term2 = terms[3] ? procTerm(terms[3]) : null;
-
-		if(op === "<" || op === "->" ) {
-			if(term1 && !term2) {
-				return { start: term1.start, end: null };
-			} else if(!term1 && term2) {
-				return { start: null, end: term2.end };
-			} else {
-				if(term2.rel) {
-					return { start: term1.start, end: term1.end + term2.rel };
-				} else if(term1.rel) {
-					return { start: term2.start - term1.rel, end: term2.end };
-				} else {
-					return { start: term1.start, end: term2.end };
-				}
-			}
-		} else if(op === "<>") {
-			if(!term2) {
-				return { start: term1.start - drp.defaultRange, end: term1.end + drp.defaultRange }
-			} else {
-				if(! ("rel" in term2)) throw "second term did not hav a range";
-				return { start: term1.start - term2.rel, end: term1.end + term2.rel };
-			}
-		} else {
-			if(term1.rel) {
-				return { start: now - term1.rel, end: now + term1.rel };
-			} else if(term1.now) {
-				return { start: term1.now - drp.defaultRange, end: term1.now + drp.defaultRange };
-			} else {
-				return { start: term1.start, end: term1.end };
-			}
-		}
-		throw "could not process value " + v;
-	};
-})();
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/elasticsearch-head.sublime-project b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/elasticsearch-head.sublime-project
deleted file mode 100644
index 16bb2d88b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/elasticsearch-head.sublime-project
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"folders":
-	[
-		{
-			"path": ".",
-			"folder_exclude_patterns": [ "node_modules", "_site" ]
-		}
-	]
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/grunt_fileSets.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/grunt_fileSets.js
deleted file mode 100644
index 9d02c79b4..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/grunt_fileSets.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-exports.vendorJs = [
-	'src/vendor/jquery/jquery.js',
-	'src/vendor/joey/joey.js',
-	'src/vendor/nohtml/jquery-nohtml.js',
-	'src/vendor/graphael/g.raphael.standalone.js',
-	'src/vendor/dateRangeParser/date-range-parser.js'
-];
-
-exports.vendorCss = [
-	'src/vendor/font-awesome/css/font-awesome.css'
-];
-
-exports.srcJs = [
-	'src/app/base/boot.js',
-
-	'src/app/ux/class.js',
-	'src/app/ux/templates/templates.js',
-	'src/app/ux/observable.js',
-	'src/app/ux/singleton.js',
-	'src/app/ux/dragdrop.js',
-	'src/app/ux/fieldCollection.js',
-
-	'src/app/data/model/model.js',
-	'src/app/data/dataSourceInterface.js',
-	'src/app/data/resultDataSourceInterface.js',
-	'src/app/data/metaData.js',
-	'src/app/data/metaDataFactory.js',
-	'src/app/data/query.js',
-	'src/app/data/queryDataSourceInterface.js',
-	'src/app/data/boolQuery.js',
-
-	'src/app/services/preferences/preferences.js',
-	'src/app/services/cluster/cluster.js',
-	'src/app/services/clusterState/clusterState.js',
-
-	'src/app/ui/abstractWidget/abstractWidget.js',
-	'src/app/ui/abstractField/abstractField.js',
-	'src/app/ui/textField/textField.js',
-	'src/app/ui/checkField/checkField.js',
-	'src/app/ui/button/button.js',
-	'src/app/ui/menuButton/menuButton.js',
-	'src/app/ui/splitButton/splitButton.js',
-	'src/app/ui/refreshButton/refreshButton.js',
-	'src/app/ui/toolbar/toolbar.js',
-	'src/app/ui/abstractPanel/abstractPanel.js',
-	'src/app/ui/draggablePanel/draggablePanel.js',
-	'src/app/ui/infoPanel/infoPanel.js',
-	'src/app/ui/dialogPanel/dialogPanel.js',
-	'src/app/ui/menuPanel/menuPanel.js',
-	'src/app/ui/selectMenuPanel/selectMenuPanel.js',
-	'src/app/ui/table/table.js',
-	'src/app/ui/csvTable/csvTable.js',
-	'src/app/ui/jsonPretty/jsonPretty.js',
-	'src/app/ui/panelForm/panelForm.js',
-	'src/app/ui/helpPanel/helpPanel.js',
-	'src/app/ui/jsonPanel/jsonPanel.js',
-	'src/app/ui/sidebarSection/sidebarSection.js',
-	'src/app/ui/resultTable/resultTable.js',
-	'src/app/ui/queryFilter/queryFilter.js',
-	'src/app/ui/page/page.js',
-	'src/app/ui/browser/browser.js',
-	'src/app/ui/anyRequest/anyRequest.js',
-	'src/app/ui/nodesView/nodesView.js',
-	'src/app/ui/clusterOverview/clusterOverview.js',
-	'src/app/ui/dateHistogram/dateHistogram.js',
-	'src/app/ui/clusterConnect/clusterConnect.js',
-	'src/app/ui/structuredQuery/structuredQuery.js',
-	'src/app/ui/filterBrowser/filterBrowser.js',
-	'src/app/ui/indexSelector/indexSelector.js',
-	'src/app/ui/header/header.js',
-	'src/app/ui/indexOverview/indexOverview.js',
-
-	'src/app/app.js'
-];
-
-exports.srcCss = [
-	'src/app/ux/table.css',
-	'src/app/ui/abstractField/abstractField.css',
-	'src/app/ui/button/button.css',
-	'src/app/ui/menuButton/menuButton.css',
-	'src/app/ui/splitButton/splitButton.css',
-	'src/app/ui/toolbar/toolbar.css',
-	'src/app/ui/abstractPanel/abstractPanel.css',
-	'src/app/ui/infoPanel/infoPanel.css',
-	'src/app/ui/menuPanel/menuPanel.css',
-	'src/app/ui/selectMenuPanel/selectMenuPanel.css',
-	'src/app/ui/table/table.css',
-	'src/app/ui/jsonPretty/jsonPretty.css',
-	'src/app/ui/jsonPanel/jsonPanel.css',
-	'src/app/ui/panelForm/panelForm.css',
-	'src/app/ui/sidebarSection/sidebarSection.css',
-	'src/app/ui/queryFilter/queryFilter.css',
-	'src/app/ui/browser/browser.css',
-	'src/app/ui/anyRequest/anyRequest.css',
-	'src/app/ui/nodesView/nodesView.css',
-	'src/app/ui/clusterOverview/clusterOverview.css',
-	'src/app/ui/clusterConnect/clusterConnect.css',
-	'src/app/ui/structuredQuery/structuredQuery.css',
-	'src/app/ui/filterBrowser/filterBrowser.css',
-	'src/app/ui/header/header.css',
-	'src/app/app.css'
-];
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/index.html b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/index.html
deleted file mode 100644
index 8b5c3ee9d..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>elasticsearch-head</title>
-		<link rel="stylesheet" href="_site/base/reset.css">
-		<link rel="stylesheet" href="_site/vendor.css">
-		<link rel="stylesheet" href="_site/app.css">
-		<script src="_site/i18n.js" data-baseDir="_site/lang" data-langs="en,fr,pt,zh,tr"></script>
-		<script src="_site/vendor.js"></script>
-		<script src="_site/app.js"></script>
-		<script>
-			window.onload = function() {
-				if(location.href.contains("/_plugin/")) {
-					var base_uri = location.href.replace(/_plugin\/.*/, '');
-				}
-				var args = location.search.substring(1).split("&").reduce(function(r, p) {
-					r[decodeURIComponent(p.split("=")[0])] = decodeURIComponent(p.split("=")[1]); return r;
-				}, {});
-				new app.App("body", {
-					id: "es",
-					base_uri: args["base_uri"] || base_uri,
-					auth_user : args["auth_user"] || "",
-					auth_password : args["auth_password"],
-					dashboard: args["dashboard"]
-				});
-			};
-		</script>
-		<link rel="icon" href="base/favicon.png" type="image/png">
-	</head>
-	<body></body>
-</html>
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/package.json b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/package.json
deleted file mode 100644
index 4aefb7a11..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "elasticsearch-head",
-  "version": "0.0.0",
-  "description": "Front end for an elasticsearch cluster",
-  "main": "_site/index.html",
-  "directories": {
-    "test": "test"
-  },
-  "scripts": {
-    "test": "grunt jasmine"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mobz/elasticsearch-head.git"
-  },
-  "author": "",
-  "license": "Apache2",
-  "gitHead": "0c2ac0b5723b493e4454baa7398f386ecb829412",
-  "readmeFilename": "README.textile",
-  "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-contrib-concat": "0.4.0",
-    "grunt-contrib-watch": "0.5.1",
-    "grunt-contrib-connect": "0.3.0",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-jasmine": "0.6.4",
-    "karma": "0.12.16",
-    "grunt-karma": "0.8.3"
-  }
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/plugin-descriptor.properties b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/plugin-descriptor.properties
deleted file mode 100644
index 37a90649c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/plugin-descriptor.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-description=head - A web front end for an elastic search cluster
-version=master
-site=true
-name=head
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.css
deleted file mode 100644
index 08e2dcf95..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.uiApp-header {
-	background: #eee;
-	position: fixed;
-	width: 100%;
-	z-index: 9;
-}
-
-.uiApp-header H1 {
-	margin: -2px 0 -4px 0;
-	float: left;
-	padding-right: 25px;
-}
-
-.uiApp-headerMenu {
-	border-bottom: 1px solid #bbb;
-	padding: 0px 3px;
-	height: 22px;
-}
-
-.uiApp-headerMenu .active {
-	background: white;
-	border-bottom-color: white;
-}
-
-.uiApp-headerMenuItem {
-	border: 1px solid #bbb;
-	padding: 4px 8px 1px ;
-	margin: 2px 1px 0;
-	height: 14px;
-	cursor: pointer;
-}
-
-.uiApp-body {
-	padding: 51px 0px 0px 0px;
-}
-
-.uiApp-headerNewMenuItem {
-	color: blue;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.js
deleted file mode 100644
index 0b8729eb9..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/app.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	app.App = ui.AbstractWidget.extend({
-		defaults: {
-			base_uri: null
-		},
-		init: function(parent) {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.base_uri = this.config.base_uri || this.prefs.get("app-base_uri") || "http://localhost:9200";
-			if( this.base_uri.charAt( this.base_uri.length - 1 ) !== "/" ) {
-				// XHR request fails if the URL is not ending with a "/"
-				this.base_uri += "/";
-			}
-			if( this.config.auth_user ) {
-				var credentials = window.btoa( this.config.auth_user + ":" + this.config.auth_password );
-				$.ajaxSetup({
-					headers: {
-						"Authorization": "Basic " + credentials
-					}
-				});
-			}
-			this.cluster = new services.Cluster({ base_uri: this.base_uri });
-			this._clusterState = new services.ClusterState({
-				cluster: this.cluster
-			});
-
-			this._header = new ui.Header({ cluster: this.cluster, clusterState: this._clusterState });
-			this.$body = $.joey( this._body_template() );
-			this.el = $.joey(this._main_template());
-			this.attach( parent );
-			this.instances = {};
-			this.el.find(".uiApp-headerMenuItem:first").click();
-			if( this.config.dashboard ) {
-				if( this.config.dashboard === "cluster" ) {
-					var page = this.instances["ClusterOverview"];
-					page._refreshButton.set( 5000 );
-				}
-			}
-		},
-
-		navigateTo: function( type, config, ev ) {
-			if( ev.target.classList.contains( "uiApp-headerNewMenuItem" ) ) {
-				this.showNew( type, config, ev );
-			} else {
-				var ref = type + "0";
-				if(! this.instances[ ref ]) {
-					this.createPage( type, 0, config );
-				}
-				this.show( ref, ev );
-			}
-		},
-
-		createPage: function( type, id, config ) {
-			var page = this.instances[ type + id ] = new ui[ type ]( config );
-			this.$body.append( page );
-			return page;
-		},
-
-		show: function( ref, ev ) {
-			$( ev.target ).closest("DIV.uiApp-headerMenuItem").addClass("active").siblings().removeClass("active");
-			for(var p in this.instances) {
-				this.instances[p][ p === ref ? "show" : "hide" ]();
-			}
-		},
-
-		showNew: function( type, config, jEv ) {
-			var ref, page, $tab,
-				type_index = 0;
-
-			while ( ! page ) {
-				ref = type + ( ++type_index );
-				if (! ( ref in this.instances ) ) {
-					page = this.createPage( type, type_index, config );
-				}
-			}
-
-			// Add the tab and its click handlers
-			$tab = $.joey({
-				tag: "DIV",
-				cls: "uiApp-headerMenuItem pull-left",
-				text: i18n.text("Nav." + type ) + " " + type_index,
-				onclick: function( ev ) { this.show( ref, ev ); }.bind(this),
-				children: [
-					{ tag: "A", text: " [-]", onclick: function (ev) {
-						$tab.remove();
-						page.remove();
-						delete this.instances[ ref ];
-					}.bind(this) }
-				]
-			});
-
-			$('.uiApp-headerMenu').append( $tab );
-			$tab.trigger("click");
-		},
-
-		_openAnyRequest_handler: function(ev) { this.navigateTo("AnyRequest", { cluster: this.cluster }, ev ); },
-		_openStructuredQuery_handler: function(ev) { this.navigateTo("StructuredQuery", { cluster: this.cluster }, ev ); },
-		_openBrowser_handler: function(ev) { this.navigateTo("Browser", { cluster: this.cluster }, ev );  },
-		_openClusterOverview_handler: function(ev) { this.navigateTo("ClusterOverview", { cluster: this.cluster, clusterState: this._clusterState }, ev ); },
-		_openIndexOverview_handler: function(ev) { this.navigateTo("IndexOverview", { cluster: this.cluster, clusterState: this._clusterState }, ev ); },
-
-		_body_template: function() { return (
-			{ tag: "DIV", id: this.id("body"), cls: "uiApp-body" }
-		); },
-
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiApp", children: [
-				{ tag: "DIV", id: this.id("header"), cls: "uiApp-header", children: [
-					this._header,
-					{ tag: "DIV", cls: "uiApp-headerMenu", children: [
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Overview"), onclick: this._openClusterOverview_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Indices"), onclick: this._openIndexOverview_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.Browser"), onclick: this._openBrowser_handler },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.StructuredQuery"), onclick: this._openStructuredQuery_handler, children: [
-							{ tag: "A", cls: "uiApp-headerNewMenuItem ", text: ' [+]' }
-						] },
-						{ tag: "DIV", cls: "uiApp-headerMenuItem pull-left", text: i18n.text("Nav.AnyRequest"), onclick: this._openAnyRequest_handler, children: [
-							{ tag: "A", cls: "uiApp-headerNewMenuItem ", text: ' [+]' }
-						] },
-					]}
-				]},
-				this.$body
-			]};
-		}
-		
-	});
-
-})( this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/boot.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/boot.js
deleted file mode 100644
index 46bd9341b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/boot.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function() {
-
-	var window = this,
-		$ = jQuery;
-
-	function ns( namespace ) {
-		return (namespace || "").split(".").reduce( function( space, name ) {
-			return space[ name ] || ( space[ name ] = { ns: ns } );
-		}, this );
-	}
-
-	var app = ns("app");
-
-	var acx = ns("acx");
-
-	/**
-	 * object iterator, returns an array with one element for each property of the object
-	 * @function
-	 */
-	acx.eachMap = function(obj, fn, thisp) {
-		var ret = [];
-		for(var n in obj) {
-			ret.push(fn.call(thisp, n, obj[n], obj));
-		}
-		return ret;
-	};
-
-	/**
-	 * augments the first argument with the properties of the second and subsequent arguments
-	 * like {@link $.extend} except that existing properties are not overwritten
-	 */
-	acx.augment = function() {
-		var args = Array.prototype.slice.call(arguments),
-			src = (args.length === 1) ? this : args.shift(),
-			augf = function(n, v) {
-				if(! (n in src)) {
-					src[n] = v;
-				}
-			};
-		for(var i = 0; i < args.length; i++) {
-			$.each(args[i], augf);
-		}
-		return src;
-	};
-
-	/**
-	 * tests whether the argument is an array
-	 * @function
-	 */
-	acx.isArray = $.isArray;
-
-	/**
-	 * tests whether the argument is an object
-	 * @function
-	 */
-	acx.isObject = function (value) {
-		return Object.prototype.toString.call(value) == "[object Object]";
-	};
-
-	/**
-	 * tests whether the argument is a function
-	 * @function
-	 */
-	acx.isFunction = $.isFunction;
-
-	/**
-	 * tests whether the argument is a date
-	 * @function
-	 */
-	acx.isDate = function (value) {
-		return Object.prototype.toString.call(value) == "[object Date]";
-	};
-
-	/**
-	 * tests whether the argument is a regexp
-	 * @function
-	 */
-	acx.isRegExp = function (value) {
-		return Object.prototype.toString.call(value) == "[object RegExp]";
-	};
-
-	/**
-	 * tests whether the value is blank or empty
-	 * @function
-	 */
-	acx.isEmpty = function (value, allowBlank) {
-		return value === null || value === undefined || ((acx.isArray(value) && !value.length)) || (!allowBlank ? value === '' : false);
-	};
-
-	/**
-	 * data type for performing chainable geometry calculations<br>
-	 * can be initialised x,y | {x, y} | {left, top}
-	 */
-	acx.vector = function(x, y) {
-		return new acx.vector.prototype.Init(x, y);
-	};
-
-	acx.vector.prototype = {
-		Init : function(x, y) {
-			x = x || 0;
-			this.y = isFinite(x.y) ? x.y : (isFinite(x.top) ? x.top : (isFinite(y) ? y : 0));
-			this.x = isFinite(x.x) ? x.x : (isFinite(x.left) ? x.left : (isFinite(x) ? x : 0));
-		},
-		
-		add : function(i, j) {
-			var d = acx.vector(i, j);
-			return new this.Init(this.x + d.x, this.y + d.y);
-		},
-		
-		sub : function(i, j) {
-			var d = acx.vector(i, j);
-			return new this.Init(this.x - d.x, this.y - d.y);
-		},
-		
-		addX : function(i) {
-			return new this.Init(this.x + i, this.y);
-		},
-		
-		addY : function(j) {
-			return new this.Init(this.x, this.y + j);
-		},
-
-		mod : function(fn) { // runs a function against the x and y values
-			return new this.Init({x: fn.call(this, this.x, "x"), y: fn.call(this, this.y, "y")});
-		},
-		
-		/** returns true if this is within a rectangle formed by the points p and q */
-		within : function(p, q) {
-			return ( this.x >= ((p.x < q.x) ? p.x : q.x) && this.x <= ((p.x > q.x) ? p.x : q.x) &&
-					this.y >= ((p.y < q.y) ? p.y : q.y) && this.y <= ((p.y > q.y) ? p.y : q.y) );
-		},
-		
-		asOffset : function() {
-			return { top: this.y, left: this.x };
-		},
-		
-		asSize : function() {
-			return { height: this.y, width: this.x };
-		}
-	};
-
-	acx.vector.prototype.Init.prototype = acx.vector.prototype;
-
-	/**
-	 * short cut functions for working with vectors and jquery.
-	 * Each function returns the equivalent jquery value in a two dimentional vector
-	 */
-	$.fn.vSize = function() { return acx.vector(this.width(), this.height()); };
-	$.fn.vOuterSize = function(margin) { return acx.vector(this.outerWidth(margin), this.outerHeight(margin)); };
-	$.fn.vScroll = function() { return acx.vector(this.scrollLeft(), this.scrollTop()); };
-	$.fn.vOffset = function() { return acx.vector(this.offset()); };
-	$.fn.vPosition = function() { return acx.vector(this.position()); };
-	$.Event.prototype.vMouse = function() { return acx.vector(this.pageX, this.pageY); };
-
-	/**
-	 * object extensions (ecma5 compatible)
-	 */
-	acx.augment(Object, {
-		keys: function(obj) {
-			var ret = [];
-			for(var n in obj) if(Object.prototype.hasOwnProperty.call(obj, n)) ret.push(n);
-			return ret;
-		}
-	});
-
-	/**
-	 * Array prototype extensions
-	 */
-	acx.augment(Array.prototype, {
-		'contains' : function(needle) {
-			return this.indexOf(needle) !== -1;
-		},
-
-		// returns a new array consisting of all the members that are in both arrays
-		'intersection' : function(b) {
-			var ret = [];
-			for(var i = 0; i < this.length; i++) {
-				if(b.contains(this[i])) {
-					ret.push(this[i]);
-				}
-			}
-			return ret;
-		},
-		
-		'remove' : function(value) {
-			var i = this.indexOf(value);
-			if(i !== -1) {
-				this.splice(i, 1);
-			}
-		}
-	});
-
-	/**
-	 * String prototype extensions
-	 */
-	acx.augment(String.prototype, {
-		'contains' : function(needle) {
-			return this.indexOf(needle) !== -1;
-		},
-
-		'equalsIgnoreCase' : function(match) {
-			return this.toLowerCase() === match.toLowerCase();
-		},
-
-		'escapeHtml' : function() {
-			return this.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-		},
-
-		'escapeJS' : function() {
-			var meta = {'"':'\\"', '\\':'\\\\', '/':'\\/', '\b':'\\b', '\f':'\\f', '\n':'\\n', '\r':'\\r', '\t':'\\t'},
-				xfrm = function(c) { return meta[c] || "\\u" + c.charCodeAt(0).toString(16).zeroPad(4); };
-			return this.replace(new RegExp('(["\\\\\x00-\x1f\x7f-\uffff])', 'g'), xfrm);
-		},
-
-		'escapeRegExp' : function() {
-			var ret = "", esc = "\\^$*+?.()=|{,}[]-";
-			for ( var i = 0; i < this.length; i++) {
-				ret += (esc.contains(this.charAt(i)) ? "\\" : "") + this.charAt(i);
-			}
-			return ret;
-		},
-		
-		'zeroPad' : function(len) {
-			return ("0000000000" + this).substring(this.length - len + 10);
-		}
-	});
-
-	$.fn.forEach = Array.prototype.forEach;
-
-	// joey / jquery integration
-	$.joey = function( obj ) {
-		return $( window.joey( obj ) );
-	};
-
-	window.joey.plugins.push( function( obj ) {
-		if( obj instanceof jQuery ) {
-			return obj[0];
-		}
-	});
-
-})();
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/favicon.png b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/favicon.png
deleted file mode 100644
index f433ec6d0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/favicon.png
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/loading.gif b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/loading.gif
deleted file mode 100644
index f001e23f7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/loading.gif
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/reset.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/reset.css
deleted file mode 100644
index 29a5f1b69..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/base/reset.css
+++ /dev/null
@@ -1,44 +0,0 @@
-BODY {
-	font-family: Verdana, sans-serif;
-	font-size: 73%;
-	padding: 0;
-	margin: 0;
-}
-
-INPUT, SELECT, TEXTAREA {
-	border: 1px solid #cecece;
-	padding: 1px 3px;
-	background: white;
-}
-
-SELECT {
-	padding: 0;
-}
-
-.saf SELECT {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-TEXTAREA, CODE {
-	font-family: monospace;
-	font-size: 13px;
-}
-
-BUTTON::-moz-focus-inner {
-	border: none;
-}
-
-.pull-left {
-	float: left;
-}
-
-.pull-right {
-	float: right;
-}
-
-.loading  {
-	background-image: url(loading.gif);
-	background-repeat: no-repeat;
-	text-indent: 20px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/boolQuery.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/boolQuery.js
deleted file mode 100644
index a43c51cf9..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/boolQuery.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.BoolQuery = ux.Observable.extend({
-		defaults: {
-			size: 50		// size of pages to return
-		},
-		init: function() {
-			this._super();
-			this.refuid = 0;
-			this.refmap = {};
-			this.search = {
-				query: { bool: { must: [], must_not: [], should: [] } },
-				from: 0,
-				size: this.config.size,
-				sort: [],
-				aggs: {}
-			};
-			this.defaultClause = this.addClause();
-		},
-		setSize: function(size) {
-			this.search.size = parseInt( size, 10 );
-		},
-		setPage: function(page) {
-			this.search.from = this.config.size * (page - 1) + 1;
-		},
-		addClause: function(value, field, op, bool) {
-			bool = bool || "should";
-			op = op || "match_all";
-			field = field || "_all";
-			var clause = this._setClause(value, field, op, bool);
-			var uqid = "q-" + this.refuid++;
-			this.refmap[uqid] = { clause: clause, value: value, field: field, op: op, bool: bool };
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length > 1) {
-				this.removeClause(this.defaultClause);
-			}
-			this.fire("queryChanged", this, { uqid: uqid, search: this.search} );
-			return uqid; // returns reference to inner query object to allow fast updating
-		},
-		removeClause: function(uqid) {
-			var ref = this.refmap[uqid],
-				bool = this.search.query.bool[ref.bool];
-			var clauseIdx = bool.indexOf(ref.clause);
-			// Check that this clause hasn't already been removed
-			if (clauseIdx >=0) {
-				bool.splice(clauseIdx, 1);
-			}
-		},
-		_setClause: function(value, field, op, bool) {
-			var clause = {}, query = {};
-			if(op === "match_all") {
-			} else if(op === "query_string") {
-				query["default_field"] = field;
-				query["query"] = value;
-			} else if(op === "missing") {
-				op = "constant_score"
-				var missing = {}, filter = {};
-				missing["field"] = field;
-				filter["missing"] = missing
-				query["filter"] = filter;
-			} else {
-				query[field.substring(field.indexOf(".")+1)] = value;
-			}
-			clause[op] = query;
-			this.search.query.bool[bool].push(clause);
-			return clause;
-		},
-		getData: function() {
-			return JSON.stringify(this.search);
-		}
-	});
-
-})( this.app );
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/dataSourceInterface.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/dataSourceInterface.js
deleted file mode 100644
index dc82e3075..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/dataSourceInterface.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.DataSourceInterface = ux.Observable.extend({
-		/*
-		properties
-			meta = { total: 0 },
-			headers = [ { name: "" } ],
-			data = [ { column: value, column: value } ],
-			sort = { column: "name", dir: "desc" }
-		events
-			data: function( DataSourceInterface )
-		 */
-		_getSummary: function(res) {
-			this.summary = i18n.text("TableResults.Summary", res._shards.successful, res._shards.total, res.hits.total, (res.took / 1000).toFixed(3));
-		},
-		_getMeta: function(res) {
-			this.meta = { total: res.hits.total, shards: res._shards, tool: res.took };
-		}
-	});
-
-})( this.app );
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaData.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaData.js
deleted file mode 100644
index 03bc7f0d1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaData.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	/*
-	notes on elasticsearch terminology used in this project
-
-	indices[index] contains one or more
-	types[type] contains one or more
-	documents contain one or more
-	paths[path]
-	each path contains one element of data
-	each path maps to one field
-
-	eg PUT, "/twitter/tweet/1"
-	{
-		user: "mobz",
-		date: "2011-01-01",
-		message: "You know, for browsing elasticsearch",
-		name: {
-			first: "Ben",
-			last: "Birch"
-		}
-	}
-
-	creates
-		1 index: twitter
-				this is the collection of index data
-		1 type: tweet
-				this is the type of document (kind of like a table in sql)
-		1 document: /twitter/tweet/1
-				this is an actual document in the index ( kind of like a row in sql)
-		5 paths: [ ["user"], ["date"], ["message"], ["name","first"], ["name","last"] ]
-				since documents can be heirarchical this maps a path from a document root to a piece of data
-		5 fields: [ "user", "date", "message", "first", "last" ]
-				this is an indexed 'column' of data. fields are not heirarchical
-
-		the relationship between a path and a field is called a mapping. mappings also contain a wealth of information about how es indexes the field
-
-	notes
-	1) a path is stored as an array, the dpath is  <index> . <type> . path.join("."),
-			which can be considered the canonical reference for a mapping
-	2) confusingly, es uses the term index for both the collection of indexed data, and the individually indexed fields
-			so the term index_name is the same as field_name in this sense.
-
-	*/
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	var coretype_map = {
-		"string" : "string",
-		"keyword" : "string",
-		"text" : "string",
-		"byte" : "number",
-		"short" : "number",
-		"long" : "number",
-		"integer" : "number",
-		"float" : "number",
-		"double" : "number",
-		"ip" : "number",
-		"date" : "date",
-		"boolean" : "boolean",
-		"binary" : "binary",
-		"multi_field" : "multi_field"
-	};
-
-	var default_property_map = {
-		"string" : { "store" : "no", "index" : "analysed" },
-		"number" : { "store" : "no", "precision_steps" : 4 },
-		"date" : { "store" : "no", "format" : "dateOptionalTime", "index": "yes", "precision_steps": 4 },
-		"boolean" : { "store" : "no", "index": "yes" },
-		"binary" : { },
-		"multi_field" : { }
-	};
-
-	// parses metatdata from a cluster, into a bunch of useful data structures
-	data.MetaData = ux.Observable.extend({
-		defaults: {
-			state: null // (required) response from a /_cluster/state request
-		},
-		init: function() {
-			this._super();
-			this.refresh(this.config.state);
-		},
-		getIndices: function(alias) {
-			return alias ? this.aliases[alias] : this.indicesList;
-		},
-		// returns an array of strings containing all types that are in all of the indices passed in, or all types
-		getTypes: function(indices) {
-			var indices = indices || [], types = [];
-			this.typesList.forEach(function(type) {
-				for(var i = 0; i < indices.length; i++) {
-					if(! this.indices[indices[i]].types.contains(type))
-						return;
-				}
-				types.push(type);
-			}, this);
-			return types;
-		},
-		refresh: function(state) {
-			// currently metadata expects all like named fields to have the same type, even when from different types and indices
-			var aliases = this.aliases = {};
-			var indices = this.indices = {};
-			var types = this.types = {};
-			var fields = this.fields = {};
-			var paths = this.paths = {};
-
-			function createField( mapping, index, type, path, name ) {
-				var dpath = [ index, type ].concat( path ).join( "." );
-				var field_name = mapping.index_name || path.join( "." );
-				var field = paths[ dpath ] = fields[ field_name ] || $.extend({
-					field_name : field_name,
-					core_type : coretype_map[ mapping.type ],
-					dpaths : []
-				}, default_property_map[ coretype_map[ mapping.type ] ], mapping );
-
-				if (field.type === "multi_field" && typeof field.fields !== "undefined") {
-					for (var subField in field.fields) {
-						field.fields[ subField ] = createField( field.fields[ subField ], index, type, path.concat( subField ), name + "." + subField );
-					}
-				}
-				if (fields.dpaths) {
-					field.dpaths.push(dpath);
-				}
-				return field;
-			}
-			function getFields(properties, type, index, listeners) {
-				(function procPath(prop, path) {
-					for (var n in prop) {
-						if ("properties" in prop[n]) {
-							procPath( prop[ n ].properties, path.concat( n ) );
-						} else {
-							var field = createField(prop[n], index, type, path.concat(n), n);							
-							listeners.forEach( function( listener ) {
-								listener[ field.field_name ] = field;
-							} );
-						}
-					}
-				})(properties, []);
-			}
-			for (var index in state.metadata.indices) {
-				indices[index] = {
-					types : [], fields : {}, paths : {}, parents : {}
-				};
-				indices[index].aliases = state.metadata.indices[index].aliases;
-				indices[index].aliases.forEach(function(alias) {
-					(aliases[alias] || (aliases[alias] = [])).push(index);
-				});
-				var mapping = state.metadata.indices[index].mappings;
-				for (var type in mapping) {
-					indices[index].types.push(type);
-					if ( type in types) {
-						types[type].indices.push(index);
-					} else {
-						types[type] = {
-							indices : [index], fields : {}
-						};
-					}
-					getFields(mapping[type].properties, type, index, [fields, types[type].fields, indices[index].fields]);
-					if ( typeof mapping[type]._parent !== "undefined") {
-						indices[index].parents[type] = mapping[type]._parent.type;
-					}
-				}
-			}
-
-			this.aliasesList = Object.keys(aliases);
-			this.indicesList = Object.keys(indices);
-			this.typesList = Object.keys(types);
-			this.fieldsList = Object.keys(fields);
-		}
-	});
-
-})( this.app );	
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaDataFactory.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaDataFactory.js
deleted file mode 100644
index e5d5cd8de..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/metaDataFactory.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.MetaDataFactory = ux.Observable.extend({
-		defaults: {
-			cluster: null // (required) an app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.config.cluster.get("_cluster/state", function(data) {
-				this.metaData = new app.data.MetaData({state: data});
-				this.fire("ready", this.metaData,  { originalData: data }); // TODO originalData needed for legacy ui.FilterBrowser
-			}.bind(this));
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/model.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/model.js
deleted file mode 100644
index fa468177e..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/model.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.Model = ux.Observable.extend({
-		defaults: {
-			data: null
-		},
-		init: function() {
-			this.set( this.config.data );
-		},
-		set: function( key, value ) {
-			if( arguments.length === 1 ) {
-				this._data = $.extend( {}, key );
-			} else {
-				key.split(".").reduce(function( ptr, prop, i, props) {
-					if(i === (props.length - 1) ) {
-						ptr[prop] = value;
-					} else {
-						if( !(prop in ptr) ) {
-							ptr[ prop ] = {};
-						}
-						return ptr[prop];
-					}
-				}, this._data );
-			}
-		},
-		get: function( key ) {
-			return key.split(".").reduce( function( ptr, prop ) {
-				return ( ptr && ( prop in ptr ) ) ? ptr[ prop ] : undefined;
-			}, this._data );
-		},
-	});
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/modelSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/modelSpec.js
deleted file mode 100644
index 48e24fe3f..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/model/modelSpec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.data.Model", function() {
-
-	var Model = window.app.data.Model;
-
-	it("test setting model does a shallow copy", function() {
-		var test = {};
-		var array = [ 1, 2, 3 ];
-		var m = new Model({
-			data: {
-				"foo": "bar",
-				"test": test,
-				"array": array
-			}
-		});
-		expect( m.get("foo") ).toBe("bar");
-		expect( m.get("array").length ).toBe(  3  );
-		expect( m.get("array")[1] ).toBe( 2 );
-		expect( m.get("array") ).toBe( array );
-		expect( m.get("test") ).toBe( test );
-	});
-
-	it("should replace model with shallow copy when put with no path", function() {
-		var m = new Model({ foo: "bar" });
-		m.set({ bar: "blat" });
-		expect( m.get("foo")).toBe( undefined );
-		expect( m.get("bar")).toBe("blat");
-	});
-
-	it("test getting values from deep in a model", function() {
-		var m = new Model({
-			data: {
-				"foo": {
-					"bar": {
-						"baz": {
-							"quix": "abcdefg"
-						}
-					}
-				}
-			}
-		});
-
-		expect( m.get("foo.bar.baz.quix") ).toBe( "abcdefg" );
-	});
-
-	it("test setting non-existant values creates new values", function() {
-		var m = new Model({
-			data: {
-				"foo": {
-					"bar": "abc"
-				}
-			}
-		});
-		m.set("foo.bar", "123" );
-		m.set("foo.baz", "456" );
-		expect( m.get("foo.bar") ).toBe( "123" );
-		expect( m.get("foo.baz") ).toBe( "456" );
-	});
-
-	it("test setting values deep in a model", function() {
-		var m = new Model({
-			data: {
-				"foo": {
-					"bar": "abc"
-				}
-			}
-		});
-		m.set("foo.bar", "123" );
-		m.set("foo.baz", "456" );
-		m.set("foo.something.else.is.here", "xyz" );
-		expect( m.get("foo.something.else.is").here ).toBe( "xyz" );
-		expect( m.get("foo.something.else.is.here") ).toBe( "xyz" );
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/query.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/query.js
deleted file mode 100644
index 6b9733c73..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/query.js
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-	var ux = app.ns("ux");
-
-	data.Query = ux.Observable.extend({
-		defaults: {
-			cluster: null,  // (required) instanceof app.services.Cluster
-			size: 50        // size of pages to return
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.refuid = 0;
-			this.refmap = {};
-			this.indices = [];
-			this.types = [];
-			this.search = {
-				query: { bool: { must: [], must_not: [], should: [] } },
-				from: 0,
-				size: this.config.size,
-				sort: [],
-				aggs: {},
-				version: true
-			};
-			this.defaultClause = this.addClause();
-			this.history = [ this.getState() ];
-		},
-		clone: function() {
-			var q = new data.Query({ cluster: this.cluster });
-			q.restoreState(this.getState());
-			for(var uqid in q.refmap) {
-				q.removeClause(uqid);
-			}
-			return q;
-		},
-		getState: function() {
-			return $.extend(true, {}, { search: this.search, indices: this.indices, types: this.types });
-		},
-		restoreState: function(state) {
-			state = $.extend(true, {}, state || this.history[this.history.length - 1]);
-			this.indices = state.indices;
-			this.types = state.types;
-			this.search = state.search;
-		},
-		getData: function() {
-			return JSON.stringify(this.search);
-		},
-		query: function() {
-			var state = this.getState();
-			this.cluster.post(
-					(this.indices.join(",") || "_all") + "/" + ( this.types.length ? this.types.join(",") + "/" : "") + "_search",
-					this.getData(),
-					function(results) {
-						if(results === null) {
-							alert(i18n.text("Query.FailAndUndo"));
-							this.restoreState();
-							return;
-						}
-						this.history.push(state);
-
-						this.fire("results", this, results);
-					}.bind(this));
-		},
-		loadParents: function(res,metadata){
-			//create data for mget
-			var data = { docs :[] };
-			var indexToTypeToParentIds = {};
-			res.hits.hits.forEach(function(hit) {
-			if (typeof hit.fields != "undefined"){
-				if (typeof hit.fields._parent != "undefined"){
-					var parentType = metadata.indices[hit._index].parents[hit._type];
-					if (typeof indexToTypeToParentIds[hit._index] == "undefined"){
-						indexToTypeToParentIds[hit._index] = new Object();
-					}
-					if (typeof indexToTypeToParentIds[hit._index][hit._type] == "undefined"){
-						indexToTypeToParentIds[hit._index][hit._type] = new Object();
-					}
-					if (typeof indexToTypeToParentIds[hit._index][hit._type][hit.fields._parent] == "undefined"){
-						indexToTypeToParentIds[hit._index][hit._type][hit.fields._parent] = null;
-						data.docs.push({ _index:hit._index, _type:parentType, _id:hit.fields._parent});
-					}
-				}
-			}
-		});
-
-		//load parents
-		var state = this.getState();
-			this.cluster.post("_mget",JSON.stringify(data),
-				function(results) {
-					if(results === null) {
-						alert(i18n.text("Query.FailAndUndo"));
-						this.restoreState();
-						return;
-					}
-					this.history.push(state);
-					var indexToTypeToParentIdToHit = new Object();
-					results.docs.forEach(function(doc) {
-						if (typeof indexToTypeToParentIdToHit[doc._index] == "undefined"){
-						indexToTypeToParentIdToHit[doc._index] = new Object();
-					}
-					
-					if (typeof indexToTypeToParentIdToHit[doc._index][doc._type] == "undefined"){
-						indexToTypeToParentIdToHit[doc._index][doc._type] = new Object();
-					}
-					
-					indexToTypeToParentIdToHit[doc._index][doc._type][doc._id] = doc;
-					});
-					
-					res.hits.hits.forEach(function(hit) {
-						if (typeof hit.fields != "undefined"){
-							if (typeof hit.fields._parent != "undefined"){
-								var parentType = metadata.indices[hit._index].parents[hit._type];
-								hit._parent = indexToTypeToParentIdToHit[hit._index][parentType][hit.fields._parent];
-							}
-						}
-					});
-
-					this.fire("resultsWithParents", this, res);
-				}.bind(this));
-		},
-		setPage: function(page) {
-			this.search.from = this.config.size * (page - 1);
-		},
-		setSort: function(index, desc) {
-			var sortd = {}; sortd[index] = { reverse: !!desc };
-			this.search.sort.unshift( sortd );
-			for(var i = 1; i < this.search.sort.length; i++) {
-				if(Object.keys(this.search.sort[i])[0] === index) {
-					this.search.sort.splice(i, 1);
-					break;
-				}
-			}
-		},
-		setIndex: function(index, add) {
-			if(add) {
-				if(! this.indices.contains(index)) this.indices.push(index);
-			} else {
-				this.indices.remove(index);
-			}
-			this.fire("setIndex", this, { index: index, add: !!add });
-		},
-		setType: function(type, add) {
-			if(add) {
-				if(! this.types.contains(type)) this.types.push(type);
-			} else {
-				this.types.remove(type);
-			}
-			this.fire("setType", this, { type: type, add: !!add });
-		},
-		addClause: function(value, field, op, bool) {
-			bool = bool || "should";
-			op = op || "match_all";
-			field = field || "_all";
-			var clause = this._setClause(value, field, op, bool);
-			var uqid = "q-" + this.refuid++;
-			this.refmap[uqid] = { clause: clause, value: value, field: field, op: op, bool: bool };
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length > 1) {
-				this.removeClause(this.defaultClause);
-			}
-			this.fire("queryChanged", this, { uqid: uqid, search: this.search} );
-			return uqid; // returns reference to inner query object to allow fast updating
-		},
-		removeClause: function(uqid) {
-			var ref = this.refmap[uqid],
-				bool = this.search.query.bool[ref.bool];
-			bool.remove(ref.clause);
-			if(this.search.query.bool.must.length + this.search.query.bool.should.length === 0) {
-				this.defaultClause = this.addClause();
-			}
-		},
-		addAggs: function(aggs) {
-			var aggsId = "f-" + this.refuid++;
-			this.search.aggs[aggsId] = aggs;
-			this.refmap[aggsId] = { aggsId: aggsId, aggs: aggs };
-			return aggsId;
-		},
-		removeAggs: function(aggsId) {
-			delete this.search.aggs[aggsId];
-			delete this.refmap[aggsId];
-		},
-		_setClause: function(value, field, op, bool) {
-			var clause = {}, query = {};
-			if(op === "match_all") {
-			} else if(op === "query_string") {
-				query["default_field"] = field;
-				query["query"] = value;
-			} else if(op === "missing") {
-				op = "constant_score"
-				var missing = {}, filter = {};
-				missing["field"] = field;
-				filter["missing"] = missing
-				query["filter"] = filter;
-			} else {
-				query[field] = value;
-			}
-			clause[op] = query;
-			this.search.query.bool[bool].push(clause);
-			return clause;
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/queryDataSourceInterface.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/queryDataSourceInterface.js
deleted file mode 100644
index 9daf4d0df..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/queryDataSourceInterface.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-
-	data.QueryDataSourceInterface = data.DataSourceInterface.extend({
-		defaults: {
-			metadata: null, // (required) instanceof app.data.MetaData, the cluster metadata
-			query: null     // (required) instanceof app.data.Query the data source
-		},
-		init: function() {
-			this._super();
-			this.config.query.on("results", this._results_handler.bind(this) );
-			this.config.query.on("resultsWithParents", this._load_parents.bind(this) );
-		},
-		_results_handler: function(query, res) {
-			this._getSummary(res);
-			this._getMeta(res);
-			var sort = query.search.sort[0] || { "_score": { reverse: false }};
-			var sortField = Object.keys(sort)[0];
-			this.sort = { column: sortField, dir: (sort[sortField].reverse ? "asc" : "desc") };
-			this._getData(res, this.config.metadata);
-			this.fire("data", this);
-		},
-		_load_parents: function(query, res) {
-			query.loadParents(res, this.config.metadata);
-		},
-		_getData: function(res, metadata) {
-			var metaColumns = ["_index", "_type", "_id", "_score"];
-			var columns = this.columns = [].concat(metaColumns);
-
-			this.data = res.hits.hits.map(function(hit) {
-				var row = (function(path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(metadata.paths[dpath]) {
-								var field_name = metadata.paths[dpath].field_name;
-								if(! columns.contains(field_name)) {
-									columns.push(field_name);
-								}
-								row[field_name] = (spec[prop] === null ? "null" : spec[prop] ).toString();
-							} else {
-								// TODO: field not in metadata index
-							}
-						}
-					}
-					return row;
-				})([ hit._index, hit._type ], hit._source, {});
-				metaColumns.forEach(function(n) { row[n] = hit[n]; });
-				row._source = hit;
-				if (typeof hit._parent!= "undefined") {
-					(function(prefix, path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(prefix, path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(prefix, path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(metadata.paths[dpath]) {
-								var field_name = metadata.paths[dpath].field_name;
-								var column_name = prefix+"."+field_name;
-								if(! columns.contains(column_name)) {
-									columns.push(column_name);
-								}
-								row[column_name] = (spec[prop] === null ? "null" : spec[prop] ).toString();
-							} else {
-								// TODO: field not in metadata index
-							}
-						}
-					}
-					})(hit._parent._type,[hit._parent._index, hit._parent._type], hit._parent._source, row);
-				}
-				return row;
-			}, this);
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/resultDataSourceInterface.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/resultDataSourceInterface.js
deleted file mode 100644
index 69e585248..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/data/resultDataSourceInterface.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var data = app.ns("data");
-
-	data.ResultDataSourceInterface = data.DataSourceInterface.extend({
-		results: function(res) {
-			this._getSummary(res);
-			this._getMeta(res);
-			this._getData(res);
-			this.sort = {};
-			this.fire("data", this);
-		},
-		_getData: function(res) {
-			var columns = this.columns = [];
-			this.data = res.hits.hits.map(function(hit) {
-				var row = (function(path, spec, row) {
-					for(var prop in spec) {
-						if(acx.isObject(spec[prop])) {
-							arguments.callee(path.concat(prop), spec[prop], row);
-						} else if(acx.isArray(spec[prop])) {
-							if(spec[prop].length) {
-								arguments.callee(path.concat(prop), spec[prop][0], row)
-							}
-						} else {
-							var dpath = path.concat(prop).join(".");
-							if(! columns.contains(dpath)) {
-								columns.push(dpath);
-							}
-							row[dpath] = (spec[prop] || "null").toString();
-						}
-					}
-					return row;
-				})([ hit._type ], hit, {});
-				row._source = hit;
-				return row;
-			}, this);
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/en_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/en_strings.js
deleted file mode 100644
index 3ee522ac8..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/en_strings.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "Loading Aggregations...",
-	"General.Searching": "Searching...",
-	"General.Search": "Search",
-	"General.Help": "Help",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Refresh",
-	"General.ManualRefresh": "Manual Refresh",
-	"General.RefreshQuickly": "Refresh quickly",
-	"General.Refresh5seconds": "Refresh every 5 seconds",
-	"General.Refresh1minute": "Refresh every minute",
-	"AliasForm.AliasName": "Alias Name",
-	"AliasForm.NewAliasForIndex": "New Alias for {0}",
-	"AliasForm.DeleteAliasMessage": "type ''{0}'' to delete {1}. There is no undo",
-	"AnyRequest.DisplayOptions" : "Display Options",
-	"AnyRequest.AsGraph" : "Graph Results",
-	"AnyRequest.AsJson" : "Show Raw JSON",
-	"AnyRequest.AsTable" : "Show Search Results Table",
-	"AnyRequest.History" : "History",
-	"AnyRequest.RepeatRequest" : "Repeat Request",
-	"AnyRequest.RepeatRequestSelect" : "Repeat request every ",
-	"AnyRequest.Transformer" : "Result Transformer",
-	"AnyRequest.Pretty": "Pretty",
-	"AnyRequest.Query" : "Query",
-	"AnyRequest.Request": "Request",
-	"AnyRequest.Requesting": "Requesting...",
-	"AnyRequest.ValidateJSON": "Validate JSON",
-	"Browser.Title": "Browser",
-	"Browser.ResultSourcePanelTitle": "Result Source",
-	"Command.DELETE": "DELETE",
-	"Command.SHUTDOWN": "SHUTDOWN",
-	"Command.DeleteAliasMessage": "Delete Alias?",
-	"ClusterOverView.IndexName": "Index Name",
-	"ClusterOverview.NumShards": "Number of Shards",
-	"ClusterOverview.NumReplicas": "Number of Replicas",
-	"ClusterOverview.NewIndex": "New Index",
-	"IndexActionsMenu.Title": "Actions",
-	"IndexActionsMenu.NewAlias": "New Alias...",
-	"IndexActionsMenu.Refresh": "Refresh",
-	"IndexActionsMenu.Flush": "Flush",
-	"IndexActionsMenu.Optimize": "Optimize...",
-	"IndexActionsMenu.Snapshot": "Gateway Snapshot",
-	"IndexActionsMenu.Analyser": "Test Analyser",
-	"IndexActionsMenu.Open": "Open",
-	"IndexActionsMenu.Close": "Close",
-	"IndexActionsMenu.Delete": "Delete...",
-	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Index Status",
-	"IndexInfoMenu.Metadata": "Index Metadata",
-	"IndexCommand.TextToAnalyze": "Text to Analyse",
-	"IndexCommand.ShutdownMessage": "type ''{0}'' to shutdown {1}. Node can NOT be restarted from this interface",
-	"IndexOverview.PageTitle": "Indices Overview",
-	"IndexSelector.NameWithDocs": "{0} ({1} docs)",
-	"IndexSelector.SearchIndexForDocs": "Search {0} for documents where:",
-	"FilterBrowser.OutputType": "Output Results: {0}",
-	"FilterBrowser.OutputSize": "Number of Results: {0}",
-	"Header.ClusterHealth": "cluster health: {0} ({1} of {2})",
-	"Header.ClusterNotConnected": "cluster health: not connected",
-	"Header.Connect": "Connect",
-	"Nav.AnyRequest": "Any Request",
-	"Nav.Browser": "Browser",
-	"Nav.ClusterHealth": "Cluster Health",
-	"Nav.ClusterState": "Cluster State",
-	"Nav.ClusterNodes": "Nodes Info",
-	"Nav.Info": "Info",
-	"Nav.NodeStats": "Nodes Stats",
-	"Nav.Overview": "Overview",
-	"Nav.Indices": "Indices",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Indices Stats",
-	"Nav.Templates": "Templates",
-	"Nav.StructuredQuery": "Structured Query",
-	"NodeActionsMenu.Title": "Actions",
-	"NodeActionsMenu.Shutdown": "Shutdown...",
-	"NodeInfoMenu.Title": "Info",
-	"NodeInfoMenu.ClusterNodeInfo": "Cluster Node Info",
-	"NodeInfoMenu.NodeStats": "Node Stats",
-	"NodeType.Client": "Client Node",
-	"NodeType.Coord": "Coordinator",
-	"NodeType.Master": "Master Node",
-	"NodeType.Tribe": "Tribe Node",
-	"NodeType.Worker": "Worker Node",
-	"NodeType.Unassigned": "Unassigned",
-	"OptimizeForm.OptimizeIndex": "Optimize {0}",
-	"OptimizeForm.MaxSegments": "Maximum # Of Segments",
-	"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
-	"OptimizeForm.FlushAfter": "Flush After Optimize",
-	"OptimizeForm.WaitForMerge": "Wait For Merge",
-	"Overview.PageTitle" : "Cluster Overview",
-	"Output.JSON": "JSON",
-	"Output.Table": "Table",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "Show query source",
-	"Preference.SortCluster": "Sort Cluster",
-	"Sort.ByName": "By Name",
-	"Sort.ByAddress": "By Address",
-	"Sort.ByType": "By Type",
-	"Preference.SortIndices": "Sort Indices",
-	"SortIndices.Descending": "Descending",
-	"SortIndices.Ascending": "Ascending",
-	"Preference.ViewAliases": "View Aliases",
-	"ViewAliases.Grouped": "Grouped",
-	"ViewAliases.List": "List",
-	"ViewAliases.None": "None",
-	"Overview.IndexFilter": "Index Filter",
-	"TableResults.Summary": "Searched {0} of {1} shards. {2} hits. {3} seconds",
-	"QueryFilter.AllIndices": "All Indices",
-	"QueryFilter.AnyValue": "any",
-	"QueryFilter-Header-Indices": "Indices",
-	"QueryFilter-Header-Types": "Types",
-	"QueryFilter-Header-Fields": "Fields",
-	"QueryFilter.DateRangeHint.from": "From : {0}",
-	"QueryFilter.DateRangeHint.to": "  To : {0}",
-	"Query.FailAndUndo": "Query Failed. Undoing last changes",
-	"StructuredQuery.ShowRawJson": "Show Raw JSON"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>The Result Transformer can be used to post process the raw json results from a request into a more useful format.</p>\
-		<p>The transformer should contain the body of a javascript function. The return value from the function becomes the new value passed to the json printer</p>\
-		<p>Example:<br>\
-		  <code>return root.hits.hits[0];</code> would traverse a result set to show just the first match<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> would return the total memory used across an entire cluster<br></p>\
-		<p>The following functions are available and can be useful processing arrays and objects<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>When Repeat Request is running, an extra parameter called prev is passed to the transformation function. This allows comparisons, and cumulative graphing</p>\
-		<p>Example:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> would return the load average on the first cluster node over the last minute\
-		This could be fed into the Graph to produce a load graph for the node\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>Raw Json: shows complete results of the query and transformation in raw JSON format </p>\
-		<p>Graph Results: To produce a graph of your results, use the result transformer to produce an array of values</p>\
-		<p>Search Results Table: If your query is a search, you can display the results of the search in a table.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Date fields accept a natural language query to produce a From and To date that form a range that the results are queried over.</p>\
-		<p>The following formats are supported:</p>\
-		<ul>\
-			<li><b>Keywords / Key Phrases</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				searches for dates matching the keyword. <code>last year</code> would search all of last year.</li>\
-			<li><b>Ranges</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (spaces optional, many synonyms for range qualifiers)<br>\
-				Create a search range centered on <code>now</code> extending into the past and future by the amount specified.</li>\
-			<li><b>DateTime and Partial DateTime</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				these formats specify a specific date range. <code>2011</code> would search the whole of 2011, while <code>2011-01-18 12:32:45</code> would only search for results in that 1 second range</li>\
-			<li><b>Time and Time Partials</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				these formats search for a particular time during the current day. <code>12:32</code> would search that minute during today</li>\
-			<li><b>Date Ranges</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				A Date Range is created by specifying two dates in any format (Keyword / DateTime / Time) separated by &lt; or -&gt; (both do the same thing). If either end of the date range is missing, it is the same as having no constraint in that direction.</li>\
-			<li><b>Date Range using Offset</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Searches the specified date including the range in the direction specified.</li>\
-			<li><b>Anchored Ranges</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Similar to above except the range is extend in both directions from the anchor date</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/fr_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/fr_strings.js
deleted file mode 100644
index 1efb5ab82..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/fr_strings.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-//	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs" : "Chargement des facettes...",
-	"General.Searching": "Recherche en cours...",
-	"General.Search": "Recherche",
-	"General.Help": "Aide",
-//	"General.HelpGlyph": "?",
-//	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Rafraîchir",
-	"General.ManualRefresh": "Rafraîchissement manuel",
-	"General.RefreshQuickly": "Rafraîchissement rapide",
-	"General.Refresh5seconds": "Rafraîchissement toutes les 5 secondes",
-	"General.Refresh1minute": "Rafraîchissement toutes les minutes",
-	"AliasForm.AliasName": "Alias",
-	"AliasForm.NewAliasForIndex": "Nouvel Alias pour {0}",
-	"AliasForm.DeleteAliasMessage": "Entrez ''{0}'' pour effacer {1}. Attention, action irréversible.",
-	"AnyRequest.DisplayOptions" : "Options d'affichage",
-	"AnyRequest.AsGraph" : "En graphe",
-	"AnyRequest.AsJson" : "En JSON brut",
-	"AnyRequest.AsTable" : "En tableau",
-	"AnyRequest.History" : "Historique",
-	"AnyRequest.RepeatRequest" : "Répétition automatique de la requête",
-	"AnyRequest.RepeatRequestSelect" : "Répéter la requête toutes les ",
-	"AnyRequest.Transformer" : "Transformation des résultats",
-//	"AnyRequest.Pretty": "Pretty",
-	"AnyRequest.Query" : "Recherche",
-	"AnyRequest.Request": "Requête",
-	"AnyRequest.Requesting": "Requête en cours...",
-	"AnyRequest.ValidateJSON": "Valider le JSON",
-	"Browser.Title": "Navigateur",
-	"Browser.ResultSourcePanelTitle": "Résultat au format JSON",
-	"Command.DELETE": "SUPPRIMER",
-	"Command.SHUTDOWN": "ETEINDRE",
-	"Command.DeleteAliasMessage": "Supprimer l'Alias?",
-	"ClusterOverView.IndexName": "Index",
-	"ClusterOverview.NumShards": "Nombre de shards",
-	"ClusterOverview.NumReplicas": "Nombre de replica",
-	"ClusterOverview.NewIndex": "Nouvel Index",
-//	"IndexActionsMenu.Title": "Actions",
-	"IndexActionsMenu.NewAlias": "Nouvel Alias...",
-	"IndexActionsMenu.Refresh": "Rafraîchir",
-	"IndexActionsMenu.Flush": "Flusher",
-	"IndexActionsMenu.Optimize": "Optimiser...",
-	"IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)",
-	"IndexActionsMenu.Analyser": "Tester un analyseur",
-	"IndexActionsMenu.Open": "Ouvrir",
-	"IndexActionsMenu.Close": "Fermer",
-	"IndexActionsMenu.Delete": "Effacer...",
-//	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Etat de l'Index",
-	"IndexInfoMenu.Metadata": "Métadonnées de l'Index",
-	"IndexCommand.TextToAnalyze": "Texte à analyser",
-	"IndexCommand.ShutdownMessage": "Entrez ''{0}'' pour éteindre {1}. Le noeud NE PEUT PAS être redémarré depuis cette interface.",
-//	"IndexSelector.NameWithDocs": "{0} ({1} docs)",
-	"IndexSelector.SearchIndexForDocs": "Chercher dans {0} les documents correspondant à",
-	"FilterBrowser.OutputType": "Format d'affichage des résultats {0}",
-	"FilterBrowser.OutputSize": "Nombre de Résultats: {0}",
-	"Header.ClusterHealth": "Santé du cluster: {0} ({1} {2})",
-	"Header.ClusterNotConnected": "Santé du cluster: non connecté",
-	"Header.Connect": "Se connecter",
-	"Nav.AnyRequest": "Autres requêtes",
-	"Nav.StructuredQuery": "Requêtes structurées",
-	"Nav.Browser": "Navigateur",
-	"Nav.ClusterHealth": "Santé du cluster",
-	"Nav.ClusterState": "Etat du cluster",
-	"Nav.ClusterNodes": "Noeuds du cluster",
-//	"Nav.Info": "Info",
-	"Nav.NodeStats": "Statistiques sur les noeuds",
-	"Nav.Overview": "Aperçu",
-	"Nav.Indices": "Index",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Etat",
-	"Nav.Templates": "Templates",
-	"Nav.StructuredQuery": "Recherche Structurée",
-//	"NodeActionsMenu.Title": "Actions",
-	"NodeActionsMenu.Shutdown": "Eteindre...",
-//	"NodeInfoMenu.Title": "Info",
-	"NodeInfoMenu.ClusterNodeInfo": "Infos sur le noeud du cluster",
-	"NodeInfoMenu.NodeStats": "Statistiques du noeud",
-	"NodeType.Client": "Noeud Client",
-	"NodeType.Coord": "Coordinateur",
-	"NodeType.Master": "Noeud Master",
-	"NodeType.Tribe": "Noeud Tribe",
-	"NodeType.Worker": "Noeud Worker",
-	"NodeType.Unassigned": "Non assigné",
-	"OptimizeForm.OptimizeIndex": "Optimiser {0}",
-	"OptimizeForm.MaxSegments": "Nombre maximum de segments",
-	"OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions",
-	"OptimizeForm.FlushAfter": "Flusher après l'optimisation",
-	"OptimizeForm.WaitForMerge": "Attendre la fin de la fusion",
-	"Overview.PageTitle" : "Aperçu du cluster",
-//	"Output.JSON": "JSON",
-	"Output.Table": "Tableau",
-	"Output.ShowSource": "Voir la requête source",
-    "TableResults.Summary": "Recherche sur {0} des {1} shards. {2} résultats. {3} secondes",
-	"QueryFilter.AllIndices": "Tous les index",
-	"QueryFilter.AnyValue": "Tout",
-	"QueryFilter-Header-Indices": "Index",
-//	"QueryFilter-Header-Types": "Types",
-	"QueryFilter-Header-Fields": "Champs",
-	"QueryFilter.DateRangeHint.from": "De : {0}",
-	"QueryFilter.DateRangeHint.to": "  A : {0}",
-	"Query.FailAndUndo": "Requête en échec. Annulation des dernières modifications.",
-	"StructuredQuery.ShowRawJson": "Voir le JSON brut"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>Le transformateur de résultats peut être utilisé pour modifier a posteriori les résultats JSON bruts dans un format plus utile.</p>\
-		<p>Le transformateur devrait contenir le corps d'une fonction javascript. La valeur de retour de la fonction devient la nouvelle valeur qui sera passée à l'afficheur des documents JSON.</p>\
-		<p>Exemple:<br>\
-		  <code>return root.hits.hits[0];</code> ne renverra que le premier élément de l'ensemble des résultats.<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> retournera la mémoire totale utilisée dans l'ensemble du cluster.<br></p>\
-		<p>Les fonctions suivantes sont disponibles et peuvent vous être utiles pour travailler sur les tableaux et les objets:<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>Lorsque vous activez la répétition automatique de la requête, un paramètre supplémentaire nommé prev est passé à la fonction de transformation. Cela permet les comparaisons et les graphes cumulatifs.</p>\
-		<p>Exemple:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> retournera la charge moyenne du premier noeud du cluster pour la dernière minute écoulée.\
-		Cela peut alimenter ensuite le graphe pour produire un graphe de charge du noeud.\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>En JSON brut: affiche les résultats complets de la recherche éventuellement transformée au format JSON brut.</p>\
-		<p>En graphe: pour fabriquer un graphe de vos résultats, utilsez la transformation de résultats pour générer un tableau de valeurs.</p>\
-		<p>En tableau: si votre requête est une recherche, vous pouvez alors afficher les résultats dans un tableau.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Les champs Date acceptent une requête en langage naturel pour produire un écart de date (from/to) correspondant.</p>\
-		<p>Les formats suivants sont acceptés :</p>\
-		<ul>\
-			<li><b>Mots clés</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				Cherchera pour des dates correspondant au mot clé. <code>last year</code> cherchera sur toute l'année précédente.</li>\
-			<li><b>Ecarts</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (les espaces sont optionnels et il existe beaucoup de synonymes pour qualifier les écarts)<br>\
-				Créé un écart de date basé sur l'heure courante (maintenant) avec plus ou moins l'écart indiqué.</li>\
-			<li><b>Dates et Dates partielles</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				Ces formats indiquent un écart de date spécifique. <code>2011</code> cherchera sur toute l'année 2011, alors que <code>2011-01-18 12:32:45</code> ne cherchera que pour la date précise à la seconde près.</li>\
-			<li><b>Heures et heures partielles</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				Ces formats indiquent un espace de temps pour la date du jour. <code>12:32</code> cherchera les éléments d'aujourd'hui à cette minute précise.</li>\
-			<li><b>Ecart de Date</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				Un écart de date est créé en spécifiant deux dates dans n'importe lequel des formats précédents (Mot clé / Dates / Heures) séparées par &lt; ou -&gt; (les deux produisent le même effet). Si la date de fin n'est pas indiquée, alors il n'y aura aucune contrainte de fin.</li>\
-			<li><b>Ecart de date avec décalage</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Cherche en incluant un décalage de la date dans la direction indiquée.</li>\
-			<li><b>Ecart de date avec bornes</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Similaire à ci-dessus excepté que le décalage est appliqué dans les deux sens à partir de la date indiquée.</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/pt_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/pt_strings.js
deleted file mode 100644
index 25f46af16..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/pt_strings.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "Carregando Facetas...",
-	"General.Searching": "Buscando...",
-	"General.Search": "Busca",
-	"General.Help": "Ajuda",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "Atualizar",
-	"General.ManualRefresh": "Atualização Manual",
-	"General.RefreshQuickly": "Atualização rápida",
-	"General.Refresh5seconds": "Atualização a cada 5 segundos",
-	"General.Refresh1minute": "Atualização a cada minuto",
-	"AliasForm.AliasName": "Apelido",
-	"AliasForm.NewAliasForIndex": "Novo apelido para {0}",
-	"AliasForm.DeleteAliasMessage": "digite ''{0}'' para deletar {1}. Não há como voltar atrás",
-	"AnyRequest.DisplayOptions" : "Mostrar Opções",
-	"AnyRequest.AsGraph" : "Mostrar como gráfico",
-	"AnyRequest.AsJson" : "Mostrar JSON bruto",
-	"AnyRequest.AsTable" : "Mostrar tabela de resultados da consulta",
-	"AnyRequest.History" : "Histórico",
-	"AnyRequest.RepeatRequest" : "Refazer requisição",
-	"AnyRequest.RepeatRequestSelect" : "Repetir requisição a cada ",
-	"AnyRequest.Transformer" : "Transformador de resultado",
-	"AnyRequest.Pretty": "Amigável",
-	"AnyRequest.Query" : "Consulta",
-	"AnyRequest.Request": "Requisição",
-	"AnyRequest.Requesting": "Realizando requisição...",
-	"AnyRequest.ValidateJSON": "Validar JSON",
-	"Browser.Title": "Navegador",
-	"Browser.ResultSourcePanelTitle": "Resultado",
-	"Command.DELETE": "DELETAR",
-	"Command.SHUTDOWN": "DESLIGAR",
-	"Command.DeleteAliasMessage": "Remover apelido?",
-	"ClusterOverView.IndexName": "Nome do índice",
-	"ClusterOverview.NumShards": "Número de Shards",
-	"ClusterOverview.NumReplicas": "Número de Réplicas",
-	"ClusterOverview.NewIndex": "Novo índice",
-	"IndexActionsMenu.Title": "Ações",
-	"IndexActionsMenu.NewAlias": "Novo apelido...",
-	"IndexActionsMenu.Refresh": "Atualizar",
-	"IndexActionsMenu.Flush": "Flush",
-	"IndexActionsMenu.Optimize": "Otimizar...",
-	"IndexActionsMenu.Snapshot": "Snapshot do Gateway",
-	"IndexActionsMenu.Analyser": "Analizador de teste",
-	"IndexActionsMenu.Open": "Abrir",
-	"IndexActionsMenu.Close": "Fechar",
-	"IndexActionsMenu.Delete": "Deletar...",
-	"IndexInfoMenu.Title": "Info",
-	"IndexInfoMenu.Status": "Status do índice",
-	"IndexInfoMenu.Metadata": "Metadados do índice",
-	"IndexCommand.TextToAnalyze": "Texto para analizar",
-	"IndexCommand.ShutdownMessage": "digite ''{0}'' para desligar {1}. Nó NÃO PODE ser reiniciado à partir dessa interface",
-	"IndexOverview.PageTitle": "Visão geral dos índices",
-	"IndexSelector.NameWithDocs": "{0} ({1} documentoss)",
-	"IndexSelector.SearchIndexForDocs": "Busca {0} por documentos onde:",
-	"FilterBrowser.OutputType": "Resultados: {0}",
-	"FilterBrowser.OutputSize": "Número de Resultados: {0}",
-	"Header.ClusterHealth": "saúde do cluster: {0} ({1} {2})",
-	"Header.ClusterNotConnected": "saúde do cluster: não conectado",
-	"Header.Connect": "Conectar",
-	"Nav.AnyRequest": "Qualquer requisição",
-	"Nav.Browser": "Navegador",
-	"Nav.ClusterHealth": "Saúde do Cluster",
-	"Nav.ClusterState": "Estado do Cluster",
-	"Nav.ClusterNodes": "Nós do Cluster",
-	"Nav.Info": "Informações",
-	"Nav.NodeStats": "Estatísticas do nó",
-	"Nav.Overview": "Visão Geral",
-	"Nav.Indices": "Índices",
-	"Nav.Plugins": "Plugins",
-	"Nav.Status": "Status",
-	"Nav.Templates": "Modelos",
-	"Nav.StructuredQuery": "Consulta Estruturada",
-	"NodeActionsMenu.Title": "Ações",
-	"NodeActionsMenu.Shutdown": "Desligar...",
-	"NodeInfoMenu.Title": "Informações",
-	"NodeInfoMenu.ClusterNodeInfo": "Informações do Nó do Cluster",
-	"NodeInfoMenu.NodeStats": "Estatísticas do Nó",
-	"NodeType.Client": "Nó cliente",
-	"NodeType.Coord": "Coordenador",
-	"NodeType.Master": "Nó mestre",
-	"NodeType.Tribe": "Nó tribo",
-	"NodeType.Worker": "Nó trabalhador",
-	"NodeType.Unassigned": "Não atribuido",
-	"OptimizeForm.OptimizeIndex": "Otimizar {0}",
-	"OptimizeForm.MaxSegments": "# Máximo De Segmentos",
-	"OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões",
-	"OptimizeForm.FlushAfter": "Flush após Otimizar",
-	"OptimizeForm.WaitForMerge": "Esperar Por Merge",
-	"Overview.PageTitle": "Visão geral do Cluster",
-	"Output.JSON": "JSON",
-	"Output.Table": "Tabela",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "Mostrar consulta original",
-	"Preference.SortCluster": "Ordenar Cluster",
-	"Sort.ByName": "Por nome",
-	"Sort.ByAddress": "Por endereço",
-	"Sort.ByType": "Por tipo",
-	"Preference.ViewAliases": "Ver Alias",
-	"ViewAliases.Grouped": "Agrupado",
-	"ViewAliases.List": "Lista",
-	"ViewAliases.None": "Nenhum",
-	"Overview.IndexFilter": "Filtar Índice",
-	"TableResults.Summary": "Buscado {0} de {1} shards. {2} resultados. {3} segundos",
-	"QueryFilter.AllIndices": "Todos os Índices",
-	"QueryFilter.AnyValue": "qualquer",
-	"QueryFilter-Header-Indices": "Índices",
-	"QueryFilter-Header-Types": "Tipos",
-	"QueryFilter-Header-Fields": "Campos",
-	"QueryFilter.DateRangeHint.from": "De : {0}",
-	"QueryFilter.DateRangeHint.to": "  A : {0}",
-	"Query.FailAndUndo": "Consulta falhou. Desfazendo últimas alterações",
-	"StructuredQuery.ShowRawJson": "Mostrar JSON bruto"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>O Transformador de Resultados pode ser usado para transformar os resultados de uma consulta de json bruto para um formato mais útil.</p>\
-		<p>O transformador deve possuir o corpo de uma função javascript. O retorno da função se torna o novo valor passado para o json printer</p>\
-		<p>Exemplo:<br>\
-		  <code>return root.hits.hits[0];</code> irá alterar a resposta para mostrar apenas o primeiro resultado<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> irá retornar o total de memória utilizada pelo cluster<br></p>\
-		<p>As seguintes funções estão disponíveis e podem ser úteis no processamento de vetores e objetos<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>Durante a execução da opção Refazer Requisição, um parâmetro extra chamado prev é passado para a função de transformação. Isso permite fazer comparações e marcações cumulativas</p>\
-		<p>Exemplo:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> irá retornar a carga média no primeiro nó do cluster no último minuto\
-		Essa informação pode ser inserida no Gráfico para fazer um gráfico de carga do nó\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>Json Bruto: Exibe o resultado completo da consulta e da transformação no formato de JSON bruto</p>\
-		<p>Gráfico de Resultados: Para gerar um gráfico com seus resultados, utilize o tranformador de resultados para produzir um vetor de valores</p>\
-		<p>Tabela de Resultados da Consulta: Se sua consulta for uma busca, você pode exibir seus resultados no formato de uma tabela.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Campos do tipo Data aceitam consultas em linguagem natural (em inglês) para produzir um <i>From</i> e um <i>To</i> de modo a formar um intervalo dentro do qual os resultados são filtrados.</p>\
-		<p>Os seguintes formatos são suportados:</p>\
-		<ul>\
-			<li><b>Palavras-chave</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				buscam por datas de acordo com a palavra-chave. <code>last year</code> irá buscar tudo do último ano.</li>\
-			<li><b>Intervalos</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (espaços são opcionais, diversos sinônimos para qualificadores de intervalo)<br>\
-				Cria um intervalo de busca a partir de agora (<code>now</code>), extendendo este intervalo no passado e no futuro de acordo com intervalo especificado.</li>\
-			<li><b>Data/Hora (<i>DateTime</i>) e Data/Hora parcial</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				esses formatos especificam um intervalo especifico. <code>2011</code> irá buscar todo o ano de 2011, enquanto <code>2011-01-18 12:32:45</code> irá buscar apenas por resultados dentro deste intervalo de 1 segundo</li>\
-			<li><b>Tempo (<i>Time</i>) e Tempo parcial</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				esses formatos buscam por um horário específico no dia atual. <code>12:32</code> irá buscar este minuto específico do dia</li>\
-			<li><b>Intervalos de Data</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				Um intervalo de data é criado especificando-se duas datas em qualquer formato (Palavras-chave, Data/Hora ou Tempo) separados por &lt; ou -&gt; (ambos fazem a mesma coisa). Se a data de início ou fim do intervalo não for especificada é a mesma coisa que não impor limites na busca nesta direção.</li>\
-			<li><b>Intervalo de Data com Deslocamento</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				Busca a data especificada incluindo o intervalo na direção determinada pelo deslocamento</li>\
-			<li><b>Intervalos Bidirecionais</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				Idêntico ao exemplo anterior porém o intervalo é extendido em ambas as direções a partir da data especificada</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/tr_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/tr_strings.js
deleted file mode 100644
index 3bb987f81..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/tr_strings.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({

-	"General.Elasticsearch": "Elasticsearch",

-	"General.LoadingAggs": "Gruplar Yükleniyor...",

-	"General.Searching": "Aranıyor...",

-	"General.Search": "Ara",

-	"General.Help": "Yardım",

-	"General.HelpGlyph": "?",

-	"General.CloseGlyph": "X",

-	"General.RefreshResults": "Yenile",

-	"General.ManualRefresh": "Manuel Yenileme",

-	"General.RefreshQuickly": "Hızlı yenile",

-	"General.Refresh5seconds": "5 saniyede bir yenile",

-	"General.Refresh1minute": "Her dakika yenile",

-	"AliasForm.AliasName": "Alternatif İsim",

-	"AliasForm.NewAliasForIndex": "{0} için yeni alternatif isim",

-	"AliasForm.DeleteAliasMessage": "{1} silmek için ''{0}'' . Geriye dönüş yoktur.",

-	"AnyRequest.DisplayOptions" : "Seçenekleri Göster",

-	"AnyRequest.AsGraph" : "Sonuçları Çizdir",

-	"AnyRequest.AsJson" : "JSON formatında göster",

-	"AnyRequest.AsTable" : "Arama sonuçlarını tablo halinde göster",

-	"AnyRequest.History" : "Geçmiş",

-	"AnyRequest.RepeatRequest" : "İsteği Tekrarla",

-	"AnyRequest.RepeatRequestSelect" : "İsteği sürekli tekrarla ",

-	"AnyRequest.Transformer" : "Sonuç Dönüştürücü",

-	"AnyRequest.Pretty": "Düzenli",

-	"AnyRequest.Query" : "Sorgu",

-	"AnyRequest.Request": "Gönder",

-	"AnyRequest.Requesting": "İsteniyor...",

-	"AnyRequest.ValidateJSON": "JSON Doğrula",

-	"Browser.Title": "Browser",

-	"Browser.ResultSourcePanelTitle": "Sonuç Kaynağı",

-	"Command.DELETE": "SİL",

-	"Command.SHUTDOWN": "KAPA",

-	"Command.DeleteAliasMessage": "Alternatif ismi sil?",

-	"ClusterOverView.IndexName": "Indeks İsmi",

-	"ClusterOverview.NumShards": "Sektör Sayısı",

-	"ClusterOverview.NumReplicas": "Yedek Sayısı",

-	"ClusterOverview.NewIndex": "Yeni Indeks",

-	"IndexActionsMenu.Title": "İşlemler",

-	"IndexActionsMenu.NewAlias": "Yeni Alternatif İsim...",

-	"IndexActionsMenu.Refresh": "Yenile",

-	"IndexActionsMenu.Flush": "Boşalt",

-	"IndexActionsMenu.Optimize": "Optimize et...",

-	"IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)",

-	"IndexActionsMenu.Analyser": "Analizi test et",

-	"IndexActionsMenu.Open": "Aç",

-	"IndexActionsMenu.Close": "Kapa",

-	"IndexActionsMenu.Delete": "Sil...",

-	"IndexInfoMenu.Title": "Bilgi",

-	"IndexInfoMenu.Status": "Indeks Durumu",

-	"IndexInfoMenu.Metadata": "Indeks Metaveri",

-	"IndexCommand.TextToAnalyze": "Analiz edilecek metin",

-	"IndexCommand.ShutdownMessage": "{1} kapatmak için ''{0}'' yazın . Nod bu arayüzden tekrar BAŞLATILAMAZ",

-	"IndexOverview.PageTitle": "Indeksler Genel Bakış",

-	"IndexSelector.NameWithDocs": "{0} ({1} döküman)",

-	"IndexSelector.SearchIndexForDocs": "{0} indeksinde ara:",

-	"FilterBrowser.OutputType": "Sonuç Formatı: {0}",

-	"FilterBrowser.OutputSize": "Sonuç Sayısı: {0}",

-	"Header.ClusterHealth": "Küme Durumu: {0} ({1} de {2})",

-	"Header.ClusterNotConnected": "Küme Durumu: Bağlı Değil",

-	"Header.Connect": "Bağlan",

-	"Nav.AnyRequest": "Özel Sorgu",

-	"Nav.Browser": "Görüntüle",

-	"Nav.ClusterHealth": "Küme Durumu",

-	"Nav.ClusterState": "Küme Statüsü",

-	"Nav.ClusterNodes": "Nod Bilgileri",

-	"Nav.Info": "Bilgi",

-	"Nav.NodeStats": "Nod İstatistikleri",

-	"Nav.Overview": "Genel Bakış",

-	"Nav.Indices": "Indeksler",

-	"Nav.Plugins": "Eklentiler",

-	"Nav.Status": "Indeks İstatistikleri",

-	"Nav.Templates": "Şablonlar",

-	"Nav.StructuredQuery": "Yapılandırılmış Sorgu",

-	"NodeActionsMenu.Title": "İşlemler",

-	"NodeActionsMenu.Shutdown": "Kapat...",

-	"NodeInfoMenu.Title": "Bilgi",

-	"NodeInfoMenu.ClusterNodeInfo": "Küme Nod Bilgileri",

-	"NodeInfoMenu.NodeStats": "Nod İstatistikleri",

-	"NodeType.Client": "Client Nod",

-	"NodeType.Coord": "Coordinator",

-	"NodeType.Master": "Master Nod",

-	"NodeType.Tribe": "Tribe Nod",

-	"NodeType.Worker": "Worker Nod",

-	"NodeType.Unassigned": "Sahipsiz",

-	"OptimizeForm.OptimizeIndex": "{0} Optimize Et",

-	"OptimizeForm.MaxSegments": "Maksimum Segment Sayısı",

-	"OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle",

-	"OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt",

-	"OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle",

-	"Overview.PageTitle" : "Kümeler Genelbakış",

-	"Output.JSON": "JSON",

-	"Output.Table": "Tablo",

-	"Output.CSV": "CSV",

-	"Output.ShowSource": "Sorgu kaynağını göster",

-	"Preference.SortCluster": "Kümeyi Sırala",

-	"Sort.ByName": "İsme göre",

-	"Sort.ByAddress": "Adrese göre",

-	"Sort.ByType": "Tipe göre",

-	"Preference.SortIndices": "Indeksleri sırala",

-	"SortIndices.Descending": "Azalan",

-	"SortIndices.Ascending": "Artan",

-	"Preference.ViewAliases": "Alternatif isimleri görüntüle",

-	"ViewAliases.Grouped": "Gruplanmış",

-	"ViewAliases.List": "Liste",

-	"ViewAliases.None": "Karışık",

-	"Overview.IndexFilter": "Indeks Filtresi",

-	"TableResults.Summary": "{0} parçanın {1} tanesi arandı. {2} sonuç. {3} saniye",

-	"QueryFilter.AllIndices": "Tüm Indeksler",

-	"QueryFilter.AnyValue": "herhangi",

-	"QueryFilter-Header-Indices": "Indeksler",

-	"QueryFilter-Header-Types": "Tipler",

-	"QueryFilter-Header-Fields": "Alanlar",

-	"QueryFilter.DateRangeHint.from": "{0}'dan",

-	"QueryFilter.DateRangeHint.to": "  {0}'a",

-	"Query.FailAndUndo": "Sorgu Başarısız. Son değişiklikler geri alınıyor.",

-	"StructuredQuery.ShowRawJson": "Formatsız JSON göster"

-});

-

-i18n.setKeys({

-	"AnyRequest.TransformerHelp" : "\

-		<p>Sonuç Dönüştürücü sorgudan dönen JSON sonuçlarını işleyip daha kullanışlı bir formata dönüştürmek için kullanılabilir.</p>\

-		<p>Dönüştürücü içierisinde javascript fonksiyonu tanımlanmalıdır. Bu fonksiyondan dönen yeni sonuç çıktı kısmına yazdırılır.</p>\

-		<p>Örnek:<br>\

-		  <code>return root.hits.hits[0];</code> sonucu dolaşarak ilk eşleşmeyi göster<br>\

-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code> tüm kümede kullanılan toplam belleği gösterir<br></p>\

-		<p>Aşağıdaki fonksiyonlar dizi ve objelerin işlenmesinde yardımcı olması için kullanılabilir<br>\

-		<ul>\

-			<li><i>Object.keys</i>(object) := array</li>\

-			<li>array.<i>forEach</i>(function(prop, index))</li>\

-			<li>array.<i>map</i>(function(prop, index)) := array</li>\

-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\

-		</ul>\

-		<p>Sorgu tekrarlama çalışırken, prev isimli ekstra bir parametre dönüştürücü fonksiyonuna verilir. Bu sayede karşılaştırmalar ve toplu grafik gösterimleri yapılabilir.</p>\

-		<p>Örnek:<br>\

-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code> önceki dakika boyunca kümede bulunan ilk nod üzerindeki averaj yükü verir.\

-		Bu sonuç nod için yük grafiği yaratılmasında kullanılabilir.\

-		"

-});

-

-i18n.setKeys({

-	"AnyRequest.DisplayOptionsHelp" : "\

-		<p>Sade Json: Sorgunun tüm sonuçlarını ve (yapıldıysa) dönüştürüldükten sonraki halini sade JSON formatında gösterir </p>\

-		<p>Sonuçları Çizdir: Sonuçları grafiksel olarak görüntülemek için sonuç dörücüyü kullanarak değerleri dizi haline getirin.</p>\

-		<p>Arama Sonuçları Tablosu: Eğer sorgunuz bir arama ise, sonuçları bir tabloda görüntüleyebilirsiniz.</p>\

-		"

-});

-

-i18n.setKeys({

-	"QueryFilter.DateRangeHelp" : "\

-		<p>Tarih alanları ana dile yakın kelimeler kullanarak iki tarih aralığında sorgu yapılabilmesini sağlar.</p>\

-		<p>Aşağıdaki tanımlar kullanılabilir:</p>\

-		<ul>\

-			<li><b>Anahtar Kelimeler</b><br>\

-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\

-				kelimeleri eşleşen tarihleri verir. Örneğin <code>last year</code> geçen yıl tarihli bütün verileri döndürür.</li>\

-			<li><b>Aralıklar</b><br>\

-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (boşluklar isteğe bağlıdır, ayni kelime için farklı yazım şekilleri kullanılabilir)<br>\

-				Şu anki tarihi (<code>now</code>) baz alarak geçmiş veya ileriki bir tarih aralığındaki kayıtları verir.</li>\

-			<li><b>Tarih ve Kısmi Tarihler</b><br>\

-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\

-				bu formatlar spesifik bir tarihi tanımlarlar. <code>2011</code> tüm 2011 yılını ararken, <code>2011-01-18 12:32:45</code> şeklinde bir sorgu sadece o saniyedeki sonuçları verir.</li>\

-			<li><b>Zaman ve Kısmi Zamanlar</b><br>\

-				<code>12<br> 12:32<br> 12:32:45</code><br>\

-				bu formatlar gün içerisinde spesifik bir zamanı tanımlarlar. Örneğin <code>12:32</code> sadece bu saat ve dakikadaki kayıtları verir.</li>\

-			<li><b>Tarih Aralıkları</b><br>\

-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\

-				Tarih aralıkları yukarda belirtilen herhangi bir formatı &lt; or -&gt;  ile ayırarak yapılabilir. Eğer aralığın bir tarafı eksikse, sorgu ucu açıkmış gibi davranır.</li>\

-			<li><b>Ofsetli Tarih Aralığı</b><br>\

-				<code>2010 -> 1yr<br> 3mins < now</code>\

-				Verilen yöndeki tarih aralığına bakar.</li>\

-			<li><b>Çakılı Aralıklar</b><br>\

-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\

-				Yukarıdakiyle ayni fakat belirtilen tarihten her iki yöne de bakılır.</li>\

-		</ul>\

-	"

-});

diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/zh_strings.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/zh_strings.js
deleted file mode 100644
index 2d83d43b0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/lang/zh_strings.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-i18n.setKeys({
-	"General.Elasticsearch": "Elasticsearch",
-	"General.LoadingAggs": "加载聚合查询...",
-	"General.Searching": "搜索中...",
-	"General.Search": "搜索",
-	"General.Help": "帮助",
-	"General.HelpGlyph": "?",
-	"General.CloseGlyph": "X",
-	"General.RefreshResults": "刷新",
-	"General.ManualRefresh": "手动刷新",
-	"General.RefreshQuickly": "快速刷新",
-	"General.Refresh5seconds": "每5秒刷新",
-	"General.Refresh1minute": "每1分钟刷新",
-	"AliasForm.AliasName": "别名",
-	"AliasForm.NewAliasForIndex": "为 {0} 创建新别名",
-	"AliasForm.DeleteAliasMessage": "输入 ''{0}''  删除 {1}. 此操作无法恢复",
-	"AnyRequest.DisplayOptions" : "显示选项",
-	"AnyRequest.AsGraph" : "图形视图",
-	"AnyRequest.AsJson" : "原始 JSON",
-	"AnyRequest.AsTable" : "表格视图",
-	"AnyRequest.History" : "历史记录",
-	"AnyRequest.RepeatRequest" : "重复请求",
-	"AnyRequest.RepeatRequestSelect" : "重复周期 ",
-	"AnyRequest.Transformer" : "结果转换器",
-	"AnyRequest.Pretty": "易读",
-	"AnyRequest.Query" : "查询",
-	"AnyRequest.Request": "提交请求",
-	"AnyRequest.Requesting": "请求中...",
-	"AnyRequest.ValidateJSON": "验证 JSON",
-	"Browser.Title": "数据浏览",
-	"Browser.ResultSourcePanelTitle": "原始数据",
-	"Command.DELETE": "删除",
-	"Command.SHUTDOWN": "关闭",
-	"Command.DeleteAliasMessage": "删除别名?",
-	"ClusterOverView.IndexName": "索引名称",
-	"ClusterOverview.NumShards": "分片数",
-	"ClusterOverview.NumReplicas": "副本数",
-	"ClusterOverview.NewIndex": "新建索引",
-	"IndexActionsMenu.Title": "动作",
-	"IndexActionsMenu.NewAlias": "新建别名...",
-	"IndexActionsMenu.Refresh": "刷新",
-	"IndexActionsMenu.Flush": "Flush刷新",
-	"IndexActionsMenu.Optimize": "优化...",
-	"IndexActionsMenu.Snapshot": "网关快照",
-	"IndexActionsMenu.Analyser": "测试分析器",
-	"IndexActionsMenu.Open": "开启",
-	"IndexActionsMenu.Close": "关闭",
-	"IndexActionsMenu.Delete": "删除...",
-	"IndexInfoMenu.Title": "信息",
-	"IndexInfoMenu.Status": "索引状态",
-	"IndexInfoMenu.Metadata": "索引信息",
-	"IndexCommand.TextToAnalyze": "文本分析",
-	"IndexCommand.ShutdownMessage": "输入 ''{0}'' 以关闭 {1} 节点. 关闭的节点无法从此界面重新启动",
-	"IndexOverview.PageTitle": "索引概览",
-	"IndexSelector.NameWithDocs": "{0} ({1} 个文档)",
-	"IndexSelector.SearchIndexForDocs": "搜索 {0} 的文档， 查询条件:",
-	"FilterBrowser.OutputType": "返回格式: {0}",
-	"FilterBrowser.OutputSize": "显示数量: {0}",
-	"Header.ClusterHealth": "集群健康值: {0} ({1} of {2})",
-	"Header.ClusterNotConnected": "集群健康值: 未连接",
-	"Header.Connect": "连接",
-	"Nav.AnyRequest": "复合查询",
-	"Nav.Browser": "数据浏览",
-	"Nav.ClusterHealth": "集群健康值",
-	"Nav.ClusterState": "群集状态",
-	"Nav.ClusterNodes": "集群节点",
-	"Nav.Info": "信息",
-	"Nav.NodeStats": "节点状态",
-	"Nav.Overview": "概览",
-	"Nav.Indices": "索引",
-	"Nav.Plugins": "插件",
-	"Nav.Status": "状态",
-	"Nav.Templates": "模板",
-	"Nav.StructuredQuery": "基本查询",
-	"NodeActionsMenu.Title": "动作",
-	"NodeActionsMenu.Shutdown": "关停...",
-	"NodeInfoMenu.Title": "信息",
-	"NodeInfoMenu.ClusterNodeInfo": "集群节点信息",
-	"NodeInfoMenu.NodeStats": "节点状态",
-	"NodeType.Client": "节点客户端",
-	"NodeType.Coord": "协调器",
-	"NodeType.Master": "主节点",
-	"NodeType.Tribe": "分支结点",
-	"NodeType.Worker": "工作节点",
-	"NodeType.Unassigned": "未分配",
-	"OptimizeForm.OptimizeIndex": "优化 {0}",
-	"OptimizeForm.MaxSegments": "最大索引段数",
-	"OptimizeForm.ExpungeDeletes": "只删除被标记为删除的",
-	"OptimizeForm.FlushAfter": "优化后刷新",
-	"OptimizeForm.WaitForMerge": "等待合并",
-	"Overview.PageTitle" : "集群概览",
-	"Output.JSON": "JSON",
-	"Output.Table": "Table",
-	"Output.CSV": "CSV",
-	"Output.ShowSource": "显示查询语句",
-	"Preference.SortCluster": "集群排序",
-	"Sort.ByName": "按名称",
-	"Sort.ByAddress": "按地址",
-	"Sort.ByType": "按类型",
-	"TableResults.Summary": "查询 {1} 个分片中用的 {0} 个. {2} 命中. 耗时 {3} 秒",
-	"QueryFilter.AllIndices": "所有索引",
-	"QueryFilter.AnyValue": "任意",
-	"QueryFilter-Header-Indices": "索引",
-	"QueryFilter-Header-Types": "类型",
-	"QueryFilter-Header-Fields": "字段",
-	"QueryFilter.DateRangeHint.from": "从 : {0}",
-	"QueryFilter.DateRangeHint.to": "  到 : {0}",
-	"Query.FailAndUndo": "查询失败. 撤消最近的更改",
-	"StructuredQuery.ShowRawJson": "显示原始 JSON"
-});
-
-i18n.setKeys({
-	"AnyRequest.TransformerHelp" : "\
-		<p>结果转换器用于返回结果原始JSON的后续处理, 将结果转换为更有用的格式.</p>\
-		<p>转换器应当包含javascript函数体. 函数的返回值将传递给json分析器</p>\
-		<p>Example:<br>\
-		  <code>return root.hits.hits[0];</code><br>\
-		  遍历结果并只显示第一个元素<br>\
-		  <code>return Object.keys(root.nodes).reduce(function(tot, node) { return tot + root.nodes[node].os.mem.used_in_bytes; }, 0);</code><br>\
-		  将返回整个集群使用的总内存<br></p>\
-		<p>以下函数可以方便的处理数组与对象<br>\
-		<ul>\
-			<li><i>Object.keys</i>(object) := array</li>\
-			<li>array.<i>forEach</i>(function(prop, index))</li>\
-			<li>array.<i>map</i>(function(prop, index)) := array</li>\
-			<li>array.<i>reduce</i>(function(accumulator, prop, index), initial_value) := final_value</li>\
-		</ul>\
-		<p>当启用重复请求时, prev 参数将会传递给转换器函数. 这将用于比较并累加图形</p>\
-		<p>Example:<br>\
-		<code>var la = [ root.nodes[Object.keys(root.nodes)[0]].os.load_average[0] ]; return prev ? la.concat(prev) : la;</code><br>\
-		将返回第一个集群节点最近一分钟内的平均负载\
-		将会把结果送人图表以产生一个负载曲线图\
-		"
-});
-
-i18n.setKeys({
-	"AnyRequest.DisplayOptionsHelp" : "\
-		<p>原始 Json: 将完整的查询结果转换为原始JSON格式 </p>\
-		<p>图形视图: 将查询结果图形化, 将查询结果转换为数组值的形式</p>\
-		<p>表格视图: 如果查询是一个搜索, 可以将搜索结果以表格形式显示.</p>\
-		"
-});
-
-i18n.setKeys({
-	"QueryFilter.DateRangeHelp" : "\
-		<p>Date 字段接受日期范围的形式查询.</p>\
-		<p>一下格式被支持:</p>\
-		<ul>\
-			<li><b>关键词 / 关键短语</b><br>\
-				<code>now<br> today<br> tomorrow<br> yesterday<br> last / this / next + week / month / year</code><br>\
-				搜索关键字匹配的日期. <code>last year</code> 将搜索过去全年.</li>\
-			<li><b>范围</b><br>\
-				<code>1000 secs<br> 5mins<br> 1day<br> 2days<br> 80d<br> 9 months<br> 2yrs</code> (空格可选, 同等于多个范围修饰词)<br>\
-				创建一个指定时间范围的搜索, 将围绕<code>现在</code> 并延伸至过去与未来时间段.</li>\
-			<li><b>DateTime 与 DateTime局部</b><br>\
-				<code>2011<br> 2011-01<br> 2011-01-18<br> 2011-01-18 12<br> 2011-01-18 12:32<br> 2011-01-18 12:32:45</code><br>\
-				指定一个特定的日期范围. <code>2011</code>会搜索整个 2011年, 而 <code>2011-01-18 12:32:45</code> 将只搜索1秒范围内</li>\
-			<li><b>Time 与 Time局部</b><br>\
-				<code>12<br> 12:32<br> 12:32:45</code><br>\
-				这些格式只搜索当天的特定时间. <code>12:32</code> 将搜索当天的那一分钟</li>\
-			<li><b>日期范围</b><br>\
-				<code>2010 -&gt; 2011<br> last week -&gt; next week<br> 2011-05 -&gt;<br> &lt; now</code><br>\
-				日期范围是将两个日期格式串 (日期关键字 / DateTime / Time) 用  &lt; 或 -&gt; (效果相同) 分隔. 如果缺少任意一端，那么在这个方向上时间将没有限制.</li>\
-			<li><b>偏移日期范围</b><br>\
-				<code>2010 -> 1yr<br> 3mins < now</code>\
-				搜索包括指定方向上偏移的日期.</li>\
-			<li><b>锚定范围</b><br>\
-				<code>2010-05-13 05:13 <> 10m<br> now <> 1yr<br> lastweek <> 1month</code><br>\
-				类似于上面的便宜日期，在两个方向上将锚定的日期延长</li>\
-		</ul>\
-	"
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/cluster.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/cluster.js
deleted file mode 100644
index 0b0cec98a..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/cluster.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var services = app.ns("services");
-	var ux = app.ns("ux");
-
-	function parse_version( v ) {
-		return v.match(/^(\d+)\.(\d+)\.(\d+)/).slice(1,4).map( function(d) { return parseInt(d || 0, 10); } );
-	}
-
-	services.Cluster = ux.Class.extend({
-		defaults: {
-			base_uri: null
-		},
-		init: function() {
-			this.base_uri = this.config.base_uri;
-		},
-		setVersion: function( v ) {
-			this.version = v;
-			this._version_parts = parse_version( v );
-		},
-		versionAtLeast: function( v ) {
-			var testVersion = parse_version( v );
-			for( var i = 0; i < 3; i++ ) {
-				if( testVersion[i] !== this._version_parts[i] ) {
-					return testVersion[i] < this._version_parts[i];
-				}
-			}
-			return true;
-		},
-		request: function( params ) {
-			return $.ajax( $.extend({
-				url: this.base_uri + params.path,
-				dataType: "json",
-				error: function(xhr, type, message) {
-					if("console" in window) {
-						console.log({ "XHR Error": type, "message": message });
-					}
-				}
-			},  params) );
-		},
-		"get": function(path, success) { return this.request( { type: "GET", path: path, success: success } ); },
-		"post": function(path, data, success) { return this.request( { type: "POST", path: path, data: data, success: success } ); },
-		"put": function(path, data, success) { return this.request( { type: "PUT", path: path, data: data, success: success } ); },
-		"delete": function(path, data, success) { return this.request( { type: "DELETE", path: path, data: data, success: success } ); }
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/clusterSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/clusterSpec.js
deleted file mode 100644
index 2ccffa760..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/cluster/clusterSpec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.services.Cluster", function() {
-
-	var Cluster = window.app.services.Cluster;
-	var test = window.test;
-
-	var cluster;
-
-	beforeEach( function() {
-		cluster = new Cluster({ base_uri: "http://localhost:9200/" });
-	});
-
-	describe( "when it is initialised", function() {
-
-		it("should have a localhost base_uri", function() {
-			expect( cluster.base_uri ).toBe( "http://localhost:9200/" );
-		});
-
-		it("should have no version", function() {
-			expect( cluster.version ).toBe( undefined );
-		});
-
-	});
-
-	describe( "setVersion()", function() {
-
-		it("have a version", function() {
-			cluster.setVersion( "1.12.3-5" );
-			expect( cluster.version ).toBe( "1.12.3-5" );
-		});
-
-	});
-
-	describe("versionAtLeast()", function() {
-		var vs = [ "0.0.3", "0.13.5", "0.90.3", "1.0.0", "1.1.0", "1.2.3", "1.12.4.rc2", "13.0.0" ];
-
-		it("should return true for versions that are less than or equal to the current version", function() {
-			cluster.setVersion("1.12.5");
-			expect( cluster.versionAtLeast("1.12.5" ) ).toBe( true );
-			expect( cluster.versionAtLeast("1.12.5rc2" ) ).toBe( true );
-			expect( cluster.versionAtLeast("1.12.5-6" ) ).toBe( true );
-			expect( cluster.versionAtLeast("1.12.5-6.beta7" ) ).toBe( true );
-			expect( cluster.versionAtLeast("1.12.4" ) ).toBe( true );
-			expect( cluster.versionAtLeast("0.12.4" ) ).toBe( true );
-			expect( cluster.versionAtLeast("1.1.8" ) ).toBe( true );
-
-			for( var i = 0; i < vs.length - 1; i++ ) {
-				cluster.setVersion( vs[i+1] );
-				expect( cluster.versionAtLeast( vs[i] ) ).toBe( true );
-			}
-		});
-
-		it("should return false for versions that are greater than the current version", function() {
-			cluster.setVersion("1.12.5");
-			expect( cluster.versionAtLeast("1.12.6" ) ).toBe( false );
-			expect( cluster.versionAtLeast("1.13.4" ) ).toBe( false );
-			expect( cluster.versionAtLeast("2.0.0" ) ).toBe( false );
-
-			for( var i = 0; i < vs.length - 1; i++ ) {
-				cluster.setVersion( vs[i] );
-				expect( cluster.versionAtLeast( vs[i+1] ) ).toBe( false );
-			}
-		});
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterState.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterState.js
deleted file mode 100644
index 4fee9dab9..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterState.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-	(function( app ) {
-
-	var services = app.ns("services");
-	var ux = app.ns("ux");
-
-	services.ClusterState = ux.Observable.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.clusterState = null;
-			this.status = null;
-			this.nodeStats = null;
-			this.clusterNodes = null;
-		},
-		refresh: function() {
-			var self = this, clusterState, status, nodeStats, clusterNodes, clusterHealth;
-			function updateModel() {
-				if( clusterState && status && nodeStats && clusterNodes && clusterHealth ) {
-					this.clusterState = clusterState;
-					this.status = status;
-					this.nodeStats = nodeStats;
-					this.clusterNodes = clusterNodes;
-					this.clusterHealth = clusterHealth;
-					this.fire( "data", this );
-				}
-			}
-			this.cluster.get("_cluster/state", function( data ) {
-				clusterState = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_stats", function( data ) {
-				status = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_nodes/stats", function( data ) {
-				nodeStats = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_nodes", function( data ) {
-				clusterNodes = data;
-				updateModel.call( self );
-			});
-			this.cluster.get("_cluster/health", function( data ) {
-				clusterHealth = data;
-				updateModel.call( self );
-			});
-		},
-		_clusterState_handler: function(state) {
-			this.clusterState = state;
-			this.redraw("clusterState");
-		},
-		_status_handler: function(status) {
-			this.status = status;
-			this.redraw("status");
-		},
-		_clusterNodeStats_handler: function(stats) {
-			this.nodeStats = stats;
-			this.redraw("nodeStats");
-		},
-		_clusterNodes_handler: function(nodes) {
-			this.clusterNodes = nodes;
-			this.redraw("clusterNodes");
-		},
-		_clusterHealth_handler: function(health) {
-			this.clusterHealth = health;
-			this.redraw("status");
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterStateSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterStateSpec.js
deleted file mode 100644
index ccbf5757b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/clusterState/clusterStateSpec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.services.ClusterState", function() {
-
-	var ClusterState = window.app.services.ClusterState;
-	var test = window.test;
-
-	var c;
-	var dummyData = {};
-	var dataEventCallback;
-
-	function expectAllDataToBeNull() {
-		expect( c.clusterState ).toBe( null );
-		expect( c.status ).toBe( null );
-		expect( c.nodeStats ).toBe( null );
-		expect( c.clusterNodes ).toBe( null );
-	}
-
-	beforeEach( function() {
-		test.cb.use();
-		dataEventCallback = jasmine.createSpy("onData");
-		c = new ClusterState({
-			cluster: {
-				get: test.cb.createSpy("get", 1, [ dummyData ] )
-			},
-			onData: dataEventCallback
-		});
-	});
-
-	describe( "when it is initialised", function() {
-
-		it("should have null data", function() {
-			expectAllDataToBeNull();
-		});
-
-	});
-
-	describe( "when refresh is called", function() {
-
-		beforeEach( function() {
-			c.refresh();
-		});
-
-		it("should not not update models until all network requests have completed", function() {			
-			test.cb.execOne();
-			expectAllDataToBeNull();
-			test.cb.execOne();
-			expectAllDataToBeNull();
-			test.cb.execOne();
-			expectAllDataToBeNull();
-			test.cb.execOne();
-			expectAllDataToBeNull();
-			test.cb.execOne();
-			expect( c.clusterState ).toBe( dummyData );
-			expect( c.status ).toBe( dummyData );
-			expect( c.nodeStats ).toBe( dummyData );
-			expect( c.clusterNodes ).toBe( dummyData );
-		});
-
-		it("should fire a 'data' event when all data is ready", function() {
-			test.cb.execAll();
-			expect( dataEventCallback ).toHaveBeenCalledWith( c );
-		});
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferenceSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferenceSpec.js
deleted file mode 100644
index 1bad00a54..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferenceSpec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.services.Preferences", function(){
-
-var Preferences = window.app.services.Preferences;
-
-	var prefs;
-
-	beforeEach( function() {
-		spyOn(window.localStorage, "getItem").and.returnValue( '{"foo":true}' );
-		spyOn(window.localStorage, "setItem");
-		prefs = Preferences.instance();
-	});
-
-	it("should return a preference from localStorage", function() {
-		expect( prefs.get("foo") ).toEqual( {foo:true} );
-	});
-
-	it("should set a preference in localStorage", function() {
-		prefs.set("foo", { foo: false } );
-		expect( window.localStorage.setItem ).toHaveBeenCalledWith('foo', '{"foo":false}');
-	});
-
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferences.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferences.js
deleted file mode 100644
index d7fff75eb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/services/preferences/preferences.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-	
-	var ux = app.ns("ux");
-	var services = app.ns("services");
-
-	services.Preferences = ux.Singleton.extend({
-		init: function() {
-			this._storage = window.localStorage;
-			this._setItem("__version", 1 );
-		},
-		get: function( key ) {
-			return this._getItem( key );
-		},
-		set: function( key, val ) {
-			return this._setItem( key, val );
-		},
-		_getItem: function( key ) {
-			try {
-				return JSON.parse( this._storage.getItem( key ) );
-			} catch(e) {
-				console.warn( e );
-				return undefined;
-			}
-		},
-		_setItem: function( key, val ) {
-			try {
-				return this._storage.setItem( key, JSON.stringify( val ) );
-			} catch(e) {
-				console.warn( e );
-				return undefined;
-			}
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.css
deleted file mode 100644
index 3042e7b37..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.css
+++ /dev/null
@@ -1 +0,0 @@
-.require { color: #a00; }
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.js
deleted file mode 100644
index f234266cf..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractField/abstractField.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, joey ) {
-
-	var ui = app.ns("ui");
-
-	ui.AbstractField = ui.AbstractWidget.extend({
-
-		defaults: {
-			name : "",			// (required) - name of the field
-			require: false,	// validation requirements (false, true, regexp, function)
-			value: "",			// default value
-			label: ""				// human readable label of this field
-		},
-
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-			this.field = this.el.find("[name="+this.config.name+"]");
-			this.label = this.config.label;
-			this.require = this.config.require;
-			this.name = this.config.name;
-			this.val( this.config.value );
-			this.attach( parent );
-		},
-
-		val: function( val ) {
-			if(val === undefined) {
-				return this.field.val();
-			} else {
-				this.field.val( val );
-				return this;
-			}
-		},
-
-		validate: function() {
-			var val = this.val(), req = this.require;
-			if( req === false ) {
-				return true;
-			} else if( req === true ) {
-				return val.length > 0;
-			} else if( req.test && $.isFunction(req.test) ) {
-				return req.test( val );
-			} else if( $.isFunction(req) ) {
-				return req( val, this );
-			}
-		}
-
-	});
-
-})( this.jQuery, this.app, this.joey );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.css
deleted file mode 100644
index 6cce209bc..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.css
+++ /dev/null
@@ -1,43 +0,0 @@
-#uiModal {
-	background: black;
-}
-
-.uiPanel {
-	box-shadow: -1px 2.5px 4px -3px black, -1px -2.5px 4px -3px black, 3px 2.5px 4px -3px black, 3px -2.5px 4px -3px black;
-	position: absolute;
-	background: #eee;
-	border: 1px solid #666;
-}
-
-.uiPanel-titleBar {
-	text-align: center;
-	font-weight: bold;
-	padding: 2px 0;
-	background: rgba(223, 223, 223, 0.75);
-	background: -moz-linear-gradient(top, rgba(223, 223, 223, 0.75), rgba(193, 193, 193, 0.75), rgba(223, 223, 223, 0.75));
-	background: -webkit-linear-gradient(top, rgba(223, 223, 223, 0.75), rgba(193, 193, 193, 0.75), rgba(223, 223, 223, 0.75));
-	border-bottom: 1px solid #bbb;
-}
-
-.uiPanel-close {
-	cursor: pointer;
-	border: 1px solid #aaa;
-	background: #fff;
-	color: #fff;
-	float: left;
-	height: 10px;
-	left: 3px;
-	line-height: 9px;
-	padding: 1px 0;
-	position: relative;
-	text-shadow: 0 0 1px #000;
-	top: 0px;
-	width: 12px;
-}
-.uiPanel-close:hover {
-	background: #eee;
-}
-
-.uiPanel-body {
-	overflow: auto;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.js
deleted file mode 100644
index 8dc7e0a89..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractPanel/abstractPanel.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.AbstractPanel = ui.AbstractWidget.extend({
-		defaults: {
-			body: null,            // initial content of the body
-			modal: true,           // create a modal panel - creates a div that blocks interaction with page
-			height: 'auto',        // panel height
-			width: 400,            // panel width (in pixels)
-			open: false,           // show the panel when it is created
-			parent: 'BODY',        // node that panel is attached to
-			autoRemove: false      // remove the panel from the dom and destroy it when the widget is closed
-		},
-		shared: {  // shared data for all instances of ui.Panel and decendants
-			stack: [], // array of all open panels
-			modal: $( { tag: "DIV", id: "uiModal", css: { opacity: 0.2, position: "absolute", top: "0px", left: "0px" } } )
-		},
-		init: function() {
-			this._super();
-		},
-		open: function( ev ) {
-			this.el
-				.css( { visibility: "hidden" } )
-				.appendTo( this.config.parent )
-				.css( this._getPosition( ev ) )
-				.css( { zIndex: (this.shared.stack.length ? (+this.shared.stack[this.shared.stack.length - 1].el.css("zIndex") + 10) : 100) } )
-				.css( { visibility: "visible", display: "block" } );
-			this.shared.stack.remove(this);
-			this.shared.stack.push(this);
-			this._setModal();
-			$(document).bind("keyup", this._close_handler );
-			this.fire("open", { source: this, event: ev } );
-			return this;
-		},
-		close: function() {
-			var index = this.shared.stack.indexOf(this);
-			if(index !== -1) {
-				this.shared.stack.splice(index, 1);
-				this.el.css( { left: "-2999px" } ); // move the dialog to the left rather than hiding to prevent ie6 rendering artifacts
-				this._setModal();
-				this.fire("close", this );
-				if(this.config.autoRemove) {
-					this.remove();
-				}
-			}
-			return this;
-		},
-		// close the panel and remove it from the dom, destroying it (you can not reuse the panel after calling remove)
-		remove: function() {
-			this.close();
-			$(document).unbind("keyup", this._close_handler );
-			this._super();
-		},
-		// starting at the top of the stack, find the first panel that wants a modal and put it just underneath, otherwise remove the modal
-		_setModal: function() {
-			for(var stackPtr = this.shared.stack.length - 1; stackPtr >= 0; stackPtr--) {
-				if(this.shared.stack[stackPtr].config.modal) {
-					this.shared.modal
-						.appendTo( document.body )
-						.css( { zIndex: this.shared.stack[stackPtr].el.css("zIndex") - 5 } )
-						.css( $(document).vSize().asSize() );
-					return;
-				}
-			}
-			this.shared.modal.remove(); // no panels that want a modal were found
-		},
-		_getPosition: function() {
-			return $(window).vSize()                        // get the current viewport size
-				.sub(this.el.vSize())                         // subtract the size of the panel
-				.mod(function(s) { return s / 2; })           // divide by 2 (to center it)
-				.add($(document).vScroll())                   // add the current scroll offset
-				.mod(function(s) { return Math.max(5, s); })  // make sure the panel is not off the edge of the window
-				.asOffset();                                  // and return it as a {top, left} object
-		},
-		_close_handler: function( ev ) {
-			if( ev.type === "keyup" && ev.keyCode !== 27) { return; } // press esc key to close
-			$(document).unbind("keyup", this._close_handler);
-			this.close( ev );
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractWidget/abstractWidget.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractWidget/abstractWidget.js
deleted file mode 100644
index 5936d383c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/abstractWidget/abstractWidget.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, joey, app ) {
-
-	var ui = app.ns("ui");
-	var ux = app.ns("ux");
-
-	ui.AbstractWidget = ux.Observable.extend({
-		defaults : {
-			id: null     // the id of the widget
-		},
-
-		el: null,       // this is the jquery wrapped dom element(s) that is the root of the widget
-
-		init: function() {
-			this._super();
-			for(var prop in this) {       // automatically bind all the event handlers
-				if(prop.contains("_handler")) {
-					this[prop] = this[prop].bind(this);
-				}
-			}
-		},
-
-		id: function(suffix) {
-			return this.config.id ? (this.config.id + (suffix ? "-" + suffix : "")) : undefined;
-		},
-
-		attach: function( parent, method ) {
-			if( parent ) {
-				this.el[ method || "appendTo"]( parent );
-			}
-			this.fire("attached", this );
-			return this;
-		},
-
-		remove: function() {
-			this.el.remove();
-			this.fire("removed", this );
-			this.removeAllObservers();
-			this.el = null;
-			return this;
-		}
-	});
-
-	joey.plugins.push( function( obj ) {
-		if( obj instanceof ui.AbstractWidget ) {
-			return obj.el[0];
-		}
-	});
-
-})( this.jQuery, this.joey, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.css
deleted file mode 100644
index f00412cf1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.uiAnyRequest-request {
-	float: left;
-	width: 350px;
-	padding: 5px;
-	background: #d8e7ff;
-	background: -moz-linear-gradient(left, #d8e7ff, #e8f1ff);
-	background: -webkit-linear-gradient(left, #d8e7ff, #e8f1ff);
-}
-
-.uiAnyRequest-request INPUT[type=text],
-.uiAnyRequest-request TEXTAREA {
-	width: 340px;
-}
-
-.anyRequest INPUT[name=path] {
-	width: 259px;
-}
-
-.uiAnyRequest-out {
-	margin-left: 365px;
-}
-
-.uiAnyRequest-out P {
-	margin-top: 0;
-}
-
-.uiAnyRequest-jsonErr {
-	color: red;
-}
-
-.uiAnyRequest-history {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	max-height: 100px;
-	overflow-x: hidden;
-	overflow-y: auto;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.js
deleted file mode 100644
index 70c6c7a76..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/anyRequest/anyRequest.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n, raphael ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-	var services = app.ns("services");
-
-	ui.AnyRequest = ui.Page.extend({
-		defaults: {
-			cluster: null,       // (required) instanceof app.services.Cluster
-			path: "_search",     // default uri to send a request to
-			query: { query: { match_all: { }}},
-			transform: "  return root;" // default transformer function (does nothing)
-		},
-		init: function(parent) {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.history = this.prefs.get("anyRequest-history") || [ { type: "POST", path: this.config.path, query : JSON.stringify(this.config.query), transform: this.config.transform } ];
-			this.el = $.joey(this._main_template());
-			this.base_uriEl = this.el.find("INPUT[name=base_uri]");
-			this.pathEl = this.el.find("INPUT[name=path]");
-			this.typeEl = this.el.find("SELECT[name=method]");
-			this.dataEl = this.el.find("TEXTAREA[name=body]");
-			this.prettyEl = this.el.find("INPUT[name=pretty]");
-			this.transformEl = this.el.find("TEXTAREA[name=transform]");
-			this.asGraphEl = this.el.find("INPUT[name=asGraph]");
-			this.asTableEl = this.el.find("INPUT[name=asTable]");
-			this.asJsonEl = this.el.find("INPUT[name=asJson]");
-			this.cronEl = this.el.find("SELECT[name=cron]");
-			this.outEl = this.el.find("DIV.uiAnyRequest-out");
-			this.errEl = this.el.find("DIV.uiAnyRequest-jsonErr");
-			this.typeEl.val("GET");
-			this.attach(parent);
-			this.setHistoryItem(this.history[this.history.length - 1]);
-		},
-		setHistoryItem: function(item) {
-			this.pathEl.val(item.path);
-			this.typeEl.val(item.type);
-			this.dataEl.val(item.query);
-			this.transformEl.val(item.transform);
-		},
-		_request_handler: function( ev ) {
-			if(! this._validateJson_handler()) {
-				return;
-			}
-			var path = this.pathEl.val(),
-					type = this.typeEl.val(),
-					query = JSON.stringify(JSON.parse(this.dataEl.val())),
-					transform = this.transformEl.val(),
-					base_uri = this.base_uriEl.val();
-			if( ev ) { // if the user click request
-				if(this.timer) {
-					window.clearTimeout(this.timer); // stop any cron jobs
-				}
-				delete this.prevData; // remove data from previous cron runs
-				this.outEl.text(i18n.text("AnyRequest.Requesting"));
-				if( ! /\/$/.test( base_uri )) {
-					base_uri += "/";
-					this.base_uriEl.val( base_uri );
-				}
-				for(var i = 0; i < this.history.length; i++) {
-					if(this.history[i].path === path &&
-						this.history[i].type === type &&
-						this.history[i].query === query &&
-						this.history[i].transform === transform) {
-						this.history.splice(i, 1);
-					}
-				}
-				this.history.push({
-					path: path,
-					type: type,
-					query: query,
-					transform: transform
-				});
-				this.history.slice(250); // make sure history does not get too large
-				this.prefs.set( "anyRequest-history", this.history );
-				this.el.find("UL.uiAnyRequest-history")
-					.empty()
-					.append($( { tag: "UL", children: this.history.map(this._historyItem_template, this) }).children())
-					.children().find(":last-child").each(function(i, j) { j.scrollIntoView(false); }).end()
-					.scrollLeft(0);
-			}
-			this.config.cluster.request({
-				url: base_uri + path,
-				type: type,
-				data: query,
-				success: this._responseWriter_handler,
-				error: this._responseError_handler
-			});
-		},
-		_responseError_handler: function (response) {
-			var obj;
-			try {
-				obj = JSON.parse(response.responseText);
-				if (obj) {
-					this._responseWriter_handler(obj);
-				}
-			} catch (err) {
-			}
-		},
-		_responseWriter_handler: function(data) {
-			this.outEl.empty();
-			try {
-				data = (new Function("root", "prev", this.transformEl.val()))(data, this.prevData)
-			} catch(e) {
-				this.errEl.text(e.message);
-				return;
-			}
-			if(this.asGraphEl.attr("checked")) {
-				var w = this.outEl.width();
-				raphael(this.outEl[0], w - 10, 300)
-					.g.barchart(10, 10, w - 20, 280, [data]);
-			}
-			if(this.asTableEl.attr("checked")) {
-				try {
-					var store = new app.data.ResultDataSourceInterface();
-					this.outEl.append(new app.ui.ResultTable({
-						width: this.outEl.width() - 23,
-						store: store
-					} ) );
-					store.results(data);
-				} catch(e) {
-					this.errEl.text("Results Table Failed: " + e.message);
-				}
-			}
-			if(this.asJsonEl.attr("checked")) {
-				this.outEl.append(new ui.JsonPretty({ obj: data }));
-			}
-			if(this.cronEl.val() > 0) {
-				this.timer = window.setTimeout(function(){
-					this._request_handler();
-				}.bind(this), this.cronEl.val());
-			}
-			this.prevData = data;
-		},
-		_validateJson_handler: function( ev ) {
-			/* if the textarea is empty, we replace its value by an empty JSON object : "{}" and the request goes on as usual */
-			var jsonData = this.dataEl.val().trim();
-			var j;
-			if(jsonData === "") {
-				jsonData = "{}";
-				this.dataEl.val( jsonData );
-			}
-			try {
-				j = JSON.parse(jsonData);
-			} catch(e) {
-				this.errEl.text(e.message);
-				return false;
-			}
-			this.errEl.text("");
-			if(this.prettyEl.attr("checked")) {
-				this.dataEl.val(JSON.stringify(j, null, "  "));
-			}
-			return true;
-		},
-		_historyClick_handler: function( ev ) {
-			var item = $( ev.target ).closest( "LI" ).data( "item" );
-			this.setHistoryItem( item );
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "anyRequest", children: [
-				{ tag: "DIV", cls: "uiAnyRequest-request", children: [
-					new app.ui.SidebarSection({
-						open: false,
-						title: i18n.text("AnyRequest.History"),
-						body: { tag: "UL", onclick: this._historyClick_handler, cls: "uiAnyRequest-history", children: this.history.map(this._historyItem_template, this)	}
-					}),
-					new app.ui.SidebarSection({
-						open: true,
-						title: i18n.text("AnyRequest.Query"),
-						body: { tag: "DIV", children: [
-							{ tag: "INPUT", type: "text", name: "base_uri", value: this.config.cluster.config.base_uri },
-							{ tag: "BR" },
-							{ tag: "INPUT", type: "text", name: "path", value: this.config.path },
-							{ tag: "SELECT", name: "method", children: ["POST", "GET", "PUT", "HEAD", "DELETE"].map(ut.option_template) },
-							{ tag: "TEXTAREA", name: "body", rows: 20, text: JSON.stringify(this.config.query) },
-							{ tag: "BUTTON", css: { cssFloat: "right" }, type: "button", children: [ { tag: "B", text: i18n.text("AnyRequest.Request") } ], onclick: this._request_handler },
-							{ tag: "BUTTON", type: "button", text: i18n.text("AnyRequest.ValidateJSON"), onclick: this._validateJson_handler },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "pretty" }, i18n.text("AnyRequest.Pretty") ] },
-							{ tag: "DIV", cls: "uiAnyRequest-jsonErr" }
-						]}
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.Transformer"),
-						help: "AnyRequest.TransformerHelp",
-						body: { tag: "DIV", children: [
-							{ tag: "CODE", text: "function(root, prev) {" },
-							{ tag: "BR" },
-							{ tag: "TEXTAREA", name: "transform", rows: 5, text: this.config.transform },
-							{ tag: "BR" },
-							{ tag: "CODE", text: "}" }
-						] }
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.RepeatRequest"),
-						body: { tag: "DIV", children: [
-							i18n.text("AnyRequest.RepeatRequestSelect"), " ",
-							{ tag: "SELECT", name: "cron", children: [
-								{ value: 0, text: "do not repeat" },
-								{ value: 1000, text: "second" },
-								{ value: 1000 * 2, text: "2 seconds" },
-								{ value: 1000 * 5, text: "5 seconds" },
-								{ value: 1000 * 20, text: "20 seconds" },
-								{ value: 1000 * 60, text: "minute" },
-								{ value: 1000 * 60 * 10, text: "10 minutes" },
-								{ value: 1000 * 60 * 60, text: "hour" }
-							].map(function(op) { return $.extend({ tag: "OPTION"}, op); }) }
-						] }
-					}),
-					new app.ui.SidebarSection({
-						title: i18n.text("AnyRequest.DisplayOptions"),
-						help: "AnyRequest.DisplayOptionsHelp",
-						body: { tag: "DIV", children: [
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", checked: true, name: "asJson" }, i18n.text("AnyRequest.AsJson") ] },
-							{ tag: "BR" },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "asGraph" }, i18n.text("AnyRequest.AsGraph") ] },
-							{ tag: "BR" },
-							{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", name: "asTable" }, i18n.text("AnyRequest.AsTable") ] }
-						] }
-					})
-				] },
-				{ tag: "DIV", cls: "uiAnyRequest-out" }
-			] };
-		},
-		_historyItem_template: function(item) {
-			return { tag: "LI", cls: "booble", data: { item: item }, children: [
-				{ tag: "SPAN", text: item.path },
-				" ",
-				{ tag: "EM", text: item.query },
-				" ",
-				{ tag: "SPAN", text: item.transform }
-			] };
-		}
-	});
-	
-})( this.jQuery, this.app, this.i18n, this.Raphael );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.css
deleted file mode 100644
index 66e2110a7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.uiBrowser-filter {
-	float: left;
-}
-
-.uiBrowser-table {
-	margin-left: 365px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.js
deleted file mode 100644
index b288f976a..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/browser/browser.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ){
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-
-	ui.Browser = ui.Page.extend({
-		defaults: {
-			cluster: null  // (required) instanceof app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.query = new app.data.Query( { cluster: this.cluster } );
-			this._refreshButton = new ui.Button({
-				label: i18n.text("General.RefreshResults"),
-				onclick: function( btn ) {
-					this.query.query();
-				}.bind(this)
-			});
-			this.el = $(this._main_template());
-			new data.MetaDataFactory({
-				cluster: this.cluster,
-				onReady: function(metadata) {
-					this.metadata = metadata;
-					this.store = new data.QueryDataSourceInterface( { metadata: metadata, query: this.query } );
-					this.queryFilter = new ui.QueryFilter({ metadata: metadata, query: this.query });
-					this.queryFilter.attach(this.el.find("> .uiBrowser-filter") );
-					this.resultTable = new ui.ResultTable( {
-						onHeaderClick: this._changeSort_handler,
-						store: this.store
-					} );
-					this.resultTable.attach( this.el.find("> .uiBrowser-table") );
-					this.updateResults();
-				}.bind(this)
-			});
-		},
-		updateResults: function() {
-			this.query.query();
-		},
-		_changeSort_handler: function(table, wEv) {
-			this.query.setSort(wEv.column, wEv.dir === "desc");
-			this.query.setPage(1);
-			this.query.query();
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiBrowser", children: [
-				new ui.Toolbar({
-					label: i18n.text("Browser.Title"),
-					left: [ ],
-					right: [ this._refreshButton ]
-				}),
-				{ tag: "DIV", cls: "uiBrowser-filter" },
-				{ tag: "DIV", cls: "uiBrowser-table" }
-			] };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.css
deleted file mode 100644
index 17123dcd7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.css
+++ /dev/null
@@ -1,50 +0,0 @@
-.uiButton {
-	padding: 0;
-	border: 0;
-	margin: 3px;
-	width: auto;
-	overflow: visible;
-	cursor: pointer;
-	background: transparent;
-}
-
-.uiButton-content {
-	height: 20px;
-	border: 1px solid #668dc6;
-	border-radius: 2px;
-	background: #96c6eb;
-	background: -moz-linear-gradient(top, #96c6eb, #5296c7);
-	background: -webkit-linear-gradient(top, #96c6eb, #5296c7);
-	color: white;
-	font-weight: bold;
-}
-
-.moz .uiButton-content { margin: 0 -2px; }
-
-.uiButton-label {
-		padding: 2px 6px;
-		white-space: nowrap;
-}
-.uiButton:hover .uiButton-content {
-	background: #2777ba;
-	background: -moz-linear-gradient(top, #6aaadf, #2777ba);
-	background: -webkit-linear-gradient(top, #6aaadf, #2777ba);
-}
-.uiButton.active .uiButton-content,
-.uiButton:active .uiButton-content {
-	background: #2575b7;
-	background: -moz-linear-gradient(top, #2576b8, #2575b7);
-	background: -webkit-linear-gradient(top, #2576b8, #2575b7);
-}
-.uiButton.disabled .uiButton-content,
-.uiButton.disabled:active .uiButton-content {
-		border-color: #c6c6c6;
-		color: #999999;
-		background: #ddd;
-		background: -moz-linear-gradient(top, #ddd, #ddd);
-		background: -webkit-linear-gradient(top, #ddd, #ddd);
-}
-
-.uiButton.disabled {
-		cursor: default;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.js
deleted file mode 100644
index 5112cf4c9..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/button.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, joey, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Button = ui.AbstractWidget.extend({
-		defaults : {
-			label: "",                 // the label text
-			disabled: false,           // create a disabled button
-			autoDisable: false         // automatically disable the button when clicked
-		},
-
-		_baseCls: "uiButton",
-
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this.button_template())
-				.bind("click", this.click_handler);
-			this.config.disabled && this.disable();
-			this.attach( parent );
-		},
-
-		click_handler: function(jEv) {
-			if(! this.disabled) {
-				this.fire("click", jEv, this);
-				this.config.autoDisable && this.disable();
-			}
-		},
-
-		enable: function() {
-			this.el.removeClass("disabled");
-			this.disabled = false;
-			return this;
-		},
-
-		disable: function(disable) {
-			if(disable === false) {
-					return this.enable();
-			}
-			this.el.addClass("disabled");
-			this.disabled = true;
-			return this;
-		},
-
-		button_template: function() { return (
-			{ tag: 'BUTTON', type: 'button', id: this.id(), cls: this._baseCls, children: [
-				{ tag: 'DIV', cls: 'uiButton-content', children: [
-					{ tag: 'DIV', cls: 'uiButton-label', text: this.config.label }
-				] }
-			] }
-		); }
-	});
-
-})( this.jQuery, this.joey, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/buttonDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/buttonDemo.js
deleted file mode 100644
index d8d46bb78..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/button/buttonDemo.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-
-	window.builder = function() {
-		return new ui.Button({	label: "Default" });
-	}	;
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkField.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkField.js
deleted file mode 100644
index 813280398..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkField.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.CheckField = ui.AbstractField.extend({
-		_main_template: function() { return (
-			{ tag: "DIV", id: this.id(), cls: "uiCheckField", children: [
-				{ tag: "INPUT", type: "checkbox", name: this.config.name, checked: !!this.config.value }
-			] }
-		); },
-		validate: function() {
-			return this.val() || ( ! this.require );
-		},
-		val: function( val ) {
-			if( val === undefined ) {
-				return !!this.field.attr( "checked" );
-			} else {
-				this.field.attr( "checked", !!val );
-			}
-		}
-	});
-
-})( this.app );
-
-
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldDemo.js
deleted file mode 100644
index 1f8308343..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldDemo.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-	var ux = window.app.ns("ux");
-	var ut = window.app.ns("ut");
-
-	window.builder = function() {
-		var form = new ux.FieldCollection({
-			fields: [
-				new ui.CheckField({
-					label: "default",
-					name: "check_default"
-				}),
-				new ui.CheckField({
-					label: "checked",
-					name: "check_true",
-					value: true
-				}),
-				new ui.CheckField({
-					label: "unchecked",
-					name: "check_false",
-					value: false
-				}),
-				new ui.CheckField({
-					label: "required",
-					name: "check_required",
-					require: true
-				})
-			]
-		});
-
-		return (
-			{ tag: "DIV", children: form.fields.map( function( field ) {
-				return { tag: "LABEL", cls: "uiPanelForm-field", children: [
-					{ tag: "DIV", cls: "uiPanelForm-label", children: [ field.label, ut.require_template(field) ] },
-					field
-				]};
-			}).concat( new ui.Button({
-				label: "Evaluate Form",
-				onclick: function() { console.log( "valid=" + form.validate(), form.getData() ); }
-			})) }
-		);
-	};
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldSpec.js
deleted file mode 100644
index d9693ed11..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/checkField/checkFieldSpec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.ui.CheckField", function() {
-
-	var CheckField = window.app.ui.CheckField;
-
-	it("should have a label", function() {
-		expect( ( new CheckField({ label: "foo" }) ).label ).toBe( "foo" );
-	});
-
-	it("should have a name", function() {
-		expect( ( new CheckField({ name: "foo" }) ).name ).toBe( "foo" );
-	});
-
-	it("should have a val that is false when then field is not checked", function() {
-		expect( ( new CheckField({ name: "foo", value: false }) ).val() ).toBe( false );
-	});
-
-	it("should have a val that is true when the field is checked", function() {
-		expect( ( new CheckField({ name: "foo", value: true }) ).val() ).toBe( true );
-	});
-
-	it("should be valid if the field value is true", function() {
-		expect( ( new CheckField({ name: "foo", value: true }) ).validate() ).toBe( true );
-	});
-
-	it("should be valid if require is false", function() {
-		expect( ( new CheckField({ name: "foo", require: false, value: true }) ).validate() ).toBe( true );
-		expect( ( new CheckField({ name: "foo", require: false, value: false }) ).validate() ).toBe( true );
-	});
-
-	it("should be invalid if require is true and value is false", function() {
-		expect( ( new CheckField({ name: "foo", require: true, value: false }) ).validate() ).toBe( false );
-	});
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.css
deleted file mode 100644
index e5b8fb457..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.uiClusterConnect-uri {
-	width: 280px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.js
deleted file mode 100644
index d254bbd2f..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnect.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	ui.ClusterConnect = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.prefs = services.Preferences.instance();
-			this.cluster = this.config.cluster;
-			this.el = $.joey(this._main_template());
-			this.cluster.get( "", this._node_handler );
-		},
-		
-		_node_handler: function(data) {
-			if(data) {
-				this.prefs.set("app-base_uri", this.cluster.base_uri);
-			}
-		},
-		
-		_reconnect_handler: function() {
-			var base_uri = this.el.find(".uiClusterConnect-uri").val();
-			$("body").empty().append(new app.App("body", { id: "es", base_uri: base_uri }));
-		},
-		
-		_main_template: function() {
-			return { tag: "SPAN", cls: "uiClusterConnect", children: [
-				{ tag: "INPUT", type: "text", cls: "uiClusterConnect-uri", onkeyup: function( ev ) {
-					if(ev.which === 13) {
-						ev.preventDefault();
-						this._reconnect_handler();
-					}
-				}.bind(this), id: this.id("baseUri"), value: this.cluster.base_uri },
-				{ tag: "BUTTON", type: "button", text: i18n.text("Header.Connect"), onclick: this._reconnect_handler }
-			]};
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
-
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnectSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnectSpec.js
deleted file mode 100644
index af80c01a0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterConnect/clusterConnectSpec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("clusterConnect", function() {
-
-	var ClusterConnect = window.app.ui.ClusterConnect;
-
-	describe("when created", function() {
-
-		var prefs, success_callback, cluster, clusterConnect;
-
-		beforeEach( function() {
-			prefs = {
-				set: jasmine.createSpy("set")
-			};
-			spyOn( window.app.services.Preferences, "instance" ).and.callFake( function() {
-				return prefs;
-			});
-			cluster = {
-				get: jasmine.createSpy("get").and.callFake( function(uri, success) {
-					success_callback = success;
-				})
-			};
-			clusterConnect = new ClusterConnect({
-				base_uri: "http://localhost:9200",
-				cluster: cluster
-			});
-		});
-
-		it("should test the connection to the cluster", function() {
-			expect( cluster.get ).toHaveBeenCalled();
-		});
-
-		it("should store successful connection in preferences", function() {
-			success_callback("fakePayload");
-			expect( prefs.set ).toHaveBeenCalled();
-		});
-
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.css
deleted file mode 100644
index e69de29bb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.css
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.js
deleted file mode 100644
index 5896c53b1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/clusterOverview/clusterOverview.js
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var services = app.ns("services");
-
-	// ( master ) master = true, data = true 
-	// ( coordinator ) master = true, data = false
-	// ( worker ) master = false, data = true;
-	// ( client ) master = false, data = false;
-	// http enabled ?
-
-	function nodeSort_name(a, b) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		return a.cluster.name.toString().localeCompare( b.cluster.name.toString() );
-	}
-
-	function nodeSort_addr( a, b ) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		return a.cluster.transport_address.toString().localeCompare( b.cluster.transport_address.toString() );
-	}
-
-	function nodeSort_type( a, b ) {
-		if (!(a.cluster && b.cluster)) {
-			return 0;
-		}
-		if( a.master_node ) {
-			return -1;
-		} else if( b.master_node ) {
-			return 1;
-		} else if( a.data_node && !b.data_node ) {
-			return -1;
-		} else if( b.data_node && !a.data_node ) {
-			return 1;
-		} else {
-			return a.cluster.name.toString().localeCompare( b.cluster.name.toString() );
-		}
-	}
-
-	var NODE_SORT_TYPES = {
-		"Sort.ByName": nodeSort_name,
-		"Sort.ByAddress": nodeSort_addr,
-		"Sort.ByType": nodeSort_type
-	};
-
-	function nodeFilter_none( a ) {
-		return true;
-	}
-
-	function nodeFilter_clients( a ) {
-		return (a.master_node || a.data_node );
-	}
-
-
-	ui.ClusterOverview = ui.Page.extend({
-		defaults: {
-			cluster: null // (reqired) an instanceof app.services.Cluster
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this.prefs = services.Preferences.instance();
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", this.draw_handler );
-			this._refreshButton = new ui.RefreshButton({
-				onRefresh: this.refresh.bind(this),
-				onChange: function( btn ) {
-					if( btn.value === -1 ) {
-						this.draw_handler();
-					}
-				}.bind( this )
-			});
-			var nodeSortPref = this.prefs.get("clusterOverview-nodeSort") || Object.keys(NODE_SORT_TYPES)[0];
-			this._nodeSort = NODE_SORT_TYPES[ nodeSortPref ];
-			this._nodeSortMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.SortCluster" ),
-				menu: new ui.SelectMenuPanel({
-					value: nodeSortPref,
-					items: Object.keys( NODE_SORT_TYPES ).map( function( k ) {
-						return { text: i18n.text( k ), value: k };
-					}),
-					onSelect: function( panel, event ) {
-						this._nodeSort = NODE_SORT_TYPES[ event.value ];
-						this.prefs.set("clusterOverview-nodeSort", event.value );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._indicesSort = this.prefs.get( "clusterOverview-indicesSort") || "desc";
-			this._indicesSortMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.SortIndices" ),
-				menu: new ui.SelectMenuPanel({
-					value: this._indicesSort,
-					items: [
-						{ value: "desc", text: i18n.text( "SortIndices.Descending" ) },
-						{ value: "asc", text: i18n.text( "SortIndices.Ascending" ) } ],
-					onSelect: function( panel, event ) {
-						this._indicesSort = event.value;
-						this.prefs.set( "clusterOverview-indicesSort", this._indicesSort );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._aliasRenderer = this.prefs.get( "clusterOverview-aliasRender" ) || "full";
-			this._aliasMenu = new ui.MenuButton({
-				label: i18n.text( "Preference.ViewAliases" ),
-				menu: new ui.SelectMenuPanel({
-					value: this._aliasRenderer,
-					items: [
-						{ value: "full", text: i18n.text( "ViewAliases.Grouped" ) },
-						{ value: "list", text: i18n.text( "ViewAliases.List" ) },
-						{ value: "none", text: i18n.text( "ViewAliases.None" ) } ],
-					onSelect: function( panel, event ) {
-						this._aliasRenderer = event.value;
-						this.prefs.set( "clusterOverview-aliasRender", this._aliasRenderer );
-						this.draw_handler();
-					}.bind(this)
-				})
-			});
-			this._indexFilter = new ui.TextField({
-				value: this.prefs.get("clusterOverview-indexFilter"),
-				placeholder: i18n.text( "Overview.IndexFilter" ),
-				onchange: function( indexFilter ) {
-					this.prefs.set("clusterOverview-indexFilter", indexFilter.val() );
-					this.draw_handler();
-				}.bind(this)
-			});
-			this.el = $(this._main_template());
-			this.tablEl = this.el.find(".uiClusterOverview-table");
-			this.refresh();
-		},
-		remove: function() {
-			this._clusterState.removeObserver( "data", this.draw_handler );
-		},
-		refresh: function() {
-			this._refreshButton.disable();
-			this._clusterState.refresh();
-		},
-		draw_handler: function() {
-			var data = this._clusterState;
-			var indexFilter;
-			try {
-				var indexFilterRe = new RegExp( this._indexFilter.val() );
-				indexFilter = function(s) { return indexFilterRe.test(s); };
-			} catch(e) {
-				indexFilter = function() { return true; };
-			}
-			var clusterState = data.clusterState;
-			var status = data.status;
-			var nodeStats = data.nodeStats;
-			var clusterNodes = data.clusterNodes;
-			var nodes = [];
-			var indices = [];
-			var cluster = {};
-			var nodeIndices = {};
-			var indexIndices = {}, indexIndicesIndex = 0;
-			function newNode(n) {
-				return {
-					name: n,
-					routings: [],
-					master_node: clusterState.master_node === n
-				};
-			}
-			function newIndex(i) {
-				return {
-					name: i,
-					replicas: []
-				};
-			}
-			function getIndexForNode(n) {
-				return nodeIndices[n] = (n in nodeIndices) ? nodeIndices[n] : nodes.push(newNode(n)) - 1;
-			}
-			function getIndexForIndex(routings, i) {
-				var index = indexIndices[i] = (i in indexIndices) ?
-						(routings[indexIndices[i]] = routings[indexIndices[i]] || newIndex(i)) && indexIndices[i]
-						: ( ( routings[indexIndicesIndex] = newIndex(i) )  && indexIndicesIndex++ );
-				indices[index] = i;
-				return index;
-			}
-			$.each(clusterNodes.nodes, function(name, node) {
-				getIndexForNode(name);
-			});
-
-			var indexNames = [];
-			$.each(clusterState.routing_table.indices, function(name, index){
-				indexNames.push(name);
-			});
-			indexNames.sort();
-			if (this._indicesSort === "desc") indexNames.reverse();
-			indexNames.filter( indexFilter ).forEach(function(name) {
-				var indexObject = clusterState.routing_table.indices[name];
-				$.each(indexObject.shards, function(name, shard) {
-					shard.forEach(function(replica){
-						var node = replica.node;
-						if(node === null) { node = "Unassigned"; }
-						var index = replica.index;
-						var shard = replica.shard;
-						var routings = nodes[getIndexForNode(node)].routings;
-						var indexIndex = getIndexForIndex(routings, index);
-						var replicas = routings[indexIndex].replicas;
-						if(node === "Unassigned" || !indexObject.shards[shard]) {
-							replicas.push({ replica: replica });
-						} else {
-							replicas[shard] = {
-								replica: replica,
-								status: indexObject.shards[shard].filter(function(replica) {
-									return replica.node === node;
-								})[0]
-							};
-						}
-					});
-				});
-			});
-			indices = indices.map(function(index){
-				return {
-					name: index,
-					state: "open",
-					metadata: clusterState.metadata.indices[index],
-					status: status.indices[index]
-				};
-			}, this);
-			$.each(clusterState.metadata.indices, function(name, index) {
-				if(index.state === "close" && indexFilter( name )) {
-					indices.push({
-						name: name,
-						state: "close",
-						metadata: index,
-						status: null
-					});
-				}
-			});
-			nodes.forEach(function(node) {
-				node.stats = nodeStats.nodes[node.name];
-				var cluster = clusterNodes.nodes[node.name];
-				node.cluster = cluster || { name: "<unknown>" };
-				node.data_node = !( cluster && cluster.attributes && cluster.attributes.data === "false" );
-				for(var i = 0; i < indices.length; i++) {
-					node.routings[i] = node.routings[i] || { name: indices[i].name, replicas: [] };
-					node.routings[i].max_number_of_shards = indices[i].metadata.settings["index.number_of_shards"];
-					node.routings[i].open = indices[i].state === "open";
-				}
-			});
-			var aliasesIndex = {};
-			var aliases = [];
-			var indexClone = indices.map(function() { return false; });
-			$.each(clusterState.metadata.indices, function(name, index) {
-				index.aliases.forEach(function(alias) {
-					var aliasIndex = aliasesIndex[alias] = (alias in aliasesIndex) ? aliasesIndex[alias] : aliases.push( { name: alias, max: -1, min: 999, indices: [].concat(indexClone) }) - 1;
-					var indexIndex = indexIndices[name];
-					var aliasRow = aliases[aliasIndex];
-					aliasRow.min = Math.min(aliasRow.min, indexIndex);
-					aliasRow.max = Math.max(aliasRow.max, indexIndex);
-					aliasRow.indices[indexIndex] = indices[indexIndex];
-				});
-			});
-			cluster.aliases = aliases;
-			cluster.nodes = nodes
-				.filter( nodeFilter_none )
-				.sort( this._nodeSort );
-			indices.unshift({ name: null });
-			this._drawNodesView( cluster, indices );
-			this._refreshButton.enable();
-		},
-		_drawNodesView: function( cluster, indices ) {
-			this._nodesView && this._nodesView.remove();
-			this._nodesView = new ui.NodesView({
-				onRedraw: function() {
-					this.refresh();
-				}.bind(this),
-				interactive: ( this._refreshButton.value === -1 ),
-				aliasRenderer: this._aliasRenderer,
-				cluster: this.cluster,
-				data: {
-					cluster: cluster,
-					indices: indices
-				}
-			});
-			this._nodesView.attach( this.tablEl );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiClusterOverview", children: [
-				new ui.Toolbar({
-					label: i18n.text("Overview.PageTitle"),
-					left: [
-						this._nodeSortMenu,
-						this._indicesSortMenu,
-						this._aliasMenu,
-						this._indexFilter
-					],
-					right: [
-						this._refreshButton
-					]
-				}),
-				{ tag: "DIV", cls: "uiClusterOverview-table" }
-			] };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/csvTable/csvTable.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/csvTable/csvTable.js
deleted file mode 100644
index 5482b9629..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/csvTable/csvTable.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-( function( $, app, joey ) {
-
-	var ui = app.ns("ui");
-
-	var CELL_SEPARATOR = ",";
-	var CELL_QUOTE = '"';
-	var LINE_SEPARATOR = "\r\n";
-
-	ui.CSVTable = ui.AbstractWidget.extend({
-		defaults: {
-			results: null
-		},
-		_baseCls: "uiCSVTable",
-		init: function( parent ) {
-			this._super();
-			var results = this.config.results.hits.hits;
-			var columns = this._parseResults( results );
-			this._downloadButton = new ui.Button({
-				label: "Generate Download Link",
-				onclick: this._downloadLinkGenerator_handler
-			});
-			this._downloadLink = $.joey( { tag: "A", text: "download", });
-			this._downloadLink.hide();
-			this._csvText = this._csv_template( columns, results );
-			this.el = $.joey( this._main_template() );
-			this.attach( parent );
-		},
-		_downloadLinkGenerator_handler: function() {
-			var csvData = new Blob( [ this._csvText ], { type: 'text/csv' });
-			var csvURL = URL.createObjectURL( csvData );
-			this._downloadLink.attr( "href", csvURL );
-			this._downloadLink.show();
-		},
-		_parseResults: function( results ) {
-			var columnPaths = {};
-			(function parse( path, obj ) {
-				if( obj instanceof Array ) {
-					for( var i = 0; i < obj.length; i++ ) {
-						parse( path, obj[i] );
-					}
-				} else if( typeof obj === "object" ) {
-					for( var prop in obj ) {
-						parse( path + "." + prop, obj[ prop ] );
-					}
-				} else {
-					columnPaths[ path ] = true;
-				}
-			})( "root", results );
-			var columns = [];
-			for( var column in columnPaths ) {
-				columns.push( column.split(".").slice(1) );
-			}
-			return columns;
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: this._baseCls, id: this.id(), children: [
-				this._downloadButton,
-				this._downloadLink,
-				{ tag: "PRE", text: this._csvText }
-			] }
-		); },
-		_csv_template: function( columns, results ) {
-			return this._header_template( columns ) + LINE_SEPARATOR + this._results_template( columns, results );
-		},
-		_header_template: function( columns ) {
-			return columns.map( function( column ) {
-				return column.join(".");
-			}).join( CELL_SEPARATOR );
-		},
-		_results_template: function( columns, results ) {
-			return results.map( function( result ) {
-				return columns.map( function( column ) {
-					var l = 0,
-						ptr = result;
-					while( l !== column.length && ptr != null ) {
-						ptr = ptr[ column[ l++ ] ];
-					}
-					return ( ptr == null ) ? "" : ( CELL_QUOTE + ptr.toString().replace(/"/g, '""') + CELL_QUOTE );
-				}).join( CELL_SEPARATOR );
-			}).join( LINE_SEPARATOR );
-		}
-	});
-
-})( this.jQuery, this.app, this.joey );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dateHistogram/dateHistogram.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dateHistogram/dateHistogram.js
deleted file mode 100644
index 7fb42b364..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dateHistogram/dateHistogram.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app, i18n, raphael ) {
-
-	var ui = app.ns("ui");
-
-	ui.DateHistogram = ui.AbstractWidget.extend({
-		defaults: {
-			printEl: null, // (optional) if supplied, clicking on elements in the histogram changes the query
-			cluster: null, // (required)
-			query: null,   // (required) the current query
-			spec: null     // (required) // date field spec
-		},
-		init: function() {
-			this._super();
-			this.el = $(this._main_template());
-			this.query = this.config.query.clone();
-			// check if the index/types have changed and rebuild the histogram
-			this.config.query.on("results", function(query) {
-				if(this.queryChanged) {
-					this.buildHistogram(query);
-					this.queryChanged = false;
-				}
-			}.bind(this));
-			this.config.query.on("setIndex", function(query, params) {
-				this.query.setIndex(params.index, params.add);
-				this.queryChanged = true;
-			}.bind(this));
-			this.config.query.on("setType", function(query, params) {
-				this.query.setType(params.type, params.add);
-				this.queryChanged = true;
-			}.bind(this));
-			this.query.search.size = 0;
-			this.query.on("results", this._stat_handler);
-			this.query.on("results", this._aggs_handler);
-			this.buildHistogram();
-		},
-		buildHistogram: function(query) {
-			this.statAggs = this.query.addAggs({
-				stats: { field: this.config.spec.field_name }
-			});
-			this.query.query();
-			this.query.removeAggs(this.statAggs);
-		},
-		_stat_handler: function(query, results) {
-			if(! results.aggregations[this.statAggs]) { return; }
-			this.stats = results.aggregations[this.statAggs];
-			// here we are calculating the approximate range  that will give us less than 121 columns
-			var rangeNames = [ "year", "year", "month", "day", "hour", "minute" ];
-			var rangeFactors = [100000, 12, 30, 24, 60, 60000 ];
-			this.intervalRange = 1;
-			var range = this.stats.max - this.stats.min;
-			do {
-				this.intervalName = rangeNames.pop();
-				var factor = rangeFactors.pop();
-				this.intervalRange *= factor;
-				range = range / factor;
-			} while(range > 70);
-			this.dateAggs = this.query.addAggs({
-				date_histogram : {
-					field: this.config.spec.field_name,
-					interval: this.intervalName
-				}
-			});
-			this.query.query();
-			this.query.removeAggs(this.dateAggs);
-		},
-		_aggs_handler: function(query, results) {
-			if(! results.aggregations[this.dateAggs]) { return; }
-			var buckets = [], range = this.intervalRange;
-			var min = Math.floor(this.stats.min / range) * range;
-			var prec = [ "year", "month", "day", "hour", "minute", "second" ].indexOf(this.intervalName);
-			results.aggregations[this.dateAggs].buckets.forEach(function(entry) {
-				buckets[parseInt((entry.key - min) / range , 10)] = entry.doc_count;
-			}, this);
-			for(var i = 0; i < buckets.length; i++) {
-				buckets[i] = buckets[i] || 0;
-			}
-			this.el.removeClass("loading");
-			var el = this.el.empty();
-			var w = el.width(), h = el.height();
-			var r = raphael(el[0], w, h );
-			var printEl = this.config.printEl;
-			query = this.config.query;
-			r.g.barchart(0, 0, w, h, [buckets], { gutter: "0", vgutter: 0 }).hover(
-				function() {
-					this.flag = r.g.popup(this.bar.x, h - 5, this.value || "0").insertBefore(this);
-				}, function() {
-					this.flag.animate({opacity: 0}, 200, ">", function () {this.remove();});
-				}
-			).click(function() {
-				if(printEl) {
-					printEl.val(window.dateRangeParser.print(min + this.bar.index * range, prec));
-					printEl.trigger("keyup");
-					query.query();
-				}
-			});
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: "uiDateHistogram loading", css: { height: "50px" }, children: [
-				i18n.text("General.LoadingAggs")
-			] }
-		); }
-	});
-
-})( this.app, this.i18n, this.Raphael );
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dialogPanel/dialogPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dialogPanel/dialogPanel.js
deleted file mode 100644
index e76701fac..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/dialogPanel/dialogPanel.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.DialogPanel = ui.DraggablePanel.extend({
-		_commit_handler: function(jEv) {
-			this.fire("commit", this, { jEv: jEv });
-		},
-		_main_template: function() {
-			var t = this._super();
-			t.children.push(this._actionsBar_template());
-			return t;
-		},
-		_actionsBar_template: function() {
-			return { tag: "DIV", cls: "pull-right", children: [
-				new app.ui.Button({ label: "Cancel", onclick: this._close_handler }),
-				new app.ui.Button({ label: "OK", onclick: this._commit_handler })
-			]};
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/draggablePanel/draggablePanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/draggablePanel/draggablePanel.js
deleted file mode 100644
index 38cc0d6f8..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/draggablePanel/draggablePanel.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.DraggablePanel = ui.AbstractPanel.extend({
-		defaults: {
-	//		title: ""   // (required) text for the panel title
-		},
-
-		_baseCls: "uiPanel",
-
-		init: function() {
-			this._super();
-			this.body = $(this._body_template());
-			this.title = $(this._title_template());
-			this.el = $.joey( this._main_template() );
-			this.el.css( { width: this.config.width } );
-			this.dd = new app.ux.DragDrop({
-				pickupSelector: this.el.find(".uiPanel-titleBar"),
-				dragObj: this.el
-			});
-			// open the panel if set in configuration
-			this.config.open && this.open();
-		},
-
-		setBody: function(body) {
-				this.body.empty().append(body);
-		},
-		_body_template: function() { return { tag: "DIV", cls: "uiPanel-body", css: { height: this.config.height + (this.config.height === 'auto' ? "" : "px" ) }, children: [ this.config.body ] }; },
-		_title_template: function() { return { tag: "SPAN", cls: "uiPanel-title", text: this.config.title }; },
-		_main_template: function() { return (
-			{ tag: "DIV", id: this.id(), cls: this._baseCls, children: [
-				{ tag: "DIV", cls: "uiPanel-titleBar", children: [
-					{ tag: "DIV", cls: "uiPanel-close", onclick: this._close_handler, text: "x" },
-					this.title
-				]},
-				this.body
-			] }
-		); }
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.css
deleted file mode 100644
index d9acccf3b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.uiFilterBrowser-row * {
-	margin-right: 0.4em;
-}
-
-.uiFilterBrowser-row BUTTON {
-	height: 22px;
-	position: relative;
-	top: 1px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.js
deleted file mode 100644
index a5f7cb33b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/filterBrowser/filterBrowser.js
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-	var ut = app.ns("ut");
-
-	ui.FilterBrowser = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null,  // (required) instanceof app.services.Cluster
-			index: "" // (required) name of the index to query
-		},
-
-		init: function(parent) {
-			this._super();
-			this._cluster = this.config.cluster;
-			this.el = $(this._main_template());
-			this.filtersEl = this.el.find(".uiFilterBrowser-filters");
-			this.attach( parent );
-			new data.MetaDataFactory({ cluster: this._cluster, onReady: function(metadata, eventData) {
-				this.metadata = metadata;
-				this._createFilters_handler(eventData.originalData.metadata.indices);
-			}.bind(this) });
-		},
-
-		_createFilters_handler: function(data) {
-			var filters = [];
-			function scan_properties(path, obj) {
-				if (obj.properties) {
-					for (var prop in obj.properties) {
-						scan_properties(path.concat(prop), obj.properties[prop]);
-					}
-				} else {
-					// handle multi_field 
-					if (obj.fields) {
-						for (var subField in obj.fields) {
-							filters.push({ path: (path[path.length - 1] !== subField) ? path.concat(subField) : path, type: obj.fields[subField].type, meta: obj.fields[subField] });
-						}
-					} else {
-						filters.push({ path: path, type: obj.type, meta: obj });
-					}
-				}
-			}
-			for(var type in data[this.config.index].mappings) {
-				scan_properties([type], data[this.config.index].mappings[type]);
-			}
-
-			filters.sort( function(a, b) {
-				var x = a.path.join(".");
-				var y = b.path.join(".");
-				return (x < y) ? -1 : (x > y) ? 1 : 0;
-			});
-
-			this.filters = [
-				{ path: ["match_all"], type: "match_all", meta: {} },
-				{ path: ["_all"], type: "_all", meta: {}}
-			].concat(filters);
-
-			this._addFilterRow_handler();
-		},
-		
-		_addFilterRow_handler: function() {
-			this.filtersEl.append(this._filter_template());
-		},
-		
-		_removeFilterRow_handler: function(jEv) {
-			$(jEv.target).closest("DIV.uiFilterBrowser-row").remove();
-			if(this.filtersEl.children().length === 0) {
-				this._addFilterRow_handler();
-			}
-		},
-		
-		_search_handler: function() {
-			var search = new data.BoolQuery();
-			search.setSize( this.el.find(".uiFilterBrowser-outputSize").val() )
-			this.fire("startingSearch");
-			this.filtersEl.find(".uiFilterBrowser-row").each(function(i, row) {
-				row = $(row);
-				var bool = row.find(".bool").val();
-				var field = row.find(".field").val();
-				var op = row.find(".op").val();
-				var value = {};
-				if(field === "match_all") {
-					op = "match_all";
-				} else if(op === "range") {
-					var lowqual = row.find(".lowqual").val(),
-						highqual = row.find(".highqual").val();
-					if(lowqual.length) {
-						value[row.find(".lowop").val()] = lowqual;
-					}
-					if(highqual.length) {
-						value[row.find(".highop").val()] = highqual;
-					}
-				} else if(op === "fuzzy") {
-					var qual = row.find(".qual").val(),
-						fuzzyqual = row.find(".fuzzyqual").val();
-					if(qual.length) {
-						value["value"] = qual;
-					}
-					if(fuzzyqual.length) {
-						value[row.find(".fuzzyop").val()] = fuzzyqual;
-					}
-				} else {
-					value = row.find(".qual").val();
-				}
-				search.addClause(value, field, op, bool);
-			});
-			if(this.el.find(".uiFilterBrowser-showSrc").attr("checked")) {
-				this.fire("searchSource", search.search);
-			}
-			this._cluster.post( this.config.index + "/_search", search.getData(), this._results_handler );
-		},
-		
-		_results_handler: function( data ) {
-			var type = this.el.find(".uiFilterBrowser-outputFormat").val();
-			this.fire("results", this, { type: type, data: data, metadata: this.metadata });
-		},
-		
-		_changeQueryField_handler: function(jEv) {
-			var select = $(jEv.target);
-			var spec = select.children(":selected").data("spec");
-			select.siblings().remove(".op,.qual,.range,.fuzzy");
-			var ops = [];
-			if(spec.type === 'match_all') {
-			} else if(spec.type === '_all') {
-				ops = ["query_string"];
-			} else if(spec.type === 'string' || spec.type === 'text' || spec.type === 'keyword') {
-				ops = ["term", "wildcard", "prefix", "fuzzy", "range", "query_string", "text", "missing"];
-			} else if(spec.type === 'long' || spec.type === 'integer' || spec.type === 'float' ||
-					spec.type === 'byte' || spec.type === 'short' || spec.type === 'double') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'date') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'geo_point') {
-				ops = ["missing"];
-			} else if(spec.type === 'ip') {
-				ops = ["term", "range", "fuzzy", "query_string", "missing"];
-			} else if(spec.type === 'boolean') {
-				ops = ["term"]
-			}
-			select.after({ tag: "SELECT", cls: "op", onchange: this._changeQueryOp_handler, children: ops.map(ut.option_template) });
-			select.next().change();
-		},
-		
-		_changeQueryOp_handler: function(jEv) {
-			var op = $(jEv.target), opv = op.val();
-			op.siblings().remove(".qual,.range,.fuzzy");
-			if(opv === 'term' || opv === 'wildcard' || opv === 'prefix' || opv === "query_string" || opv === 'text') {
-				op.after({ tag: "INPUT", cls: "qual", type: "text" });
-			} else if(opv === 'range') {
-				op.after(this._range_template());
-			} else if(opv === 'fuzzy') {
-				op.after(this._fuzzy_template());
-			}
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", children: [
-				{ tag: "DIV", cls: "uiFilterBrowser-filters" },
-				{ tag: "BUTTON", type: "button", text: i18n.text("General.Search"), onclick: this._search_handler },
-				{ tag: "LABEL", children:
-					i18n.complex("FilterBrowser.OutputType", { tag: "SELECT", cls: "uiFilterBrowser-outputFormat", children: [
-						{ text: i18n.text("Output.Table"), value: "table" },
-						{ text: i18n.text("Output.JSON"), value: "json" },
-						{ text: i18n.text("Output.CSV"), value: "csv" }
-					].map(function( o ) { return $.extend({ tag: "OPTION" }, o ); } ) } )
-				},
-				{ tag: "LABEL", children:
-					i18n.complex("FilterBrowser.OutputSize", { tag: "SELECT", cls: "uiFilterBrowser-outputSize",
-						children: [ "10", "50", "250", "1000", "5000", "25000" ].map( ut.option_template )
-					} )
-				},
-				{ tag: "LABEL", children: [ { tag: "INPUT", type: "checkbox", cls: "uiFilterBrowser-showSrc" }, i18n.text("Output.ShowSource") ] }
-			]};
-		},
-		
-		_filter_template: function() {
-			return { tag: "DIV", cls: "uiFilterBrowser-row", children: [
-				{ tag: "SELECT", cls: "bool", children: ["must", "must_not", "should"].map(ut.option_template) },
-				{ tag: "SELECT", cls: "field", onchange: this._changeQueryField_handler, children: this.filters.map(function(f) {
-					return { tag: "OPTION", data: { spec: f }, value: f.path.join("."), text: f.path.join(".") };
-				})},
-				{ tag: "BUTTON", type: "button", text: "+", onclick: this._addFilterRow_handler },
-				{ tag: "BUTTON", type: "button", text: "-", onclick: this._removeFilterRow_handler }
-			]};
-		},
-		
-		_range_template: function() {
-			return { tag: "SPAN", cls: "range", children: [
-				{ tag: "SELECT", cls: "lowop", children: ["gt", "gte"].map(ut.option_template) },
-				{ tag: "INPUT", type: "text", cls: "lowqual" },
-				{ tag: "SELECT", cls: "highop", children: ["lt", "lte"].map(ut.option_template) },
-				{ tag: "INPUT", type: "text", cls: "highqual" }
-			]};
-		},
-
-		_fuzzy_template: function() {
-			return { tag: "SPAN", cls: "fuzzy", children: [
-				{ tag: "INPUT", cls: "qual", type: "text" },
-				{ tag: "SELECT", cls: "fuzzyop", children: ["max_expansions", "min_similarity"].map(ut.option_template) },
-				{ tag: "INPUT", cls: "fuzzyqual", type: "text" }
-			]};
-		}
-	});
-	
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.css
deleted file mode 100644
index b61badf12..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.uiHeader {
-	padding: 3px 10px;
-}
-
-.uiHeader-name, .uiHeader-status {
-	font-size: 1.2em;
-	font-weight: bold;
-	padding: 0 10px;
-}
-
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.js
deleted file mode 100644
index 591903bab..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/header/header.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.Header = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null,
-			clusterState: null
-		},
-		_baseCls: "uiHeader",
-		init: function() {
-			this._clusterConnect = new ui.ClusterConnect({
-				cluster: this.config.cluster
-			});
-			var quicks = [
-				{ text: i18n.text("Nav.Info"), path: "" },
-				{ text: i18n.text("Nav.Status"), path: "_stats" },
-				{ text: i18n.text("Nav.NodeStats"), path: "_nodes/stats" },
-				{ text: i18n.text("Nav.ClusterNodes"), path: "_nodes" },
-				{ text: i18n.text("Nav.Plugins"), path: "_nodes/plugins" },
-				{ text: i18n.text("Nav.ClusterState"), path: "_cluster/state" },
-				{ text: i18n.text("Nav.ClusterHealth"), path: "_cluster/health" },
-				{ text: i18n.text("Nav.Templates"), path: "_template" }
-			];
-			var cluster = this.config.cluster;
-			var quickPanels = {};
-			var menuItems = quicks.map( function( item ) {
-				return { text: item.text, onclick: function() {
-					cluster.get( item.path, function( data ) {
-						quickPanels[ item.path ] && quickPanels[ item.path ].el && quickPanels[ item.path ].remove();
-						quickPanels[ item.path ] = new ui.JsonPanel({
-							title: item.text,
-							json: data
-						});
-					} );
-				} };
-			}, this );
-			this._quickMenu = new ui.MenuButton({
-				label: i18n.text("NodeInfoMenu.Title"),
-				menu: new ui.MenuPanel({
-					items: menuItems
-				})
-			});
-			this.el = $.joey( this._main_template() );
-			this.nameEl = this.el.find(".uiHeader-name");
-			this.statEl = this.el.find(".uiHeader-status");
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", function( state ) {
-				var shards = state.status._shards;
-				var colour = state.clusterHealth.status;
-				var name = state.clusterState.cluster_name;
-				this.nameEl.text( name );
-				this.statEl
-					.text( i18n.text("Header.ClusterHealth", colour, shards.successful, shards.total ) )
-					.css( "background", colour );
-			}.bind(this));
-			this.statEl.text( i18n.text("Header.ClusterNotConnected") ).css("background", "grey");
-			this._clusterState.refresh();
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: this._baseCls, children: [
-				this._clusterConnect,
-				{ tag: "SPAN", cls: "uiHeader-name" },
-				{ tag: "SPAN", cls: "uiHeader-status" },
-				{ tag: "H1", text: i18n.text("General.Elasticsearch") },
-				{ tag: "SPAN", cls: "pull-right", children: [
-					this._quickMenu
-				] }
-			] }
-		); }
-	} );
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/helpPanel/helpPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/helpPanel/helpPanel.js
deleted file mode 100644
index 91f5c116d..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/helpPanel/helpPanel.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ){
-
-	var ui = app.ns("ui");
-
-	ui.HelpPanel = ui.InfoPanel.extend({
-		defaults: {
-			ref: "",
-			open: true,
-			autoRemove: true,
-			modal: false,
-			width: 500,
-			height: 450,
-			title: i18n.text("General.Help")
-		},
-		init: function() {
-			this._super();
-			this.body.append(i18n.text(this.config.ref));
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexOverview/indexOverview.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexOverview/indexOverview.js
deleted file mode 100644
index bfccdf97c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexOverview/indexOverview.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-	
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.IndexOverview = ui.Page.extend({
-		defaults: {
-			cluster: null
-		},
-		init: function() {
-			this._super();
-			this.cluster = this.config.cluster;
-			this._clusterState = this.config.clusterState;
-			this._clusterState.on("data", this._refresh_handler );
-			this.el = $(this._main_template());
-			this._refresh_handler();
-		},
-		remove: function() {
-			this._clusterState.removeObserver( "data", this._refresh_handler );
-		},
-		_refresh_handler: function() {
-			var state = this._clusterState;
-			var view = {
-				indices: acx.eachMap( state.status.indices, function( name, index ) {
-					return {
-						name: name,
-						state: index
-					};
-				}).sort( function( a, b ) {
-					return a.name < b.name ? -1 : 1;
-				})
-			};
-			this._indexViewEl && this._indexViewEl.remove();
-			this._indexViewEl = $( this._indexTable_template( view ) );
-			this.el.find(".uiIndexOverview-table").append( this._indexViewEl );
-		},
-		_newIndex_handler: function() {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("ClusterOverView.IndexName"), name: "_name", require: true }),
-					new ui.TextField({
-						label: i18n.text("ClusterOverview.NumShards"),
-						name: "number_of_shards",
-						value: "5",
-						require: function( val ) { return parseInt( val, 10 ) >= 1; }
-					}),
-					new ui.TextField({
-						label: i18n.text("ClusterOverview.NumReplicas"),
-						name: "number_of_replicas",
-						value: "1",
-						require: function( val ) { return parseInt( val, 10 ) >= 0; }
-					})
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("ClusterOverview.NewIndex"),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function(panel, args) {
-					if(fields.validate()) {
-						var data = fields.getData();
-						var name = data["_name"];
-						delete data["_name"];
-						this.config.cluster.put( encodeURIComponent( name ), JSON.stringify({ settings: { index: data } }), function(d) {
-							dialog.close();
-							alert(JSON.stringify(d));
-							this._clusterState.refresh();
-						}.bind(this) );
-					}
-				}.bind(this)
-			}).open();
-		},
-		_indexTable_template: function( view ) { return (
-			{ tag: "TABLE", cls: "table", children: [
-				{ tag: "THEAD", children: [
-					{ tag: "TR", children: [
-						{ tag: "TH" },
-						{ tag: "TH", children: [
-							{ tag: "H3", text: "Size" }
-						] },
-						{ tag: "TH", children: [
-							{ tag: "H3", text: "Docs" }
-						] }
-					] }
-				] },
-				{ tag: "TBODY", cls: "striped", children: view.indices.map( this._index_template, this ) }
-			] }
-		); },
-
-		_index_template: function( index ) { return (
-			{ tag: "TR", children: [
-				{ tag: "TD", children: [
-					{ tag: "H3", text: index.name }
-				] },
-				{ tag: "TD", text: ut.byteSize_template( index.state.primaries.store.size_in_bytes ) + "/" + ut.byteSize_template( index.state.total.store.size_in_bytes ) },
-				{ tag: "TD", text: ut.count_template( index.state.primaries.docs.count ) }
-			] }
-		); },
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiIndexOverview", children: [
-				new ui.Toolbar({
-					label: i18n.text("IndexOverview.PageTitle"),
-					left: [
-						new ui.Button({
-							label: i18n.text("ClusterOverview.NewIndex"),
-							onclick: this._newIndex_handler
-						}),
-					]
-				}),
-				{ tag: "DIV", cls: "uiIndexOverview-table", children: this._indexViewEl }
-			] };
-		}
-
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexSelector/indexSelector.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexSelector/indexSelector.js
deleted file mode 100644
index 85743ec74..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/indexSelector/indexSelector.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.IndexSelector = ui.AbstractWidget.extend({
-		init: function(parent) {
-			this._super();
-			this.el = $(this._main_template());
-			this.attach( parent );
-			this.cluster = this.config.cluster;
-			this.update();
-		},
-		update: function() {
-			this.cluster.get( "_stats", this._update_handler );
-		},
-		
-		_update_handler: function(data) {
-			var options = [];
-			var index_names = Object.keys(data.indices).sort();
-			for(var i=0; i < index_names.length; i++) { 
-				name = index_names[i];
-				options.push(this._option_template(name, data.indices[name])); 
-			}
-			this.el.find(".uiIndexSelector-select").empty().append(this._select_template(options));
-			this._indexChanged_handler();
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiIndexSelector", children: i18n.complex( "IndexSelector.SearchIndexForDocs", { tag: "SPAN", cls: "uiIndexSelector-select" } ) };
-		},
-
-		_indexChanged_handler: function() {
-			this.fire("indexChanged", this.el.find("SELECT").val());
-		},
-
-		_select_template: function(options) {
-			return { tag: "SELECT", children: options, onChange: this._indexChanged_handler };
-		},
-		
-		_option_template: function(name, index) {
-			return  { tag: "OPTION", value: name, text: i18n.text("IndexSelector.NameWithDocs", name, index.primaries.docs.count ) };
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.css
deleted file mode 100644
index 7d4a86c79..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.css
+++ /dev/null
@@ -1,38 +0,0 @@
-
-.uiInfoPanel {
-	background: rgba(0, 0, 0, 0.75);
-	color: white;
-	border-radius: 8px;
-	padding: 1px;
-}
-.uiInfoPanel .uiPanel-titleBar {
-	background: rgba(74, 74, 74, 0.75);
-	background: -moz-linear-gradient(top, rgba(84, 84, 84, 0.75), rgba(54, 54, 54, 0.75), rgba(64, 64, 64, 0.75));
-	background: -webkit-linear-gradient(top, rgba(84, 84, 84, 0.75), rgba(54, 54, 54, 0.75), rgba(64, 64, 64, 0.75));
-	border-radius: 8px 8px 0 0;
-	padding: 1px 0 2px 0;
-	border-bottom: 0;
-}
-.uiInfoPanel .uiPanel-close {
-	border-radius: 6px;
-	height: 13px;
-	width: 13px;
-	background: #ccc;
-	left: 3px;
-	top: 1px;
-	color: #333;
-	text-shadow: #222 0 0 1px;
-	line-height: 11px;
-	border: 0;
-	padding: 0;
-}
-.uiInfoPanel .uiPanel-close:hover {
-	background: #eee;
-}
-
-.uiInfoPanel .uiPanel-body {
-	background: transparent;
-	padding: 20px;
-	border-radius: 0 0 8px 8px;
-	border: 1px solid #222;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.js
deleted file mode 100644
index 9228fca1d..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/infoPanel/infoPanel.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.InfoPanel = ui.DraggablePanel.extend({
-		_baseCls: "uiPanel uiInfoPanel"
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.css
deleted file mode 100644
index 20aff8817..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.uiJsonPanel SPAN.uiJsonPretty-string { color: #6F6; }
-.uiJsonPanel SPAN.uiJsonPretty-number { color: #66F; }
-.uiJsonPanel SPAN.uiJsonPretty-null { color: #F66; }
-.uiJsonPanel SPAN.uiJsonPretty-boolean { color: #F6F; }
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.js
deleted file mode 100644
index 040685997..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPanel/jsonPanel.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.JsonPanel = ui.InfoPanel.extend({
-		defaults: {
-			json: null, // (required)
-			modal: false,
-			open: true,
-			autoRemove: true,
-			height: 500,
-			width: 600
-		},
-
-		_baseCls: "uiPanel uiInfoPanel uiJsonPanel",
-
-		_body_template: function() {
-			var body = this._super();
-			body.children = [ new ui.JsonPretty({ obj: this.config.json }) ];
-			return body;
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.css
deleted file mode 100644
index 7a1a0ba62..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.css
+++ /dev/null
@@ -1,22 +0,0 @@
-DIV.uiJsonPretty-object { font-size: 1.26em; font-family: monospace; }
-UL.uiJsonPretty-object,
-UL.uiJsonPretty-array { margin: 0; padding: 0 0 0 2em; list-style: none; }
-UL.uiJsonPretty-object LI,
-UL.uiJsonPretty-array LI { padding: 0; margin: 0; }
-.expando > SPAN.uiJsonPretty-name:before { content: "\25bc\a0"; color: #555; position: relative; top: 2px; }
-.expando.uiJsonPretty-minimised > SPAN.uiJsonPretty-name:before { content: "\25ba\a0"; top: 0; }
-.uiJsonPretty-minimised > UL SPAN.uiJsonPretty-name:before,
-.expando .uiJsonPretty-minimised > UL SPAN.uiJsonPretty-name:before { content: ""; }
-SPAN.uiJsonPretty-string,
-SPAN.uiJsonPretty-string A { color: green; }
-SPAN.uiJsonPretty-string A { text-decoration: underline;}
-SPAN.uiJsonPretty-number { color: blue; }
-SPAN.uiJsonPretty-null { color: red; }
-SPAN.uiJsonPretty-boolean { color: purple; }
-.expando > .uiJsonPretty-name { cursor: pointer; }
-.expando > .uiJsonPretty-name:hover { text-decoration: underline; }
-.uiJsonPretty-minimised { white-space: nowrap; overflow: hidden; }
-.uiJsonPretty-minimised > UL { opacity: 0.6; }
-.uiJsonPretty-minimised .uiJsonPretty-minimised > UL { opacity: 1; }
-.uiJsonPretty-minimised UL, .uiJsonPretty-minimised LI { display: inline; padding: 0; }
-
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.js
deleted file mode 100644
index f48247938..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/jsonPretty/jsonPretty.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.JsonPretty = ui.AbstractWidget.extend({
-		defaults: {
-			obj: null
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $(this._main_template());
-			this.attach(parent);
-			this.el.click(this._click_handler);
-		},
-		
-		_click_handler: function(jEv) {
-			var t = $(jEv.target).closest(".uiJsonPretty-name").closest("LI");
-			if(t.length === 0 || t.parents(".uiJsonPretty-minimised").length > 0) { return; }
-			t.toggleClass("uiJsonPretty-minimised");
-			jEv.stopPropagation();
-		},
-		
-		_main_template: function() {
-			try {
-					return { tag: "DIV", cls: "uiJsonPretty", children: this.pretty.parse(this.config.obj) };
-			}	catch (error) {
-					throw "JsonPretty error: " + error.message;
-			}
-		},
-		
-		pretty: { // from https://github.com/RyanAmos/Pretty-JSON/blob/master/pretty_json.js
-			"expando" : function(value) {
-				return (value && (/array|object/i).test(value.constructor.name)) ? "expando" : "";
-			},
-			"parse": function (member) {
-				return this[(member == null) ? 'null' : member.constructor.name.toLowerCase()](member);
-			},
-			"null": function (value) {
-				return this['value']('null', 'null');
-			},
-			"array": function (value) {
-				var results = [];
-				var lastItem = value.length - 1;
-				value.forEach(function( v, i ) {
-					results.push({ tag: "LI", cls: this.expando(v), children: [ this['parse'](v) ] });
-					if( i !== lastItem ) {
-						results.push(",");
-					}
-				}, this);
-				return [ "[ ", ((results.length > 0) ? { tag: "UL", cls: "uiJsonPretty-array", children: results } : null), "]" ];
-			},
-			"object": function (value) {
-				var results = [];
-				var keys = Object.keys( value );
-				var lastItem = keys.length - 1;
-				keys.forEach( function( key, i ) {
-					var children = [ this['value']( 'name', '"' + key + '"' ), ": ", this['parse']( value[ key ]) ];
-					if( i !== lastItem ) {
-						children.push(",");
-					}
-					results.push( { tag: "LI", cls: this.expando( value[ key ] ), children: children } );
-				}, this);
-				return [ "{ ", ((results.length > 0) ? { tag: "UL", cls: "uiJsonPretty-object", children: results } : null ),  "}" ];
-			},
-			"number": function (value) {
-				return this['value']('number', value.toString());
-			},
-			"string": function (value) {
-				if (/^(http|https|file):\/\/[^\s]+$/.test(value)) {
-					return this['link']( value );
-				} else {
-					return this['value']('string', '"' + value.toString() + '"');
-				}
-			},
-			"boolean": function (value) {
-				return this['value']('boolean', value.toString());
-			},
-			"link": function( value ) {
-					return this['value']("string", { tag: "A", href: value, target: "_blank", text: '"' + value + '"' } );
-			},
-			"value": function (type, value) {
-				if (/^(http|https|file):\/\/[^\s]+$/.test(value)) {
-				}
-				return { tag: "SPAN", cls: "uiJsonPretty-" + type, text: value };
-			}
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.css
deleted file mode 100644
index 21c36bc59..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.uiMenuButton {
-	display: inline-block;
-}
-
-.uiMenuButton .uiButton-label {
-	background-image: url('data:image/gif;base64,R0lGODlhDwAPAIABAP///////yH5BAEAAAEALAAAAAAPAA8AAAITjI+py+0P4wG0gmavq1HLD4ZiAQA7');
-	background-position: right 50%;
-	background-repeat: no-repeat;
-	padding-right: 17px;
-	text-align: left;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.js
deleted file mode 100644
index a5c18ff23..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuButton/menuButton.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.MenuButton = app.ui.Button.extend({
-		defaults: {
-			menu: null
-		},
-		_baseCls: "uiButton uiMenuButton",
-		init: function(parent) {
-			this._super(parent);
-			this.menu = this.config.menu;
-			this.on("click", this.openMenu_handler);
-			this.menu.on("open", function() { this.el.addClass("active"); }.bind(this));
-			this.menu.on("close", function() { this.el.removeClass("active"); }.bind(this));
-		},
-		openMenu_handler: function(jEv) {
-			this.menu && this.menu.open(jEv);
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.css
deleted file mode 100644
index 8236a856f..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.uiMenuPanel {
-	border: 1px solid #668dc6;
-	position: absolute;
-	background: #96c6eb;
-	color: white;
-}
-
-.uiMenuPanel LI {
-	list-style: none;
-	border-bottom: 1px solid #668dc6;
-}
-
-.uiMenuPanel LI:hover {
-	background: #2575b7;
-}
-
-.uiMenuPanel LI:last-child {
-	border-bottom: 0;
-} 
-
-.uiMenuPanel-label {
-	white-space: nowrap;
-	padding: 2px 10px 2px 10px;
-	cursor: pointer;
-}
-
-.disabled .uiMenuPanel-label {
-	cursor: auto;
-	color: #888;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.js
deleted file mode 100644
index 6fc13e8d2..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/menuPanel/menuPanel.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.MenuPanel = ui.AbstractPanel.extend({
-		defaults: {
-			items: [],		// (required) an array of menu items
-			modal: false
-		},
-		_baseCls: "uiMenuPanel",
-		init: function() {
-			this._super();
-			this.el = $(this._main_template());
-		},
-		open: function(jEv) {
-			this._super(jEv);
-			var cx = this; setTimeout(function() { $(document).bind("click", cx._close_handler); }, 50);
-		},
-		_getItems: function() {
-			return this.config.items;
-		},
-		_close_handler: function(jEv) {
-			this._super(jEv);
-			$(document).unbind("click", this._close_handler);
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: this._getItems().map(this._menuItem_template, this) };
-		},
-		_menuItem_template: function(item) {
-			var dx = item.disabled ? { onclick: function() {} } : {};
-			return { tag: "LI", cls: "uiMenuPanel-item" + (item.disabled ? " disabled" : "") + (item.selected ? " selected" : ""), children: [ $.extend({ tag: "DIV", cls: "uiMenuPanel-label" }, item, dx ) ] };
-		},
-		_getPosition: function(jEv) {
-			var right = !! $(jEv.target).parents(".pull-right").length;
-			var parent = $(jEv.target).closest("BUTTON");
-			return parent.vOffset()
-				.addY(parent.vSize().y)
-				.addX( right ? parent.vSize().x - this.el.vOuterSize().x : 0 )
-				.asOffset();
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.css
deleted file mode 100644
index e7a7778f3..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.uiNodesView TH,
-.uiNodesView TD {
-	vertical-align: top;
-	padding: 2px 20px;
-}
-
-.uiNodesView TH.close,
-.uiNodesView TD.close {
-	color: #888;
-	background: #f2f2f2;
-}
-
-.uiNodesView .uiMenuButton .uiButton-content {
-	padding-right: 3px;
-	border-radius: 8px;
-	height: 14px;
-}
-
-.uiNodesView .uiMenuButton.active .uiButton-content,
-.uiNodesView .uiMenuButton:active .uiButton-content {
-	border-bottom-right-radius: 0px;
-	border-bottom-left-radius: 0px;
-}
-
-.uiNodesView .uiMenuButton .uiButton-label {
-	padding: 0px 17px 0px 7px;
-}
-
-.uiNodesView-hasAlias {
-	text-align: center;
-}
-.uiNodesView-hasAlias.max {
-	border-top-right-radius: 8px;
-	border-bottom-right-radius: 8px;
-}
-.uiNodesView-hasAlias.min {
-	border-top-left-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-.uiNodesView-hasAlias-remove {
-	float: right;
-	font-weight: bold;
-	cursor: pointer;
-}
-
-.uiNodesView TD.uiNodesView-icon {
-	padding: 20px 0px 15px 20px;
-}
-
-.uiNodesView-node:nth-child(odd) {
-	background: #eee;
-}
-
-.uiNodesView-routing {
-	position: relative;
-	min-width: 90px;
-}
-
-.uiNodesView-nullReplica,
-.uiNodesView-replica {
-	box-sizing: border-box;
-	cursor: pointer;
-	float: left;
-	height: 40px;
-	width: 35px;
-	margin: 4px;
-	border: 2px solid #444;
-	padding: 2px;
-	font-size: 32px;
-	line-height: 32px;
-	text-align: center;
-	letter-spacing: -5px;
-	text-indent: -7px;
-}
-
-.uiNodesView-replica.primary {
-	border-width: 4px;
-	line-height: 29px;
-}
-
-.uiNodesView-nullReplica {
-	border-color: transparent;
-}
-
-.uiNodesView-replica.state-UNASSIGNED { background: #eeeeee; color: #999; border-color: #666; float: none; display: inline-block; }
-.uiNodesView-replica.state-INITIALIZING { background: #dddc88; }
-.uiNodesView-replica.state-STARTED { background: #99dd88; }
-.uiNodesView-replica.state-RELOCATING { background: #dc88dd; }
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.js
deleted file mode 100644
index 17877adba..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesView.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app, i18n, joey ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.NodesView = ui.AbstractWidget.extend({
-		defaults: {
-			interactive: true,
-			aliasRenderer: "list",
-			scaleReplicas: 1,
-			cluster: null,
-			data: null
-		},
-		init: function() {
-			this._super();
-			this.interactive = this.config.interactive;
-			this.cluster = this.config.cluster;
-			this._aliasRenderFunction = {
-				"none": this._aliasRender_template_none,
-				"list": this._aliasRender_template_list,
-				"full": this._aliasRender_template_full
-			}[ this.config.aliasRenderer ];
-			this._styleSheetEl = joey({ tag: "STYLE", text: ".uiNodesView-nullReplica, .uiNodesView-replica { zoom: " + this.config.scaleReplicas + " }" });
-			this.el = $( this._main_template( this.config.data.cluster, this.config.data.indices ) );
-		},
-
-		_newAliasAction_handler: function( index ) {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("AliasForm.AliasName"), name: "alias", require: true })
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("AliasForm.NewAliasForIndexName", index.name),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function(panel, args) {
-					if(fields.validate()) {
-						var data = fields.getData();
-						var command = {
-							"actions" : [
-								{ "add" : { "index" : index.name, "alias" : data["alias"] } }
-							]
-						};
-						this.config.cluster.post('_aliases', JSON.stringify(command), function(d) {
-							dialog.close();
-							alert(JSON.stringify(d));
-							this.fire("redraw");
-						}.bind(this) );
-					}
-				}.bind(this)
-			}).open();
-		},
-		_postIndexAction_handler: function(action, index, redraw) {
-			this.cluster.post(encodeURIComponent( index.name ) + "/" + encodeURIComponent( action ), null, function(r) {
-				alert(JSON.stringify(r));
-				redraw && this.fire("redraw");
-			}.bind(this));
-		},
-		_optimizeIndex_handler: function(index) {
-			var fields = new app.ux.FieldCollection({
-				fields: [
-					new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }),
-					new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false })
-				]
-			});
-			var dialog = new ui.DialogPanel({
-				title: i18n.text("OptimizeForm.OptimizeIndex", index.name),
-				body: new ui.PanelForm({ fields: fields }),
-				onCommit: function( panel, args ) {
-					if(fields.validate()) {
-						this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) {
-							alert(JSON.stringify(r));
-						});
-						dialog.close();
-					}
-				}.bind(this)
-			}).open();
-		},
-		_testAnalyser_handler: function(index) {
-			this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) {
-				alert(JSON.stringify(r, true, "  "));
-			});
-		},
-		_deleteIndexAction_handler: function(index) {
-			if( prompt( i18n.text("AliasForm.DeleteAliasMessage", i18n.text("Command.DELETE"), index.name ) ) === i18n.text("Command.DELETE") ) {
-				this.cluster["delete"](encodeURIComponent( index.name ), null, function(r) {
-					alert(JSON.stringify(r));
-					this.fire("redraw");
-				}.bind(this) );
-			}
-		},
-		_shutdownNode_handler: function(node) {
-			if(prompt( i18n.text("IndexCommand.ShutdownMessage", i18n.text("Command.SHUTDOWN"), node.cluster.name ) ) === i18n.text("Command.SHUTDOWN") ) {
-				this.cluster.post( "_cluster/nodes/" + encodeURIComponent( node.name ) + "/_shutdown", null, function(r) {
-					alert(JSON.stringify(r));
-					this.fire("redraw");
-				}.bind(this));
-			}
-		},
-		_deleteAliasAction_handler: function( index, alias ) {
-			if( confirm( i18n.text("Command.DeleteAliasMessage" ) ) ) {
-				var command = {
-					"actions" : [
-						{ "remove" : { "index" : index.name, "alias" : alias.name } }
-					]
-				};
-				this.config.cluster.post('_aliases', JSON.stringify(command), function(d) {
-					alert(JSON.stringify(d));
-					this.fire("redraw");
-				}.bind(this) );
-			}
-		},
-
-		_replica_template: function(replica) {
-			var r = replica.replica;
-			return { tag: "DIV",
-				cls: "uiNodesView-replica" + (r.primary ? " primary" : "") + ( " state-" + r.state ),
-				text: r.shard.toString(),
-				onclick: function() { new ui.JsonPanel({
-					json: replica.status || r,
-					title: r.index + "/" + r.node + " [" + r.shard + "]" });
-				}
-			};
-		},
-		_routing_template: function(routing) {
-			var cell = { tag: "TD", cls: "uiNodesView-routing" + (routing.open ? "" : " close"), children: [] };
-			for(var i = 0; i < routing.replicas.length; i++) {
-				if(i % routing.max_number_of_shards === 0 && i > 0) {
-					cell.children.push({ tag: "BR" });
-				}
-				if( routing.replicas[i] ) {
-					cell.children.push(this._replica_template(routing.replicas[i]));
-				} else {
-					cell.children.push( { tag: "DIV", cls: "uiNodesView-nullReplica" } );
-				}
-			}
-			return cell;
-		},
-		_nodeControls_template: function( node ) { return (
-			{ tag: "DIV", cls: "uiNodesView-controls", children: [
-				new ui.MenuButton({
-					label: i18n.text("NodeInfoMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("NodeInfoMenu.ClusterNodeInfo"), onclick: function() { new ui.JsonPanel({ json: node.cluster, title: node.name });} },
-							{ text: i18n.text("NodeInfoMenu.NodeStats"), onclick: function() { new ui.JsonPanel({ json: node.stats, title: node.name });} }
-						]
-					})
-				}),
-				new ui.MenuButton({
-					label: i18n.text("NodeActionsMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("NodeActionsMenu.Shutdown"), onclick: function() { this._shutdownNode_handler(node); }.bind(this) }
-						]
-					})
-				})
-			] }
-		); },
-		_nodeIcon_template: function( node ) {
-			var icon, alt;
-			if( node.name === "Unassigned" ) {
-				icon = "fa-exclamation-triangle";
-				alt = i18n.text( "NodeType.Unassigned" );
-			} else if( node.cluster.settings && "tribe" in node.cluster.settings) {
-				icon = "fa-sitemap";
-				alt = i18n.text("NodeType.Tribe" );
-			} else {
-				icon = "fa-" + (node.master_node ? "star" : "circle") + (node.data_node ? "" : "-o" );
-				alt = i18n.text( node.master_node ? ( node.data_node ? "NodeType.Master" : "NodeType.Coord" ) : ( node.data_node ? "NodeType.Worker" : "NodeType.Client" ) );
-			}
-			return { tag: "TD", title: alt, cls: "uiNodesView-icon", children: [
-				{ tag: "SPAN", cls: "fa fa-2x " + icon }
-			] };
-		},
-		_node_template: function(node) {
-			return { tag: "TR", cls: "uiNodesView-node" + (node.master_node ? " master": ""), children: [
-				this._nodeIcon_template( node ),
-				{ tag: "TH", children: node.name === "Unassigned" ? [
-					{ tag: "H3", text: node.name }
-				] : [
-					{ tag: "H3", text: node.cluster.name },
-					{ tag: "DIV", text: node.cluster.hostname },
-					this.interactive ? this._nodeControls_template( node ) : null
-				] }
-			].concat(node.routings.map(this._routing_template, this))};
-		},
-		_indexHeaderControls_template: function( index ) { return (
-			{ tag: "DIV", cls: "uiNodesView-controls", children: [
-				new ui.MenuButton({
-					label: i18n.text("IndexInfoMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("IndexInfoMenu.Status"), onclick: function() { new ui.JsonPanel({ json: index.status, title: index.name }); } },
-							{ text: i18n.text("IndexInfoMenu.Metadata"), onclick: function() { new ui.JsonPanel({ json: index.metadata, title: index.name }); } }
-						]
-					})
-				}),
-				new ui.MenuButton({
-					label: i18n.text("IndexActionsMenu.Title"),
-					menu: new ui.MenuPanel({
-						items: [
-							{ text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Optimize"), onclick: function () { this._optimizeIndex_handler(index); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) },
-							{ text: (index.state === "close") ? i18n.text("IndexActionsMenu.Open") : i18n.text("IndexActionsMenu.Close"), onclick: function() { this._postIndexAction_handler((index.state === "close") ? "_open" : "_close", index, true); }.bind(this) },
-							{ text: i18n.text("IndexActionsMenu.Delete"), onclick: function() { this._deleteIndexAction_handler(index); }.bind(this) }
-						]
-					})
-				})
-			] }
-		); },
-		_indexHeader_template: function( index ) {
-			var closed = index.state === "close";
-			var line1 = closed ? "index: close" : ( "size: " + (index.status && index.status.primaries && index.status.total ? ut.byteSize_template( index.status.primaries.store.size_in_bytes ) + " (" + ut.byteSize_template( index.status.total.store.size_in_bytes ) + ")" : "unknown" ) );
-			var line2 = closed ? "\u00A0" : ( "docs: " + (index.status && index.status.primaries && index.status.primaries.docs && index.status.total && index.status.total.docs ? index.status.primaries.docs.count.toLocaleString() + " (" + (index.status.total.docs.count + index.status.total.docs.deleted).toLocaleString() + ")" : "unknown" ) );
-			return index.name ? { tag: "TH", cls: (closed ? "close" : ""), children: [
-				{ tag: "H3", text: index.name },
-				{ tag: "DIV", text: line1 },
-				{ tag: "DIV", text: line2 },
-				this.interactive ? this._indexHeaderControls_template( index ) : null
-			] } : [ { tag: "TD" }, { tag: "TH" } ];
-		},
-		_aliasRender_template_none: function( cluster, indices ) {
-			return null;
-		},
-		_aliasRender_template_list: function( cluster, indices ) {
-			return cluster.aliases.length && { tag: "TBODY", children: [
-				{ tag: "TR", children: [
-					{ tag: "TD" }
-				].concat( indices.map( function( index ) {
-					return { tag: "TD", children: index.metadata && index.metadata.aliases.map( function( alias ) {
-						return { tag: "LI", text: alias };
-					} ) };
-				})) }
-			] };
-		},
-		_aliasRender_template_full: function( cluster, indices ) {
-			return cluster.aliases.length && { tag: "TBODY", children: cluster.aliases.map( function(alias, row) {
-				return { tag: "TR", children: [ { tag: "TD" },{ tag: "TD" } ].concat(alias.indices.map(function(index, i) {
-					if (index) {
-						return {
-							tag: "TD",
-							css: { background: "#" + "9ce9c7fc9".substr((row+6)%7,3) },
-							cls: "uiNodesView-hasAlias" + ( alias.min === i ? " min" : "" ) + ( alias.max === i ? " max" : "" ),
-							text: alias.name,
-							children: this.interactive ? [
-								{	tag: 'SPAN',
-									text: i18n.text("General.CloseGlyph"),
-									cls: 'uiNodesView-hasAlias-remove',
-									onclick: this._deleteAliasAction_handler.bind( this, index, alias )
-								}
-							]: null
-						};
-					}	else {
-						return { tag: "TD" };
-					}
-				}, this ) ) };
-			}, this )	};
-		},
-		_main_template: function(cluster, indices) {
-			return { tag: "TABLE", cls: "table uiNodesView", children: [
-				this._styleSheetEl,
-				{ tag: "THEAD", children: [ { tag: "TR", children: indices.map(this._indexHeader_template, this) } ] },
-				this._aliasRenderFunction( cluster, indices ),
-				{ tag: "TBODY", children: cluster.nodes.map(this._node_template, this) }
-			] };
-		}
-
-	});
-
-})( this.app, this.i18n, this.joey );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesViewDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesViewDemo.js
deleted file mode 100644
index c52e4da80..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/nodesView/nodesViewDemo.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-
-	var data = {
-		"cluster":{"nodes":[{"name":"cqTmT9GLSlSWx-B7pvM--w","routings":[{"name":"_river","replicas":[],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[null,{"replica":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_01"},"status":{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":10328420,"max_doc":10329720,"deleted_docs":4},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"643ms","total_time_in_millis":643}}}],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[null,{"replica":{"state":"STARTED","primary":false,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":false,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"75ms","total_time_in_millis":75}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[null,{"replica":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_03"},"status":{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"86ms","total_time_in_millis":86}}}],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":false,"stats":{"timestamp":1381790346979,"name":"Elathan","transport_address":"inet[/127.0.0.1:9301]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"277b","size_in_bytes":277,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":0,"index_time":"0s","index_time_in_millis":0,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":6,"query_time":"19ms","query_time_in_millis":19,"query_current":0,"fetch_total":0,"fetch_time":"0s","fetch_time_in_millis":0,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":10,"total_time":"0s","total_time_in_millis":0},"flush":{"total":186,"total_time":"9.1s","total_time_in_millis":9191},"warmer":{"current":0,"total":3,"total_time":"6ms","total_time_in_millis":6},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346979,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4065169408,"used":"4.2gb","used_in_bytes":4524765184,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4426321920,"actual_used":"3.8gb","actual_used_in_bytes":4163612672},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346979,"open_file_descriptors":266,"cpu":{"percent":0,"sys":"2.8m","sys_in_millis":172614,"user":"2.3m","user_in_millis":142295,"total":"5.2m","total_in_millis":314909},"mem":{"resident":"21.6mb","resident_in_bytes":22728704,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3900530688}},"jvm":{"timestamp":1381790346980,"uptime":"4d","uptime_in_millis":349028405,"mem":{"heap_used":"31.3mb","heap_used_in_bytes":32851896,"heap_committed":"265.5mb","heap_committed_in_bytes":278462464,"non_heap_used":"39.3mb","non_heap_used_in_bytes":41210896,"non_heap_committed":"63.7mb","non_heap_committed_in_bytes":66809856,"pools":{"Code Cache":{"used":"2mb","used_in_bytes":2120704,"max":"48mb","max_in_bytes":50331648,"peak_used":"2mb","peak_used_in_bytes":2131520,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"24mb","used_in_bytes":25224136,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"27mb","peak_used_in_bytes":28311552,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"816.5kb","used_in_bytes":836128,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2mb","peak_used_in_bytes":2162688,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"6.4mb","used_in_bytes":6791632,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"8.2mb","peak_used_in_bytes":8653824,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"37.2mb","used_in_bytes":39090192,"max":"82mb","max_in_bytes":85983232,"peak_used":"37.2mb","peak_used_in_bytes":39090192,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":51,"peak_count":56},"gc":{"collection_count":43,"collection_time":"374ms","collection_time_in_millis":374,"collectors":{"ParNew":{"collection_count":41,"collection_time":"374ms","collection_time_in_millis":374},"ConcurrentMarkSweep":{"collection_count":2,"collection_time":"0s","collection_time_in_millis":0}}}},"thread_pool":{"generic":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":3,"completed":7505},"index":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"merge":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":16},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":188},"search":{"threads":6,"queue":0,"active":0,"rejected":0,"largest":6,"completed":6},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":5,"queue":0,"active":1,"rejected":0,"largest":5,"completed":8593},"refresh":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438878,"out_segs":7330495,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790347004,"data":[{"path":"/var/elasticsearch/es2/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231241613312,"available":"215.1gb","available_in_bytes":230979469312,"disk_reads":2641856,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593427456,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":155197,"rx_size":"6.9mb","rx_size_in_bytes":7339947,"tx_count":155195,"tx_size":"11.6mb","tx_size_in_bytes":12251491},"http":{"current_open":0,"total_opened":0}},"cluster":{"name":"Elathan","transport_address":"inet[/127.0.0.1:9301]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9203]"}},{"name":"jw4owU-ZQgOYdM7ElauDTg","routings":[{"name":"_river","replicas":[],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[null,{"replica":{"state":"STARTED","primary":false,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":1,"index":"ag_01"},"status":{"routing":{"state":"STARTED","primary":false,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"194ms","total_time_in_millis":194}}}],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[{"replica":{"state":"STARTED","primary":true,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":0,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":true,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"107ms","total_time_in_millis":107}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":false,"stats":{"timestamp":1381790346963,"name":"Numinus","transport_address":"inet[/127.0.0.1:9303]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"178b","size_in_bytes":178,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":2,"index_time":"50ms","index_time_in_millis":50,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":12,"query_time":"32ms","query_time_in_millis":32,"query_current":0,"fetch_total":0,"fetch_time":"0s","fetch_time_in_millis":0,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":9,"total_time":"66ms","total_time_in_millis":66},"flush":{"total":218,"total_time":"5.6s","total_time_in_millis":5697},"warmer":{"current":0,"total":2,"total_time":"4ms","total_time_in_millis":4},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346963,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4058091520,"used":"4.2gb","used_in_bytes":4531843072,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4419244032,"actual_used":"3.8gb","actual_used_in_bytes":4170690560},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346963,"open_file_descriptors":264,"cpu":{"percent":0,"sys":"2.9m","sys_in_millis":174208,"user":"2.3m","user_in_millis":139440,"total":"5.2m","total_in_millis":313648},"mem":{"resident":"27.2mb","resident_in_bytes":28606464,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3903823872}},"jvm":{"timestamp":1381790346978,"uptime":"4d","uptime_in_millis":349026382,"mem":{"heap_used":"12.8mb","heap_used_in_bytes":13428352,"heap_committed":"265.5mb","heap_committed_in_bytes":278462464,"non_heap_used":"39.8mb","non_heap_used_in_bytes":41791784,"non_heap_committed":"55.2mb","non_heap_committed_in_bytes":57950208,"pools":{"Code Cache":{"used":"1.9mb","used_in_bytes":2065280,"max":"48mb","max_in_bytes":50331648,"peak_used":"1.9mb","peak_used_in_bytes":2074880,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"2.4mb","used_in_bytes":2564176,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"27mb","peak_used_in_bytes":28311552,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"646.5kb","used_in_bytes":662048,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2.8mb","peak_used_in_bytes":3029584,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"9.7mb","used_in_bytes":10202128,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"9.7mb","peak_used_in_bytes":10202128,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"37.8mb","used_in_bytes":39726504,"max":"82mb","max_in_bytes":85983232,"peak_used":"37.8mb","peak_used_in_bytes":39726504,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":60,"peak_count":66},"gc":{"collection_count":42,"collection_time":"512ms","collection_time_in_millis":512,"collectors":{"ParNew":{"collection_count":40,"collection_time":"512ms","collection_time_in_millis":512},"ConcurrentMarkSweep":{"collection_count":2,"collection_time":"0s","collection_time_in_millis":0}}}},"thread_pool":{"generic":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":3,"completed":7490},"index":{"threads":2,"queue":0,"active":0,"rejected":0,"largest":2,"completed":2},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"merge":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":18},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":221},"search":{"threads":12,"queue":0,"active":0,"rejected":0,"largest":12,"completed":12},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":3,"queue":0,"active":1,"rejected":0,"largest":5,"completed":8597},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438878,"out_segs":7330495,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790346992,"data":[{"path":"/var/elasticsearch/es4/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231241613312,"available":"215.1gb","available_in_bytes":230979469312,"disk_reads":2641856,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593427456,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":155179,"rx_size":"7mb","rx_size_in_bytes":7341687,"tx_count":155177,"tx_size":"11.6mb","tx_size_in_bytes":12249878},"http":{"current_open":0,"total_opened":0}},"cluster":{"name":"Numinus","transport_address":"inet[/127.0.0.1:9303]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9202]"}},{"name":"SwCmq0QKQuShZcJAbuW8OQ","routings":[{"name":"_river","replicas":[{"replica":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"_river"},"status":{"routing":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"_river"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1380240228838,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":62,"total_time":"1.6s","total_time_in_millis":1632}}}],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[{"replica":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"ag_01"},"status":{"routing":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"216ms","total_time_in_millis":216}}}],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[null,null,{"replica":{"state":"STARTED","primary":true,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":2,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":true,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"17ms","total_time_in_millis":17}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":false,"stats":{"timestamp":1381790346944,"name":"Ameridroid","transport_address":"inet[/127.0.0.1:9305]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"257b","size_in_bytes":257,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":6,"index_time":"64ms","index_time_in_millis":64,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":12,"query_time":"27ms","query_time_in_millis":27,"query_current":0,"fetch_total":0,"fetch_time":"0s","fetch_time_in_millis":0,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":10,"total_time":"113ms","total_time_in_millis":113},"flush":{"total":241,"total_time":"5.5s","total_time_in_millis":5553},"warmer":{"current":0,"total":3,"total_time":"4ms","total_time_in_millis":4},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346944,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4059074560,"used":"4.2gb","used_in_bytes":4530860032,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4419702784,"actual_used":"3.8gb","actual_used_in_bytes":4170231808},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346944,"open_file_descriptors":266,"cpu":{"percent":0,"sys":"2.8m","sys_in_millis":171912,"user":"2.3m","user_in_millis":143905,"total":"5.2m","total_in_millis":315817},"mem":{"resident":"30.4mb","resident_in_bytes":31936512,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3905077248}},"jvm":{"timestamp":1381790346944,"uptime":"4d","uptime_in_millis":349024271,"mem":{"heap_used":"16.6mb","heap_used_in_bytes":17485968,"heap_committed":"253.9mb","heap_committed_in_bytes":266272768,"non_heap_used":"39.7mb","non_heap_used_in_bytes":41733256,"non_heap_committed":"40.4mb","non_heap_committed_in_bytes":42405888,"pools":{"Code Cache":{"used":"1.9mb","used_in_bytes":2018624,"max":"48mb","max_in_bytes":50331648,"peak_used":"1.9mb","peak_used_in_bytes":2029504,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"5.9mb","used_in_bytes":6242912,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"16.6mb","peak_used_in_bytes":17432576,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"489.7kb","used_in_bytes":501496,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2mb","peak_used_in_bytes":2162688,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"10.2mb","used_in_bytes":10741560,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"10.2mb","peak_used_in_bytes":10741560,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"37.8mb","used_in_bytes":39714632,"max":"82mb","max_in_bytes":85983232,"peak_used":"37.8mb","peak_used_in_bytes":39714632,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":63,"peak_count":70},"gc":{"collection_count":61,"collection_time":"533ms","collection_time_in_millis":533,"collectors":{"ParNew":{"collection_count":61,"collection_time":"533ms","collection_time_in_millis":533},"ConcurrentMarkSweep":{"collection_count":0,"collection_time":"0s","collection_time_in_millis":0}}}},"thread_pool":{"generic":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":4,"completed":7504},"index":{"threads":4,"queue":0,"active":0,"rejected":0,"largest":4,"completed":6},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":4},"merge":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":4},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":23},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":241},"search":{"threads":12,"queue":0,"active":0,"rejected":0,"largest":12,"completed":12},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":4,"queue":0,"active":1,"rejected":0,"largest":5,"completed":10284},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":4}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438844,"out_segs":7330461,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790346959,"data":[{"path":"/var/elasticsearch/es6/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231240040448,"available":"215.1gb","available_in_bytes":230977896448,"disk_reads":2641849,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593058816,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":156880,"rx_size":"7mb","rx_size_in_bytes":7431874,"tx_count":156877,"tx_size":"11.9mb","tx_size_in_bytes":12480678},"http":{"current_open":0,"total_opened":0}},"cluster":{"name":"Ameridroid","transport_address":"inet[/127.0.0.1:9305]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9205]"}},{"name":"aBuoaKR5QVCfUZHgrJEfVg","routings":[{"name":"_river","replicas":[],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[{"replica":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_01"},"status":{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"382ms","total_time_in_millis":382}}}],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[null,null,{"replica":{"state":"STARTED","primary":false,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":2,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":false,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"15ms","total_time_in_millis":15}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[{"replica":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_03"},"status":{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"101ms","total_time_in_millis":101}}}],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":false,"stats":{"timestamp":1381790346945,"name":"Immortus","transport_address":"inet[/127.0.0.1:9302]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"277b","size_in_bytes":277,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":2,"index_time":"59ms","index_time_in_millis":59,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":12,"query_time":"27ms","query_time_in_millis":27,"query_current":0,"fetch_total":1,"fetch_time":"9ms","fetch_time_in_millis":9,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":9,"total_time":"72ms","total_time_in_millis":72},"flush":{"total":239,"total_time":"6.3s","total_time_in_millis":6363},"warmer":{"current":0,"total":3,"total_time":"8ms","total_time_in_millis":8},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346963,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4058099712,"used":"4.2gb","used_in_bytes":4531834880,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4419252224,"actual_used":"3.8gb","actual_used_in_bytes":4170682368},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346963,"open_file_descriptors":266,"cpu":{"percent":0,"sys":"2.9m","sys_in_millis":174105,"user":"2.4m","user_in_millis":145373,"total":"5.3m","total_in_millis":319478},"mem":{"resident":"29mb","resident_in_bytes":30453760,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3912540160}},"jvm":{"timestamp":1381790346963,"uptime":"4d","uptime_in_millis":349027381,"mem":{"heap_used":"28.5mb","heap_used_in_bytes":29980664,"heap_committed":"265.5mb","heap_committed_in_bytes":278462464,"non_heap_used":"40mb","non_heap_used_in_bytes":42021480,"non_heap_committed":"65.6mb","non_heap_committed_in_bytes":68853760,"pools":{"Code Cache":{"used":"2mb","used_in_bytes":2183808,"max":"48mb","max_in_bytes":50331648,"peak_used":"2mb","peak_used_in_bytes":2193408,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"23.8mb","used_in_bytes":25026800,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"27mb","peak_used_in_bytes":28311552,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"464.1kb","used_in_bytes":475296,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2mb","peak_used_in_bytes":2162688,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"4.2mb","used_in_bytes":4478568,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"12.4mb","peak_used_in_bytes":13054208,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"37.9mb","used_in_bytes":39837672,"max":"82mb","max_in_bytes":85983232,"peak_used":"38.2mb","peak_used_in_bytes":40134632,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":62,"peak_count":67},"gc":{"collection_count":80,"collection_time":"561ms","collection_time_in_millis":561,"collectors":{"ParNew":{"collection_count":78,"collection_time":"557ms","collection_time_in_millis":557},"ConcurrentMarkSweep":{"collection_count":2,"collection_time":"4ms","collection_time_in_millis":4}}}},"thread_pool":{"generic":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":4,"completed":7528},"index":{"threads":2,"queue":0,"active":0,"rejected":0,"largest":2,"completed":2},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"merge":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":26},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":242},"search":{"threads":12,"queue":0,"active":0,"rejected":0,"largest":12,"completed":13},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":5,"queue":0,"active":2,"rejected":0,"largest":5,"completed":10288},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438862,"out_segs":7330479,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790346977,"data":[{"path":"/var/elasticsearch/es3/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231241089024,"available":"215.1gb","available_in_bytes":230978945024,"disk_reads":2641854,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593402880,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":156920,"rx_size":"7.1mb","rx_size_in_bytes":7451979,"tx_count":156915,"tx_size":"11.9mb","tx_size_in_bytes":12499329},"http":{"current_open":0,"total_opened":0}},"cluster":{"name":"Immortus","transport_address":"inet[/127.0.0.1:9302]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9201]"}},{"name":"3Rbfod0sS9eZ6VrOkY0JKw","routings":[{"name":"_river","replicas":[{"replica":{"state":"STARTED","primary":true,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"_river"},"status":{"routing":{"state":"STARTED","primary":true,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"_river"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1380240228838,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":62,"total_time":"833ms","total_time_in_millis":833}}}],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[{"replica":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"4ms","total_time_in_millis":4}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[{"replica":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_03"},"status":{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"274ms","total_time_in_millis":274}}}],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":true,"stats":{"timestamp":1381790346938,"name":"Steel Serpent","transport_address":"inet[server/127.0.0.1:9300]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"237b","size_in_bytes":237,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":2,"index_time":"59ms","index_time_in_millis":59,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":12,"query_time":"32ms","query_time_in_millis":32,"query_current":0,"fetch_total":3,"fetch_time":"5ms","fetch_time_in_millis":5,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":6,"total_time":"58ms","total_time_in_millis":58},"flush":{"total":240,"total_time":"4.3s","total_time_in_millis":4339},"warmer":{"current":0,"total":3,"total_time":"8ms","total_time_in_millis":8},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346938,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4062093312,"used":"4.2gb","used_in_bytes":4527841280,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4422721536,"actual_used":"3.8gb","actual_used_in_bytes":4167213056},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346938,"open_file_descriptors":272,"cpu":{"percent":0,"sys":"3.3m","sys_in_millis":200578,"user":"3.2m","user_in_millis":192613,"total":"6.5m","total_in_millis":393191},"mem":{"resident":"43.8mb","resident_in_bytes":46018560,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3910467584}},"jvm":{"timestamp":1381790346938,"uptime":"4d","uptime_in_millis":349029191,"mem":{"heap_used":"28.9mb","heap_used_in_bytes":30381984,"heap_committed":"253.9mb","heap_committed_in_bytes":266272768,"non_heap_used":"42.9mb","non_heap_used_in_bytes":45068896,"non_heap_committed":"43.3mb","non_heap_committed_in_bytes":45420544,"pools":{"Code Cache":{"used":"3.3mb","used_in_bytes":3534656,"max":"48mb","max_in_bytes":50331648,"peak_used":"3.3mb","peak_used_in_bytes":3545408,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"15.6mb","used_in_bytes":16402808,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"16.6mb","peak_used_in_bytes":17432576,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"44.9kb","used_in_bytes":46016,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2mb","peak_used_in_bytes":2162688,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"13.2mb","used_in_bytes":13933160,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"13.2mb","peak_used_in_bytes":13933160,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"39.6mb","used_in_bytes":41534240,"max":"82mb","max_in_bytes":85983232,"peak_used":"39.6mb","peak_used_in_bytes":41534240,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":64,"peak_count":68},"gc":{"collection_count":272,"collection_time":"967ms","collection_time_in_millis":967,"collectors":{"ParNew":{"collection_count":272,"collection_time":"967ms","collection_time_in_millis":967},"ConcurrentMarkSweep":{"collection_count":0,"collection_time":"0s","collection_time_in_millis":0}}}},"thread_pool":{"generic":{"threads":2,"queue":0,"active":0,"rejected":0,"largest":4,"completed":9499},"index":{"threads":2,"queue":0,"active":0,"rejected":0,"largest":2,"completed":2},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"merge":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":21},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":241},"search":{"threads":12,"queue":0,"active":0,"rejected":0,"largest":12,"completed":15},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":5,"queue":0,"active":1,"rejected":0,"largest":5,"completed":15207},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438818,"out_segs":7330435,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790346956,"data":[{"path":"/var/elasticsearch/es1/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231240040448,"available":"215.1gb","available_in_bytes":230977896448,"disk_reads":2641849,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593058816,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":780551,"rx_size":"59mb","rx_size_in_bytes":61929023,"tx_count":780563,"tx_size":"35.2mb","tx_size_in_bytes":36961925},"http":{"current_open":6,"total_opened":201}},"cluster":{"name":"Steel Serpent","transport_address":"inet[server/127.0.0.1:9300]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9200]"}},{"name":"PO1wHIidQo-w7sGHaYHvjg","routings":[{"name":"_river","replicas":[],"max_number_of_shards":"1","open":true},{"name":"ag_01","replicas":[],"max_number_of_shards":"2","open":true},{"name":"ag_02","replicas":[null,{"replica":{"state":"STARTED","primary":true,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_02"},"status":{"routing":{"state":"STARTED","primary":true,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"122ms","total_time_in_millis":122}}}],"max_number_of_shards":"3","open":true},{"name":"ag_03","replicas":[null,{"replica":{"state":"STARTED","primary":false,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_03"},"status":{"routing":{"state":"STARTED","primary":false,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"137ms","total_time_in_millis":137}}}],"max_number_of_shards":"2","open":true},{"name":"twitter_river","replicas":[],"max_number_of_shards":"5","open":false}],"master_node":false,"stats":{"timestamp":1381790346964,"name":"Thumbelina","transport_address":"inet[/127.0.0.1:9304]","hostname":"server","indices":{"docs":{"count":0,"deleted":0},"store":{"size":"178b","size_in_bytes":178,"throttle_time":"0s","throttle_time_in_millis":0},"indexing":{"index_total":4,"index_time":"55ms","index_time_in_millis":55,"index_current":0,"delete_total":0,"delete_time":"0s","delete_time_in_millis":0,"delete_current":0},"get":{"total":0,"get_time":"0s","time_in_millis":0,"exists_total":0,"exists_time":"0s","exists_time_in_millis":0,"missing_total":0,"missing_time":"0s","missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":6,"query_time":"21ms","query_time_in_millis":21,"query_current":0,"fetch_total":2,"fetch_time":"10ms","fetch_time_in_millis":10,"fetch_current":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":9,"total_time":"81ms","total_time_in_millis":81},"flush":{"total":198,"total_time":"3.6s","total_time_in_millis":3662},"warmer":{"current":0,"total":2,"total_time":"3ms","total_time_in_millis":3},"filter_cache":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"id_cache":{"memory_size":"0b","memory_size_in_bytes":0},"fielddata":{"memory_size":"0b","memory_size_in_bytes":0,"evictions":0},"completion":{"size":"0b","size_in_bytes":0}},"os":{"timestamp":1381790346964,"uptime":"15.5m","uptime_in_millis":932146,"load_average":[1.79736328125,1.95166015625,1.904296875],"cpu":{"sys":22,"user":6,"idle":70,"stolen":0},"mem":{"free":"3.7gb","free_in_bytes":4058308608,"used":"4.2gb","used_in_bytes":4531625984,"free_percent":51,"used_percent":48,"actual_free":"4.1gb","actual_free_in_bytes":4419461120,"actual_used":"3.8gb","actual_used_in_bytes":4170473472},"swap":{"used":"2.8gb","used_in_bytes":3025272832,"free":"1.1gb","free_in_bytes":1269694464}},"process":{"timestamp":1381790346964,"open_file_descriptors":264,"cpu":{"percent":0,"sys":"2.8m","sys_in_millis":172378,"user":"2.3m","user_in_millis":140227,"total":"5.2m","total_in_millis":312605},"mem":{"resident":"28.5mb","resident_in_bytes":29892608,"share":"-1b","share_in_bytes":-1,"total_virtual":"3.6gb","total_virtual_in_bytes":3904798720}},"jvm":{"timestamp":1381790346976,"uptime":"4d","uptime_in_millis":349025339,"mem":{"heap_used":"20.8mb","heap_used_in_bytes":21889120,"heap_committed":"253.9mb","heap_committed_in_bytes":266272768,"non_heap_used":"40.2mb","non_heap_used_in_bytes":42232320,"non_heap_committed":"40.8mb","non_heap_committed_in_bytes":42799104,"pools":{"Code Cache":{"used":"2mb","used_in_bytes":2125312,"max":"48mb","max_in_bytes":50331648,"peak_used":"2mb","peak_used_in_bytes":2134912,"peak_max":"48mb","peak_max_in_bytes":50331648},"Par Eden Space":{"used":"8.4mb","used_in_bytes":8836504,"max":"66.5mb","max_in_bytes":69795840,"peak_used":"16.6mb","peak_used_in_bytes":17432576,"peak_max":"66.5mb","peak_max_in_bytes":69795840},"Par Survivor Space":{"used":"659.3kb","used_in_bytes":675192,"max":"8.3mb","max_in_bytes":8716288,"peak_used":"2mb","peak_used_in_bytes":2162688,"peak_max":"8.3mb","peak_max_in_bytes":8716288},"CMS Old Gen":{"used":"11.8mb","used_in_bytes":12377424,"max":"940.8mb","max_in_bytes":986513408,"peak_used":"11.8mb","peak_used_in_bytes":12377424,"peak_max":"940.8mb","peak_max_in_bytes":986513408},"CMS Perm Gen":{"used":"38.2mb","used_in_bytes":40107008,"max":"82mb","max_in_bytes":85983232,"peak_used":"38.2mb","peak_used_in_bytes":40107008,"peak_max":"82mb","peak_max_in_bytes":85983232}}},"threads":{"count":59,"peak_count":65},"gc":{"collection_count":61,"collection_time":"632ms","collection_time_in_millis":632,"collectors":{"ParNew":{"collection_count":61,"collection_time":"632ms","collection_time_in_millis":632},"ConcurrentMarkSweep":{"collection_count":0,"collection_time":"0s","collection_time_in_millis":0}}}},"thread_pool":{"generic":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":4,"completed":7515},"index":{"threads":4,"queue":0,"active":0,"rejected":0,"largest":4,"completed":4},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"merge":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"bulk":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"optimize":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":22},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":2,"completed":198},"search":{"threads":8,"queue":0,"active":0,"rejected":0,"largest":8,"completed":8},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"management":{"threads":4,"queue":0,"active":1,"rejected":0,"largest":5,"completed":10266},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":2}},"network":{"tcp":{"active_opens":91033,"passive_opens":3206,"curr_estab":824,"in_segs":9438872,"out_segs":7330489,"retrans_segs":10420,"estab_resets":4179,"attempt_fails":2304,"in_errs":15,"out_rsts":-1}},"fs":{"timestamp":1381790347016,"data":[{"path":"/var/elasticsearch/es5/data/elasticsearch/nodes/0","mount":"/","dev":"/dev/disk0s2","total":"465.1gb","total_in_bytes":499418034176,"free":"215.3gb","free_in_bytes":231241613312,"available":"215.1gb","available_in_bytes":230979469312,"disk_reads":2641856,"disk_writes":3231915,"disk_read_size":"75.9gb","disk_read_size_in_bytes":81593427456,"disk_write_size":"76.2gb","disk_write_size_in_bytes":81856144384}]},"transport":{"server_open":60,"rx_count":156869,"rx_size":"7mb","rx_size_in_bytes":7444733,"tx_count":156866,"tx_size":"11.9mb","tx_size_in_bytes":12497730},"http":{"current_open":0,"total_opened":2}},"cluster":{"name":"Thumbelina","transport_address":"inet[/127.0.0.1:9304]","hostname":"server","version":"0.90.5","http_address":"inet[server/127.0.0.1:9204]"}}],"aliases":[{"name":"search","max":3,"min":1,"indices":[false,{"name":"ag_01","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"2","index.version.created":"900599"},"mappings":{},"aliases":["search"]},"status":{"index":{"primary_size":"198b","primary_size_in_bytes":198,"size":"356b","size_in_bytes":356},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":2,"total_time":"0s","total_time_in_millis":0},"flush":{"total":27,"total_time":"1.4s","total_time_in_millis":1435},"shards":{"0":[{"routing":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"216ms","total_time_in_millis":216}},{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"382ms","total_time_in_millis":382}}],"1":[{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"643ms","total_time_in_millis":643}},{"routing":{"state":"STARTED","primary":false,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"194ms","total_time_in_millis":194}}]}}},{"name":"ag_02","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"3","index.version.created":"900599"},"mappings":{},"aliases":["search"]},"status":{"index":{"primary_size":"297b","primary_size_in_bytes":297,"size":"534b","size_in_bytes":534},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":3,"total_time":"0s","total_time_in_millis":0},"flush":{"total":20,"total_time":"340ms","total_time_in_millis":340},"shards":{"0":[{"routing":{"state":"STARTED","primary":true,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"107ms","total_time_in_millis":107}},{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"4ms","total_time_in_millis":4}}],"1":[{"routing":{"state":"STARTED","primary":false,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"75ms","total_time_in_millis":75}},{"routing":{"state":"STARTED","primary":true,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"122ms","total_time_in_millis":122}}],"2":[{"routing":{"state":"STARTED","primary":true,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"17ms","total_time_in_millis":17}},{"routing":{"state":"STARTED","primary":false,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"15ms","total_time_in_millis":15}}]}}},{"name":"ag_03","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"2","index.version.created":"900599"},"mappings":{},"aliases":["search","live"]},"status":{"index":{"primary_size":"198b","primary_size_in_bytes":198,"size":"356b","size_in_bytes":356},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":2,"total_time":"0s","total_time_in_millis":0},"flush":{"total":27,"total_time":"598ms","total_time_in_millis":598},"shards":{"0":[{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"101ms","total_time_in_millis":101}},{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"274ms","total_time_in_millis":274}}],"1":[{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"86ms","total_time_in_millis":86}},{"routing":{"state":"STARTED","primary":false,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"137ms","total_time_in_millis":137}}]}}},false]},{"name":"live","max":3,"min":3,"indices":[false,false,false,{"name":"ag_03","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"2","index.version.created":"900599"},"mappings":{},"aliases":["search","live"]},"status":{"index":{"primary_size":"198b","primary_size_in_bytes":198,"size":"356b","size_in_bytes":356},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":2,"total_time":"0s","total_time_in_millis":0},"flush":{"total":27,"total_time":"598ms","total_time_in_millis":598},"shards":{"0":[{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"101ms","total_time_in_millis":101}},{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"274ms","total_time_in_millis":274}}],"1":[{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"86ms","total_time_in_millis":86}},{"routing":{"state":"STARTED","primary":false,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"137ms","total_time_in_millis":137}}]}}},false]}]},
-		"indices":[{"name":null},{"name":"_river","state":"open","metadata":{"state":"open","settings":{"index.version.created":"900599","index.number_of_replicas":"1","index.number_of_shards":"1"},"mappings":{},"aliases":[]},"status":{"index":{"primary_size":"79b","primary_size_in_bytes":79,"size":"158b","size_in_bytes":158},"translog":{"operations":0},"docs":{"num_docs":1,"max_doc":1,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":124,"total_time":"2.4s","total_time_in_millis":2465},"shards":{"0":[{"routing":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"_river"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1380240228838,"operations":0},"docs":{"num_docs":187162420,"max_doc":187171320,"deleted_docs":9},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":62,"total_time":"1.6s","total_time_in_millis":1632}},{"routing":{"state":"STARTED","primary":true,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"_river"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1380240228838,"operations":0},"docs":{"num_docs":187162420,"max_doc":187171320,"deleted_docs":9},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":62,"total_time":"833ms","total_time_in_millis":833}}]}}},{"name":"ag_01","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"2","index.version.created":"900599"},"mappings":{},"aliases":["search"]},"status":{"index":{"primary_size":"198b","primary_size_in_bytes":198,"size":"356b","size_in_bytes":356},"translog":{"operations":0},"docs":{"num_docs":18716242,"max_doc":18717132,"deleted_docs":9},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":2,"total_time":"0s","total_time_in_millis":0},"flush":{"total":27,"total_time":"1.4s","total_time_in_millis":1435},"shards":{"0":[{"routing":{"state":"STARTED","primary":false,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"216ms","total_time_in_millis":216}},{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712651,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"382ms","total_time_in_millis":382}}],"1":[{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"643ms","total_time_in_millis":643}},{"routing":{"state":"STARTED","primary":false,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":1,"index":"ag_01"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731712637,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"194ms","total_time_in_millis":194}}]}}},{"name":"ag_02","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"3","index.version.created":"900599"},"mappings":{},"aliases":["search"]},"status":{"index":{"primary_size":"297b","primary_size_in_bytes":297,"size":"534b","size_in_bytes":534},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":3,"total_time":"0s","total_time_in_millis":0},"flush":{"total":20,"total_time":"340ms","total_time_in_millis":340},"shards":{"0":[{"routing":{"state":"STARTED","primary":true,"node":"jw4owU-ZQgOYdM7ElauDTg","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"107ms","total_time_in_millis":107}},{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663369,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"4ms","total_time_in_millis":4}}],"1":[{"routing":{"state":"STARTED","primary":false,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"75ms","total_time_in_millis":75}},{"routing":{"state":"STARTED","primary":true,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663385,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"122ms","total_time_in_millis":122}}],"2":[{"routing":{"state":"STARTED","primary":true,"node":"SwCmq0QKQuShZcJAbuW8OQ","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":4,"total_time":"17ms","total_time_in_millis":17}},{"routing":{"state":"STARTED","primary":false,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":2,"index":"ag_02"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381749663407,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":3,"total_time":"15ms","total_time_in_millis":15}}]}}},{"name":"ag_03","state":"open","metadata":{"state":"open","settings":{"index.number_of_replicas":"1","index.number_of_shards":"2","index.version.created":"900599"},"mappings":{},"aliases":["search","live"]},"status":{"index":{"primary_size":"198b","primary_size_in_bytes":198,"size":"356b","size_in_bytes":356},"translog":{"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":2,"total_time":"0s","total_time_in_millis":0},"flush":{"total":27,"total_time":"598ms","total_time_in_millis":598},"shards":{"0":[{"routing":{"state":"STARTED","primary":true,"node":"aBuoaKR5QVCfUZHgrJEfVg","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":6,"total_time":"101ms","total_time_in_millis":101}},{"routing":{"state":"STARTED","primary":false,"node":"3Rbfod0sS9eZ6VrOkY0JKw","relocating_node":null,"shard":0,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770063,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"274ms","total_time_in_millis":274}}],"1":[{"routing":{"state":"STARTED","primary":true,"node":"cqTmT9GLSlSWx-B7pvM--w","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"99b","size_in_bytes":99},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":1,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"86ms","total_time_in_millis":86}},{"routing":{"state":"STARTED","primary":false,"node":"PO1wHIidQo-w7sGHaYHvjg","relocating_node":null,"shard":1,"index":"ag_03"},"state":"STARTED","index":{"size":"79b","size_in_bytes":79},"translog":{"id":1381731770058,"operations":0},"docs":{"num_docs":0,"max_doc":0,"deleted_docs":0},"merges":{"current":0,"current_docs":0,"current_size":"0b","current_size_in_bytes":0,"total":0,"total_time":"0s","total_time_in_millis":0,"total_docs":0,"total_size":"0b","total_size_in_bytes":0},"refresh":{"total":0,"total_time":"0s","total_time_in_millis":0},"flush":{"total":7,"total_time":"137ms","total_time_in_millis":137}}]}}},{"name":"twitter_river","state":"close","metadata":{"state":"close","settings":{"index.number_of_replicas":"1","index.version.created":"900599","index.number_of_shards":"5"},"mappings":{"status":{"properties":{"text":{"type":"string"},"location":{"properties":{"lon":{"type":"double"},"lat":{"type":"double"}}},"link":{"properties":{"start":{"type":"long"},"expand_url":{"type":"string"},"display_url":{"type":"string"},"url":{"type":"string"},"end":{"type":"long"}}},"hashtag":{"properties":{"text":{"type":"string"},"start":{"type":"long"},"end":{"type":"long"}}},"truncated":{"type":"boolean"},"source":{"type":"string"},"retweet":{"properties":{"id":{"type":"long"},"user_screen_name":{"type":"string"},"retweet_count":{"type":"long"},"user_id":{"type":"long"}}},"created_at":{"format":"dateOptionalTime","type":"date"},"retweet_count":{"type":"long"},"in_reply":{"properties":{"user_screen_name":{"type":"string"},"status":{"type":"long"},"user_id":{"type":"long"}}},"mention":{"properties":{"id":{"type":"long"},"start":{"type":"long"},"name":{"type":"string"},"screen_name":{"type":"string"},"end":{"type":"long"}}},"place":{"properties":{"id":{"type":"string"},"name":{"type":"string"},"type":{"type":"string"},"country_code":{"type":"string"},"url":{"type":"string"},"full_name":{"type":"string"},"country":{"type":"string"}}},"user":{"properties":{"id":{"type":"long"},"profile_image_url_https":{"type":"string"},"location":{"type":"string"},"description":{"type":"string"},"name":{"type":"string"},"screen_name":{"type":"string"},"profile_image_url":{"type":"string"}}}}}},"aliases":[]},"status":null}]
-	};
-
-	window.builder = function() {
-		return new ui.NodesView({
-			interactive: true,
-			data: data
-		});
-	};
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/page/page.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/page/page.js
deleted file mode 100644
index 70bd114fb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/page/page.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Page = ui.AbstractWidget.extend({
-		show: function() {
-			this.el.show();
-		},
-		hide: function() {
-			this.el.hide();
-		}
-	});
-
-})( this.app );
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.css
deleted file mode 100644
index cd4138e23..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.uiPanelForm-field {
-	display: block;
-	padding: 2px 0;
-	clear: both;
-}
-
-.uiPanelForm-label {
-	float: left;
-	width: 200px;
-	padding: 3px 7px;
-	text-align: right;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.js
deleted file mode 100644
index 1bfbbdb4b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/panelForm/panelForm.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.PanelForm = ui.AbstractWidget.extend({
-		defaults: {
-			fields: null	// (required) instanceof app.ux.FieldCollection
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-			this.attach( parent );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiPanelForm", children: this.config.fields.fields.map(this._field_template, this) };
-		},
-		_field_template: function(field) {
-			return { tag: "LABEL", cls: "uiPanelForm-field", children: [
-				{ tag: "DIV", cls: "uiPanelForm-label", children: [ field.label, ut.require_template(field) ] },
-				field
-			]};
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.css
deleted file mode 100644
index dfe055cd7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.uiQueryFilter {
-	width: 350px;
-	padding: 5px;
-	background: #d8e7ff;
-	background: -moz-linear-gradient(left, #d8e7ff, #e8f1ff);
-	background: -webkit-linear-gradient(left, #d8e7ff, #e8f1ff);
-}
-
-.uiQueryFilter DIV.uiQueryFilter-section {
-	margin-bottom: 5px;
-}
-
-.uiQueryFilter HEADER {
-	display: block;
-	font-variant: small-caps;
-	font-weight: bold;
-	margin: 5px 0;
-}
-
-.uiQueryFilter-aliases SELECT {
-	width: 100%;
-}
-
-.uiQueryFilter-booble {
-	cursor: pointer;
-	background: #e8f1ff;
-	border: 1px solid #e8f1ff;
-	border-radius: 5px;
-	padding: 1px 4px;
-	margin-bottom: 1px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.uiQueryFilter-booble.selected {
-	background: #dae3f0;
-	border-top: 1px solid #c8d4e6;
-	border-left: 1px solid #c8d4e6;
-	border-bottom: 1px solid #ffffff;
-	border-right: 1px solid #ffffff;
-}
-
-.uiQueryFilter-filterName {
-	background-color: #cbdfff;
-	margin-bottom: 4px;
-	padding: 3px;
-	cursor: pointer;
-}
-
-.uiQueryFilter-filters INPUT  {
-	width: 300px;
-}
-
-.uiQueryFilter-subMultiFields {
-	padding-left: 10px;
-}
-
-.uiQueryFilter-rangeHintFrom,
-.uiQueryFilter-rangeHintTo {
-	margin: 0;
-	opacity: 0.75;
-}
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.js
deleted file mode 100644
index 3148ad9ea..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/queryFilter/queryFilter.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var ut = app.ns("ut");
-
-	ui.QueryFilter = ui.AbstractWidget.extend({
-		defaults: {
-			metadata: null,   // (required) instanceof app.data.MetaData
-			query: null       // (required) instanceof app.data.Query that the filters will act apon
-		},
-		init: function() {
-			this._super();
-			this.metadata = this.config.metadata;
-			this.query = this.config.query;
-			this.el = $(this._main_template());
-		},
-		helpTypeMap: {
-			"date" : "QueryFilter.DateRangeHelp"
-		},
-		requestUpdate: function(jEv) {
-			if(jEv && jEv.originalEvent) { // we only want to update on real user interaction not generated events
-				this.query.setPage(1);
-				this.query.query();
-			}
-		},
-		getSpec: function(fieldName) {
-			return this.metadata.fields[fieldName];
-		},
-		_selectAlias_handler: function(jEv) {
-			var indices = (jEv.target.selectedIndex === 0) ? [] : this.metadata.getIndices($(jEv.target).val());
-			$(".uiQueryFilter-index").each(function(i, el) {
-				var jEl = $(el);
-				if(indices.contains(jEl.text()) !== jEl.hasClass("selected")) {
-					jEl.click();
-				}
-			});
-			this.requestUpdate(jEv);
-		},
-		_selectIndex_handler: function(jEv) {
-			var jEl = $(jEv.target).closest(".uiQueryFilter-index");
-			jEl.toggleClass("selected");
-			var selected = jEl.hasClass("selected");
-			this.query.setIndex(jEl.text(), selected);
-			if(selected) {
-				var types = this.metadata.getTypes(this.query.indices);
-				this.el.find("DIV.uiQueryFilter-type.selected").each(function(n, el) {
-					if(! types.contains($(el).text())) {
-						$(el).click();
-					}
-				});
-			}
-			this.requestUpdate(jEv);
-		},
-		_selectType_handler: function(jEv) {
-			var jEl = $(jEv.target).closest(".uiQueryFilter-type");
-			jEl.toggleClass("selected");
-			var type = jEl.text(), selected = jEl.hasClass("selected");
-			this.query.setType(type, selected);
-			if(selected) {
-				var indices = this.metadata.types[type].indices;
-				// es throws a 500 if searching an index for a type it does not contain - so we prevent that
-				this.el.find("DIV.uiQueryFilter-index.selected").each(function(n, el) {
-					if(! indices.contains($(el).text())) {
-						$(el).click();
-					}
-				});
-				// es throws a 500 if you specify types from different indices with _all
-				jEl.siblings(".uiQueryFilter-type.selected").forEach(function(el) {
-					if(this.metadata.types[$(el).text()].indices.intersection(indices).length === 0) {
-						$(el).click();
-					}
-				}, this);
-			}
-			this.requestUpdate(jEv);
-		},
-		_openFilter_handler: function(section) {
-			var field_name = section.config.title;
-			if(! section.loaded) {
-				var spec = this.getSpec(field_name);
-				if(spec.core_type === "string") {
-					section.body.append(this._textFilter_template(spec));
-				} else if(spec.core_type === "date") {
-					section.body.append(this._dateFilter_template(spec));
-					section.body.append(new ui.DateHistogram({ printEl: section.body.find("INPUT"), cluster: this.cluster, query: this.query, spec: spec }));
-				} else if(spec.core_type === "number") {
-					section.body.append(this._numericFilter_template(spec));
-				} else if(spec.core_type === 'boolean') {
-					section.body.append(this._booleanFilter_template(spec));
-				} else if (spec.core_type === 'multi_field') {
-					section.body.append(this._multiFieldFilter_template(section, spec));
-				} 
-				section.loaded = true;
-			}
-			section.on("animComplete", function(section) { section.body.find("INPUT").focus(); });
-		},
-		_textFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqids = jEl.data("uqids") || [];
-			uqids.forEach(function(uqid) {
-				uqid && this.query.removeClause(uqid);
-			}, this);
-			if(val.length) {
-				if(jEl[0] === document.activeElement && jEl[0].selectionStart === jEl[0].selectionEnd) {
-					val = val.replace(new RegExp("(.{"+jEl[0].selectionStart+"})"), "$&*");
-				}
-				uqids = val.split(/\s+/).map(function(term) {
-					// Figure out the actual field name - needed for multi_field, because
-					// querying for "field.field" will not work. Simply "field" must be used
-					// if nothing is aliased.
-					var fieldNameParts = spec.field_name.split('.');
-					var part = fieldNameParts.length - 1;
-					var name = fieldNameParts[part];
-					while (part >= 1) {
-						if (fieldNameParts[part] !== fieldNameParts[part - 1]) {
-							name = fieldNameParts[part - 1] + "." + name;
-						}
-						part--;
-					}
-					return term && this.query.addClause(term, name, "wildcard", "must");
-				}, this);
-			}
-			jEl.data("uqids", uqids);
-			this.requestUpdate(jEv);
-		},
-		_dateFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			var range = window.dateRangeParser.parse(val);
-			var lastRange = jEl.data("lastRange");
-			if(!range || (lastRange && lastRange.start === range.start && lastRange.end === range.end)) {
-				return;
-			}
-			uqid && this.query.removeClause(uqid);
-			if((range.start && range.end) === null) {
-				uqid = null;
-			} else {
-				var value = {};
-				if( range.start ) {
-					value["gte"] = range.start;
-				}
-				if( range.end ) {
-					value["lte"] = range.end;
-				}
-				uqid = this.query.addClause( value, spec.field_name, "range", "must");
-			}
-			jEl.data("lastRange", range);
-			jEl.siblings(".uiQueryFilter-rangeHintFrom")
-				.text(i18n.text("QueryFilter.DateRangeHint.from", range.start && new Date(range.start).toUTCString()));
-			jEl.siblings(".uiQueryFilter-rangeHintTo")
-				.text(i18n.text("QueryFilter.DateRangeHint.to", range.end && new Date(range.end).toUTCString()));
-			jEl.data("uqid", uqid);
-			this.requestUpdate(jEv);
-		},
-		_numericFilterChange_handler: function(jEv) {
-			var jEl = $(jEv.target).closest("INPUT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			var lastRange = jEl.data("lastRange");
-			var range = (function(val) {
-				var ops = val.split(/->|<>|</).map( function(v) { return parseInt(v.trim(), 10); });
-				if(/<>/.test(val)) {
-					return { gte: (ops[0] - ops[1]), lte: (ops[0] + ops[1]) };
-				} else if(/->|</.test(val)) {
-					return { gte: ops[0], lte: ops[1] };
-				} else {
-					return { gte: ops[0], lte: ops[0] };
-				}
-			})(val || "");
-			if(!range || (lastRange && lastRange.lte === range.lte && lastRange.gte === range.gte)) {
-				return;
-			}
-			jEl.data("lastRange", range);
-			uqid && this.query.removeClause(uqid);
-			uqid = this.query.addClause( range, spec.field_name, "range", "must");
-			jEl.data("uqid", uqid);
-			this.requestUpdate(jEv);
-		},
-		_booleanFilterChange_handler: function( jEv ) {
-			var jEl = $(jEv.target).closest("SELECT");
-			var val = jEl.val();
-			var spec = jEl.data("spec");
-			var uqid = jEl.data("uqid") || null;
-			uqid && this.query.removeClause(uqid);
-			if(val === "true" || val === "false") {
-				jEl.data("uqid", this.query.addClause(val, spec.field_name, "term", "must") );
-			}
-			this.requestUpdate(jEv);
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiQueryFilter", children: [
-				this._aliasSelector_template(),
-				this._indexSelector_template(),
-				this._typesSelector_template(),
-				this._filters_template()
-			] };
-		},
-		_aliasSelector_template: function() {
-			var aliases = Object.keys(this.metadata.aliases).sort();
-			aliases.unshift( i18n.text("QueryFilter.AllIndices") );
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-aliases", children: [
-				{ tag: "SELECT", onChange: this._selectAlias_handler, children: aliases.map(ut.option_template) }
-			] };
-		},
-		_indexSelector_template: function() {
-			var indices = Object.keys( this.metadata.indices ).sort();
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-indices", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Indices") },
-				{ tag: "DIV", onClick: this._selectIndex_handler, children: indices.map( function( name ) {
-					return { tag: "DIV", cls: "uiQueryFilter-booble uiQueryFilter-index", text: name };
-				})}
-			] };
-		},
-		_typesSelector_template: function() {
-			var types = Object.keys( this.metadata.types ).sort();
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-types", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Types") },
-				{ tag: "DIV", onClick: this._selectType_handler, children: types.map( function( name ) {
-					return { tag: "DIV", cls: "uiQueryFilter-booble uiQueryFilter-type", text: name };
-				})}
-			] };
-		},
-		_filters_template: function() {
-			var _metadataFields = this.metadata.fields;
-			var fields = Object.keys( _metadataFields ).sort()
-				.filter(function(d) { return (_metadataFields[d].core_type !== undefined); });
-			return { tag: "DIV", cls: "uiQueryFilter-section uiQueryFilter-filters", children: [
-				{ tag: "HEADER", text: i18n.text("QueryFilter-Header-Fields") },
-				{ tag: "DIV", children: fields.map( function(name ) {
-					return new app.ui.SidebarSection({
-						title: name,
-						help: this.helpTypeMap[this.metadata.fields[ name ].type],
-						onShow: this._openFilter_handler
-					});
-				}, this ) }
-			] };
-		},
-		_textFilter_template: function(spec) {
-			return { tag: "INPUT", data: { spec: spec }, onKeyup: this._textFilterChange_handler };
-		},
-		_dateFilter_template: function(spec) {
-			return { tag: "DIV", children: [
-				{ tag: "INPUT", data: { spec: spec }, onKeyup: this._dateFilterChange_handler },
-				{ tag: "PRE", cls: "uiQueryFilter-rangeHintFrom", text: i18n.text("QueryFilter.DateRangeHint.from", "")},
-				{ tag: "PRE", cls: "uiQueryFilter-rangeHintTo", text: i18n.text("QueryFilter.DateRangeHint.to", "") }
-			]};
-		},
-		_numericFilter_template: function(spec) {
-			return { tag: "INPUT", data: { spec: spec }, onKeyup: this._numericFilterChange_handler };
-		},
-		_booleanFilter_template: function(spec) {
-			return { tag: "SELECT", data: { spec: spec }, onChange: this._booleanFilterChange_handler,
-				children: [ i18n.text("QueryFilter.AnyValue"), "true", "false" ].map( function( val ) {
-					return { tag: "OPTION", value: val, text: val };
-				})
-			};
-		},
-		_multiFieldFilter_template: function(section, spec) {
-			return {
-				tag : "DIV", cls : "uiQueryFilter-subMultiFields", children : acx.eachMap(spec.fields, function(name, data) {
-					if (name === spec.field_name) {
-						section.config.title = spec.field_name + "." + name;
-						return this._openFilter_handler(section);
-					}
-					return new app.ui.SidebarSection({
-						title : data.field_name, help : this.helpTypeMap[data.type], onShow : this._openFilter_handler
-					});
-				}, this)
-			};
-		}	
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButton.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButton.js
deleted file mode 100644
index 189cd4e2f..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButton.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.RefreshButton = ui.SplitButton.extend({
-		defaults: {
-			timer: -1
-		},
-		init: function( parent ) {
-			this.config.label = i18n.text("General.RefreshResults");
-			this._super( parent );
-			this.set( this.config.timer );
-		},
-		set: function( value ) {
-			this.value = value;
-			window.clearInterval( this._timer );
-			if( this.value > 0 ) {
-				this._timer = window.setInterval( this._refresh_handler, this.value );
-			}
-		},
-		_click_handler: function() {
-			this._refresh_handler();
-		},
-		_select_handler: function( el, event ) {
-			this.set( event.value );
-			this.fire("change", this );
-		},
-		_refresh_handler: function() {
-			this.fire("refresh", this );
-		},
-		_getItems: function() {
-			return [
-				{ text: i18n.text("General.ManualRefresh"), value: -1 },
-				{ text: i18n.text("General.RefreshQuickly"), value: 100 },
-				{ text: i18n.text("General.Refresh5seconds"), value: 5000 },
-				{ text: i18n.text("General.Refresh1minute"), value: 60000 }
-			];
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonDemo.js
deleted file mode 100644
index 585321aef..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonDemo.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-
-	window.builder = function() {
-		return new ui.RefreshButton({
-			onRefresh: function() { console.log("-> refresh", arguments ); },
-			onChange: function() { console.log("-> change", arguments ); }
-		});
-	};
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonSpec.js
deleted file mode 100644
index 0adbb5110..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/refreshButton/refreshButtonSpec.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.ui.RefreshButton", function() {
-
-	var RefreshButton = window.app.ui.RefreshButton;
-
-	var r, refresh_handler, change_handler;
-
-	function openMenuPanel( button, label ) {
-		button.el.find("BUTTON").eq(1).click();
-		$(".uiMenuPanel-label:contains(" + label + ")").click();
-		test.clock.tick(); // menuPanel -> bind _close_handler
-	}
-
-
-	beforeEach( function() {
-		test.clock.steal();
-		refresh_handler = jasmine.createSpy("refresh_handler");
-		change_handler = jasmine.createSpy("change_handler");
-		r = new RefreshButton({
-			onRefresh: refresh_handler,
-			onChange: change_handler
-		});
-		r.attach( document.body );
-	});
-
-	afterEach( function() {
-		r.remove();
-		test.clock.restore();
-	});
-
-	it("should have an initial default value", function() {
-		expect( r.value ).toBe( -1 );
-	});
-
-	it("should fire a refresh event after clicking the refresh button ", function() {
-		r.el.find("BUTTON").eq(0).click();
-
-		expect( refresh_handler ).toHaveBeenCalled();
-	});
-
-	it("should change the refresh rate when set it called", function() {
-		r.set( 100 );
-		expect( r.value ).toBe( 100 );
-	});
-
-	it("should set an interval when rate is set to a positive value", function() {
-		r.set( 100 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 1 );
-	});
-
-	it("should not set an interval when rate is set to a non positive value", function() {
-		r.set( -1 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 0 );
-	});
-
-	it("should fire a refresh event on intervals if refresh menu item is set to quickly", function() {
-		openMenuPanel( r, "quickly" );
-
-		expect( refresh_handler.calls.count() ).toBe( 0 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 1 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 2 );
-	});
-
-	it("should not fire refresh events when user selects Manual", function() {
-
-		openMenuPanel( r, "quickly" );
-
-		expect( refresh_handler.calls.count() ).toBe( 0 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 1 );
-
-		openMenuPanel( r, "Manual" );
-
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 1 );
-		test.clock.tick();
-		expect( refresh_handler.calls.count() ).toBe( 1 );
-	});
-
-	it("should fire a change event when a new refresh rate is selected", function() {
-		openMenuPanel( r, "quickly" );
-		expect( change_handler.calls.count() ).toBe( 1 );
-		expect( r.value ).toBe( 100 );
-		openMenuPanel( r, "Manual" );
-		expect( change_handler.calls.count() ).toBe( 2 );
-		expect( r.value ).toBe( -1 );
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/resultTable/resultTable.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/resultTable/resultTable.js
deleted file mode 100644
index 11999a915..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/resultTable/resultTable.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.ResultTable = ui.Table.extend({
-		defaults: {
-			width: 500,
-			height: 400
-		},
-
-		init: function() {
-			this._super();
-			this.on("rowClick", this._showPreview_handler);
-			this.selectedRow = null;
-			$(document).bind("keydown", this._nav_handler);
-		},
-		remove: function() {
-			$(document).unbind("keydown", this._nav_handler);
-			this._super();
-		},
-		attach: function(parent) {
-			if(parent) {
-				var height = parent.height() || ( $(document).height() - parent.offset().top - 41 ); // 41 = height in px of .uiTable-tools + uiTable-header
-				var width = parent.width();
-				this.el.width( width );
-				this.body.width( width ).height( height );
-			}
-			this._super(parent);
-		},
-		showPreview: function(row) {
-			row.addClass("selected");
-			this.preview = new app.ui.JsonPanel({
-				title: i18n.text("Browser.ResultSourcePanelTitle"),
-				json: row.data("row")._source,
-				onClose: function() { row.removeClass("selected"); }
-			});
-		},
-		_nav_handler: function(jEv) {
-			if(jEv.keyCode !== 40 && jEv.keyCode !== 38) {
-				return;
-			}
-			this.selectedRow && this.preview && this.preview.remove();
-			if(jEv.keyCode === 40) { // up arrow
-				this.selectedRow = this.selectedRow ? this.selectedRow.next("TR") : this.body.find("TR:first");
-			} else if(jEv.keyCode === 38) { // down arrow
-				this.selectedRow = this.selectedRow ? this.selectedRow.prev("TR") : this.body.find("TR:last");
-			}
-			this.selectedRow && this.showPreview(this.selectedRow);
-		},
-		_showPreview_handler: function(obj, data) {
-			this.showPreview(this.selectedRow = data.row);
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.css
deleted file mode 100644
index 7315527df..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.uiSelectMenuPanel .uiMenuPanel-label {
-	margin-left: 1em;
-	padding-left: 4px;
-}
-
-.uiSelectMenuPanel .uiMenuPanel-item.selected .uiMenuPanel-label:before {
-	content: "\2713";
-	width: 12px;
-	margin-left: -12px;
-	display: inline-block;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.js
deleted file mode 100644
index 49cecca13..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/selectMenuPanel/selectMenuPanel.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.SelectMenuPanel = ui.MenuPanel.extend({
-		defaults: {
-			items: [],		// (required) an array of menu items
-			value: null
-		},
-		_baseCls: "uiSelectMenuPanel uiMenuPanel",
-		init: function() {
-			this.value = this.config.value;
-			this._super();
-		},
-		_getItems: function() {
-			return this.config.items.map( function( item ) {
-				return {
-					text: item.text,
-					selected: this.value === item.value,
-					onclick: function( jEv ) {
-						var el = $( jEv.target ).closest("LI");
-						el.parent().children().removeClass("selected");
-						el.addClass("selected");
-						this.fire( "select", this, { value: item.value } );
-						this.value = item.value;
-					}.bind(this)
-				};
-			}, this );
-
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.css
deleted file mode 100644
index 654389fcd..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.uiSidebarSection-head {
-	background-color: #b9cfff;
-	background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAcCAMAAABifa5OAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAMAUExURQUCFf///wICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVVVVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+vr7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///2Oyy/cAAAACdFJOU/8A5bcwSgAAADxJREFUeNq8zzkOACAMA8Hd/3+agiuRcIsrRopIjArOoLK1QAMNNBCRPkhLyzkn35Bjfd7JR1Nr09NoDACnvgDl1zlzoQAAAABJRU5ErkJggg==');
-	background-repeat: no-repeat;
-	background-position: 2px 5px;
-	margin-bottom: 1px;
-	padding: 3px 3px 3px 17px;
-	cursor: pointer;
-}
-
-.shown > .uiSidebarSection-head {
-	background-position: 2px -13px;
-}
-
-.uiSidebarSection-body {
-	margin-bottom: 3px;
-	display: none;
-}
-
-.uiSidebarSection-help {
-	text-shadow: #228 1px 1px 2px;
-	color: blue;
-	cursor: pointer;
-}
-
-.uiSidebarSection-help:hover {
-	text-decoration: underline;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.js
deleted file mode 100644
index e9f2300b0..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/sidebarSection/sidebarSection.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-
-	ui.SidebarSection = ui.AbstractWidget.extend({
-		defaults: {
-			title: "",
-			help: null,
-			body: null,
-			open: false
-		},
-		init: function() {
-			this._super();
-			this.el = $.joey( this._main_template() );
-			this.body = this.el.children(".uiSidebarSection-body");
-			this.config.open && ( this.el.addClass("shown") && this.body.css("display", "block") );
-		},
-		_showSection_handler: function( ev ) {
-			var shown = $( ev.target ).closest(".uiSidebarSection")
-				.toggleClass("shown")
-					.children(".uiSidebarSection-body").slideToggle(200, function() { this.fire("animComplete", this); }.bind(this))
-				.end()
-				.hasClass("shown");
-			this.fire(shown ? "show" : "hide", this);
-		},
-		_showHelp_handler: function( ev ) {
-			new ui.HelpPanel({ref: this.config.help});
-			ev.stopPropagation();
-		},
-		_main_template: function() { return (
-			{ tag: "DIV", cls: "uiSidebarSection", children: [
-				(this.config.title && { tag: "DIV", cls: "uiSidebarSection-head", onclick: this._showSection_handler, children: [
-					this.config.title,
-					( this.config.help && { tag: "SPAN", cls: "uiSidebarSection-help pull-right", onclick: this._showHelp_handler, text: i18n.text("General.HelpGlyph") } )
-				] }),
-				{ tag: "DIV", cls: "uiSidebarSection-body", children: [ this.config.body ] }
-			] }
-		); }
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.css
deleted file mode 100644
index e8d275296..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.uiSplitButton {
-	white-space: nowrap;
-}
-
-.uiSplitButton .uiButton:first-child {
-	margin-right: 0;
-	display: inline-block;
-}
-
-.uiSplitButton .uiButton:first-child .uiButton-content {
-	border-right-width: 1;
-	border-right-color: #5296c7;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.uiSplitButton .uiMenuButton {
-	margin-left: 0;
-}
-
-.uiSplitButton .uiButton:last-child .uiButton-content {
-	border-radius: 2px;
-	border-left-width: 1;
-	border-left-color: #96c6eb;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-	height: 20px;
-}
-
-.uiSplitButton .uiButton:last-child .uiButton-label {
-	padding: 2px 17px 2px 6px;
-	margin-left: -8px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.js
deleted file mode 100644
index 1e5b27637..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButton.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.SplitButton = ui.AbstractWidget.extend({
-		defaults: {
-			items: [],
-			label: ""
-		},
-		_baseCls: "uiSplitButton",
-		init: function( parent ) {
-			this._super( parent );
-			this.value = null;
-			this.button = new ui.Button({
-				label: this.config.label,
-				onclick: this._click_handler
-			});
-			this.menu = new ui.SelectMenuPanel({
-				value: this.config.value,
-				items: this._getItems(),
-				onSelect: this._select_handler
-			});
-			this.menuButton = new ui.MenuButton({
-				label: "\u00a0",
-				menu: this.menu
-			});
-			this.el = $.joey(this._main_template());
-		},
-		remove: function() {
-			this.menu.remove();
-		},
-		disable: function() {
-			this.button.disable();
-		},
-		enable: function() {
-			this.button.enable();
-		},
-		_click_handler: function() {
-			this.fire("click", this, { value: this.value } );
-		},
-		_select_handler: function( panel, event ) {
-			this.fire( "select", this, event );
-		},
-		_getItems: function() {
-			return this.config.items;
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: [
-				this.button, this.menuButton
-			] };
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButtonDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButtonDemo.js
deleted file mode 100644
index 2ef6d0bdd..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/splitButton/splitButtonDemo.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-
-	window.builder = function() {
-		return new ui.SplitButton({
-			label: "Default",
-			items: [
-				{ label: "Action" },
-				{ label: "Another Action" },
-				{ label: "Selected", selected: true }
-			]
-		});
-	};
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.css
deleted file mode 100644
index 502204587..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.uiStructuredQuery {
-	padding: 10px;
-}
-
-.uiStructuredQuery-out {
-	min-height: 30px;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.js
deleted file mode 100644
index 11d3095d5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/structuredQuery/structuredQuery.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app, i18n ) {
-
-	var ui = app.ns("ui");
-	var data = app.ns("data");
-
-	var StructuredQuery = ui.AbstractWidget.extend({
-		defaults: {
-			cluster: null  // (required) instanceof app.services.Cluster
-		},
-		_baseCls: "uiStructuredQuery",
-		init: function(parent) {
-			this._super();
-			this.selector = new ui.IndexSelector({
-				onIndexChanged: this._indexChanged_handler,
-				cluster: this.config.cluster
-			});
-			this.el = $(this._main_template());
-			this.out = this.el.find("DIV.uiStructuredQuery-out");
-			this.attach( parent );
-		},
-		
-		_indexChanged_handler: function( index ) {
-			this.filter && this.filter.remove();
-			this.filter = new ui.FilterBrowser({
-				cluster: this.config.cluster,
-				index: index,
-				onStartingSearch: function() { this.el.find("DIV.uiStructuredQuery-out").text( i18n.text("General.Searching") ); this.el.find("DIV.uiStructuredQuery-src").hide(); }.bind(this),
-				onSearchSource: this._searchSource_handler,
-				onResults: this._results_handler
-			});
-			this.el.find(".uiStructuredQuery-body").append(this.filter);
-		},
-		
-		_results_handler: function( filter, event ) {
-			var typeMap = {
-				"json": this._jsonResults_handler,
-				"table": this._tableResults_handler,
-				"csv": this._csvResults_handler
-			};
-			typeMap[ event.type ].call( this, event.data, event.metadata );
-		},
-		_jsonResults_handler: function( results ) {
-			this.el.find("DIV.uiStructuredQuery-out").empty().append( new ui.JsonPretty({ obj: results }));
-		},
-		_csvResults_handler: function( results ) {
-			this.el.find("DIV.uiStructuredQuery-out").empty().append( new ui.CSVTable({ results: results }));
-		},
-		_tableResults_handler: function( results, metadata ) {
-			// hack up a QueryDataSourceInterface so that StructuredQuery keeps working without using a Query object
-			var qdi = new data.QueryDataSourceInterface({ metadata: metadata, query: new data.Query() });
-			var tab = new ui.Table( {
-				store: qdi,
-				height: 400,
-				width: this.out.innerWidth()
-			} ).attach(this.out.empty());
-			qdi._results_handler(qdi.config.query, results);
-		},
-		
-		_showRawJSON : function() {
-			if($("#rawJsonText").length === 0) {
-				var hiddenButton = $("#showRawJSON");
-				var jsonText = $({tag: "P", type: "p", id: "rawJsonText"});
-				jsonText.text(hiddenButton[0].value);
-				hiddenButton.parent().append(jsonText);
-			}
-		},
-		
-		_searchSource_handler: function(src) {
-			var searchSourceDiv = this.el.find("DIV.uiStructuredQuery-src");
-			searchSourceDiv.empty().append(new app.ui.JsonPretty({ obj: src }));
-			if(typeof JSON !== "undefined") {
-				var showRawJSON = $({ tag: "BUTTON", type: "button", text: i18n.text("StructuredQuery.ShowRawJson"), id: "showRawJSON", value: JSON.stringify(src), onclick: this._showRawJSON });
-				searchSourceDiv.append(showRawJSON);
-			}
-			searchSourceDiv.show();
-		},
-		
-		_main_template: function() {
-			return { tag: "DIV", cls: this._baseCls, children: [
-				this.selector,
-				{ tag: "DIV", cls: "uiStructuredQuery-body" },
-				{ tag: "DIV", cls: "uiStructuredQuery-src", css: { display: "none" } },
-				{ tag: "DIV", cls: "uiStructuredQuery-out" }
-			]};
-		}
-	});
-
-	ui.StructuredQuery = ui.Page.extend({
-		init: function() {
-			this.q = new StructuredQuery( this.config );
-			this.el = this.q.el;
-		}
-	});
-
-})( this.jQuery, this.app, this.i18n );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.css
deleted file mode 100644
index ea8e0cfd4..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.css
+++ /dev/null
@@ -1,92 +0,0 @@
-.uiTable TABLE {
-	border-collapse: collapse;
-}
-
-.uiTable-body {
-	overflow-y: scroll;
-	overflow-x: auto;
-}
-
-.uiTable-headers {
-	overflow-x: hidden;
-}
-
-.uiTable-body TD {
-	white-space: nowrap;
-}
-
-.uiTable-body .uiTable-header-row TH,
-.uiTable-body .uiTable-header-row TH DIV {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-.uiTable-body .uiTable-header-cell > DIV {
-	height: 0;
-	overflow: hidden;
-}
-
-.uiTable-headercell-menu {
-	float: right;
-}
-
-.uiTable-tools {
-	padding: 3px 4px;
-	height: 14px;
-}
-
-.uiTable-header-row {
-	background: #ddd;
-	background: -moz-linear-gradient(top, #eee, #ccc);
-	background: -webkit-linear-gradient(top, #eee, #ccc);
-}
-
-.uiTable-headercell-text {
-	margin-right: 20px;
-}
-
-.uiTable-headercell-menu {
-	display: none;
-}
-
-.uiTable-header-row TH {
-	border-right: 1px solid #bbb;
-	padding: 0;
-	text-align: left;
-}
-
-.uiTable-header-row TH > DIV {
-	padding: 3px 4px;
-	border-right: 1px solid #eee;
-}
-
-.uiTable-headerEndCap > DIV {
-	width: 19px;
-}
-
-.uiTable-header-row .uiTable-sort {
-	background: #ccc;
-	background: -moz-linear-gradient(top, #bebebe, #ccc);
-	background: -webkit-linear-gradient(top, #bebebe, #ccc);
-}
-.uiTable-header-row TH.uiTable-sort > DIV {
-	border-right: 1px solid #ccc;
-}
-
-.uiTable-sort .uiTable-headercell-menu {
-	display: block;
-}
-
-.uiTable TABLE TD {
-	border-right: 1px solid transparent;
-	padding: 3px 4px;
-}
-
-.uiTable-body TABLE TR:nth-child(even) {
-	background: #f3f3f3;
-}
-
-.uiTable-body TABLE TR.selected {
-	color: white;
-	background: #6060f1;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.js
deleted file mode 100644
index 91827d1bf..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/table/table.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-( function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Table = ui.AbstractWidget.extend({
-		defaults: {
-			store: null, // (required) implements interface app.data.DataSourceInterface
-			height: 0,
-			width: 0
-		},
-		_baseCls: "uiTable",
-		init: function(parent) {
-			this._super();
-			this.initElements(parent);
-			this.config.store.on("data", this._data_handler);
-		},
-		attach: function(parent) {
-			if(parent) {
-				this._super(parent);
-				this._reflow();
-			}
-		},
-		initElements: function(parent) {
-			this.el = $.joey(this._main_template());
-			this.body = this.el.find(".uiTable-body");
-			this.headers = this.el.find(".uiTable-headers");
-			this.tools = this.el.find(".uiTable-tools");
-			this.attach( parent );
-		},
-		_data_handler: function(store) {
-			this.tools.text(store.summary);
-			this.headers.empty().append(this._header_template(store.columns));
-			this.body.empty().append(this._body_template(store.data, store.columns));
-			this._reflow();
-		},
-		_reflow: function() {
-			var firstCol = this.body.find("TR:first TH.uiTable-header-cell > DIV"),
-					headers = this.headers.find("TR:first TH.uiTable-header-cell > DIV");
-			for(var i = 0; i < headers.length; i++) {
-				$(headers[i]).width( $(firstCol[i]).width() );
-			}
-			this._scroll_handler();
-		},
-		_scroll_handler: function(ev) {
-			this.el.find(".uiTable-headers").scrollLeft(this.body.scrollLeft());
-		},
-		_dataClick_handler: function(ev) {
-			var row = $(ev.target).closest("TR");
-			if(row.length) {
-				this.fire("rowClick", this, { row: row } );
-			}
-		},
-		_headerClick_handler: function(ev) {
-			var header = $(ev.target).closest("TH.uiTable-header-cell");
-			if(header.length) {
-				this.fire("headerClick", this, { header: header, column: header.data("column"), dir: header.data("dir") });
-			}
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), css: { width: this.config.width + "px" }, cls: this._baseCls, children: [
-				{ tag: "DIV", cls: "uiTable-tools" },
-				{ tag: "DIV", cls: "uiTable-headers", onclick: this._headerClick_handler },
-				{ tag: "DIV", cls: "uiTable-body",
-					onclick: this._dataClick_handler,
-					onscroll: this._scroll_handler,
-					css: { height: this.config.height + "px", width: this.config.width + "px" }
-				}
-			] };
-		},
-		_header_template: function(columns) {
-			var ret = { tag: "TABLE", children: [ this._headerRow_template(columns) ] };
-			ret.children[0].children.push(this._headerEndCap_template());
-			return ret;
-		},
-		_headerRow_template: function(columns) {
-			return { tag: "TR", cls: "uiTable-header-row", children: columns.map(function(column) {
-				var dir = ((this.config.store.sort.column === column) && this.config.store.sort.dir) || "none";
-				return { tag: "TH", data: { column: column, dir: dir }, cls: "uiTable-header-cell" + ((dir !== "none") ? " uiTable-sort" : ""), children: [
-					{ tag: "DIV", children: [
-						{ tag: "DIV", cls: "uiTable-headercell-menu", text: dir === "asc" ? "\u25b2" : "\u25bc" },
-						{ tag: "DIV", cls: "uiTable-headercell-text", text: column }
-					]}
-				]};
-			}, this)};
-		},
-		_headerEndCap_template: function() {
-			return { tag: "TH", cls: "uiTable-headerEndCap", children: [ { tag: "DIV" } ] };
-		},
-		_body_template: function(data, columns) {
-			return { tag: "TABLE", children: []
-				.concat(this._headerRow_template(columns))
-				.concat(data.map(function(row) {
-					return { tag: "TR", data: { row: row }, cls: "uiTable-row", children: columns.map(function(column){
-						return { tag: "TD", cls: "uiTable-cell", children: [ { tag: "DIV", text: (row[column] || "").toString() } ] };
-					})};
-				}))
-			};
-		}
-
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textField.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textField.js
deleted file mode 100644
index 0ee98ec54..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textField.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ui = app.ns("ui");
-
-	ui.TextField = ui.AbstractField.extend({
-		init: function() {
-			this._super();
-		},
-		_keyup_handler: function() {
-			this.fire("change", this );
-		},
-		_main_template: function() {
-			return { tag: "DIV", id: this.id(), cls: "uiField uiTextField", children: [
-				{ tag: "INPUT",
-					type: "text",
-					name: this.config.name,
-					placeholder: this.config.placeholder,
-					onkeyup: this._keyup_handler
-				}
-			]};
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textFieldDemo.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textFieldDemo.js
deleted file mode 100644
index 9f77159c5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/textField/textFieldDemo.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-$( function() {
-
-	var ui = window.app.ns("ui");
-
-	window.builder = function() { return (
-		{ tag: "DIV", children: [
-			new ui.TextField({}),
-			new ui.TextField({ placeholder: "placeholder" }),
-			new ui.TextField({ onchange: function( tf ) { console.log( tf.val() ); } })
-		] }
-	); };
-
-});
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.css
deleted file mode 100644
index e5cf72f1f..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.uiToolbar {
-	height: 28px;
-	background: #fdfefe;
-	background: -moz-linear-gradient(top, #fdfefe, #eaedef);
-	background: -webkit-linear-gradient(top, #fdfefe, #eaedef);
-	border-bottom: 1px solid #d2d5d7;
-	padding: 3px 10px;
-}
-
-.uiToolbar H2 {
-	display: inline-block;
-	font-size: 120%;
-	margin: 0;
-	padding: 5px 20px 5px 0;
-}
-
-.uiToolbar .uiTextField {
-	display: inline-block;
-}
-
-.uiToolbar .uiTextField INPUT {
-	padding-top: 2px;
-	padding-bottom: 5px;
-}
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.js
deleted file mode 100644
index ac2ad377d..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ui/toolbar/toolbar.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ui = app.ns("ui");
-
-	ui.Toolbar = ui.AbstractWidget.extend({
-		defaults: {
-			label: "",
-			left: [],
-			right: []
-		},
-		init: function(parent) {
-			this._super();
-			this.el = $.joey(this._main_template());
-		},
-		_main_template: function() {
-			return { tag: "DIV", cls: "uiToolbar", children: [
-				{ tag: "DIV", cls: "pull-left", children: [
-					{ tag: "H2", text: this.config.label }
-				].concat(this.config.left) },
-				{ tag: "DIV", cls: "pull-right", children: this.config.right }
-			]};
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/class.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/class.js
deleted file mode 100644
index 80142637c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/class.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * base class for creating inheritable classes
- * based on resigs 'Simple Javascript Inheritance Class' (based on base2 and prototypejs)
- * modified with static super and auto config
- * @name Class
- * @constructor
- */
-(function( $, app ){
-
-	var ux = app.ns("ux");
-
-	var initializing = false, fnTest = /\b_super\b/;
-
-	ux.Class = function(){};
-
-	ux.Class.extend = function(prop) {
-		function Class() {
-			if(!initializing) {
-				var args = Array.prototype.slice.call(arguments);
-				this.config = $.extend( function(t) { // automatically construct a config object based on defaults and last item passed into the constructor
-					return $.extend(t._proto && t._proto() && arguments.callee(t._proto()) || {}, t.defaults);
-				} (this) , args.pop() );
-				this.init && this.init.apply(this, args); // automatically run the init function when class created
-			}
-		}
-
-		initializing = true;
-		var prototype = new this();
-		initializing = false;
-		
-		var _super = this.prototype;
-		prototype._proto = function() {
-			return _super;
-		};
-
-		for(var name in prop) {
-			prototype[name] = typeof prop[name] === "function" && typeof _super[name] === "function" && fnTest.test(prop[name]) ?
-				(function(name, fn){
-					return function() { this._super = _super[name]; return fn.apply(this, arguments); };
-				})(name, prop[name]) : prop[name];
-		}
-
-		Class.prototype = prototype;
-		Class.constructor = Class;
-
-		Class.extend = arguments.callee; // make class extendable
-
-		return Class;
-	};
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/dragdrop.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/dragdrop.js
deleted file mode 100644
index 6f81878cb..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/dragdrop.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( $, app ) {
-
-	var ux = app.ns("ux");
-
-	/**
-	 * Provides drag and drop functionality<br>
-	 * a DragDrop instance is created for each usage pattern and then used over and over again<br>
-	 * first a dragObj is defined - this is the jquery node that will be dragged around<br>
-	 * second, the event callbacks are defined - these allow you control the ui during dragging and run functions when successfully dropping<br>
-	 * thirdly drop targets are defined - this is a list of DOM nodes, the constructor works in one of two modes:
-	 * <li>without targets - objects can be picked up and dragged around, dragStart and dragStop events fire</li>
-	 * <li>with targets - as objects are dragged over targets dragOver, dragOut and DragDrop events fire
-	 * to start dragging call the DragDrop.pickup_handler() function, dragging stops when the mouse is released.
-	 * @constructor
-	 * The following options are supported
-	 * <dt>targetSelector</dt>
-	 *   <dd>an argument passed directly to jquery to create a list of targets, as such it can be a CSS style selector, or an array of DOM nodes<br>if target selector is null the DragDrop does Drag only and will not fire dragOver dragOut and dragDrop events</dd>
-	 * <dt>pickupSelector</dt>
-	 *   <dd>a jquery selector. The pickup_handler is automatically bound to matched elements (eg clicking on these elements starts the drag). if pickupSelector is null, the pickup_handler must be manually bound <code>$(el).bind("mousedown", dragdrop.pickup_handler)</code></dd>
-	 * <dt>dragObj</dt>
-	 *   <dd>the jQuery element to drag around when pickup is called. If not defined, dragObj must be set in onDragStart</dd>
-	 * <dt>draggingClass</dt>
-	 *   <dd>the class(es) added to items when they are being dragged</dd>
-	 * The following observables are supported
-	 * <dt>dragStart</dt>
-	 *   <dd>a callback when start to drag<br><code>function(jEv)</code></dd>
-	 * <dt>dragOver</dt>
-	 *   <dd>a callback when we drag into a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragOut</dt>
-	 *   <dd>a callback when we drag out of a target, or when we drop over a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragDrop</dt>
-	 *   <dd>a callback when we drop on a target<br><code>function(jEl)</code></dd>
-	 * <dt>dragStop</dt>
-	 *   <dd>a callback when we stop dragging<br><code>function(jEv)</code></dd>
-	 */
-	ux.DragDrop = ux.Observable.extend({
-		defaults : {
-			targetsSelector : null,
-			pickupSelector:   null,
-			dragObj :         null,
-			draggingClass :   "dragging"
-		},
-
-		init: function(options) {
-			this._super(); // call the class initialiser
-		
-			this.drag_handler = this.drag.bind(this);
-			this.drop_handler = this.drop.bind(this);
-			this.pickup_handler = this.pickup.bind(this);
-			this.targets = [];
-			this.dragObj = null;
-			this.dragObjOffset = null;
-			this.currentTarget = null;
-			if(this.config.pickupSelector) {
-				$(this.config.pickupSelector).bind("mousedown", this.pickup_handler);
-			}
-		},
-
-		drag : function(jEv) {
-			jEv.preventDefault();
-			var mloc = acx.vector( this.lockX || jEv.pageX, this.lockY || jEv.pageY );
-			this.dragObj.css(mloc.add(this.dragObjOffset).asOffset());
-			if(this.targets.length === 0) {
-				return;
-			}
-			if(this.currentTarget !== null && mloc.within(this.currentTarget[1], this.currentTarget[2])) {
-				return;
-			}
-			if(this.currentTarget !== null) {
-				this.fire('dragOut', this.currentTarget[0]);
-				this.currentTarget = null;
-			}
-			for(var i = 0; i < this.targets.length; i++) {
-				if(mloc.within(this.targets[i][1], this.targets[i][2])) {
-					this.currentTarget = this.targets[i];
-					break;
-				}
-			}
-			if(this.currentTarget !== null) {
-				this.fire('dragOver', this.currentTarget[0]);
-			}
-		},
-		
-		drop : function(jEv) {
-			$(document).unbind("mousemove", this.drag_handler);
-			$(document).unbind("mouseup", this.drop_handler);
-			this.dragObj.removeClass(this.config.draggingClass);
-			if(this.currentTarget !== null) {
-				this.fire('dragOut', this.currentTarget[0]);
-				this.fire('dragDrop', this.currentTarget[0]);
-			}
-			this.fire('dragStop', jEv);
-			this.dragObj = null;
-		},
-		
-		pickup : function(jEv, opts) {
-			$.extend(this.config, opts);
-			this.fire('dragStart', jEv);
-			this.dragObj = this.dragObj || this.config.dragObj;
-			this.dragObjOffset = this.config.dragObjOffset || acx.vector(this.dragObj.offset()).sub(jEv.pageX, jEv.pageY);
-			this.lockX = this.config.lockX ? jEv.pageX : 0;
-			this.lockY = this.config.lockY ? jEv.pageY : 0;
-			this.dragObj.addClass(this.config.draggingClass);
-			if(!this.dragObj.get(0).parentNode || this.dragObj.get(0).parentNode.nodeType === 11) { // 11 = document fragment
-				$(document.body).append(this.dragObj);
-			}
-			if(this.config.targetsSelector) {
-				this.currentTarget = null;
-				var targets = ( this.targets = [] );
-				// create an array of elements optimised for rapid collision detection calculation
-				$(this.config.targetsSelector).each(function(i, el) {
-					var jEl = $(el);
-					var tl = acx.vector(jEl.offset());
-					var br = tl.add(jEl.width(), jEl.height());
-					targets.push([jEl, tl, br]);
-				});
-			}
-			$(document).bind("mousemove", this.drag_handler);
-			$(document).bind("mouseup", this.drop_handler);
-			this.drag_handler(jEv);
-		}
-	});
-
-})( this.jQuery, this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/fieldCollection.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/fieldCollection.js
deleted file mode 100644
index 01ced60ca..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/fieldCollection.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	ux.FieldCollection = ux.Observable.extend({
-		defaults: {
-			fields: []	// the collection of fields
-		},
-		init: function() {
-			this._super();
-			this.fields = this.config.fields;
-		},
-		validate: function() {
-			return this.fields.reduce(function(r, field) {
-				return r && field.validate();
-			}, true);
-		},
-		getData: function(type) {
-			return this.fields.reduce(function(r, field) {
-				r[field.name] = field.val(); return r;
-			}, {});
-		}
-	});
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/observable.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/observable.js
deleted file mode 100644
index 16368512c..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/observable.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	ux.Observable = ux.Class.extend((function() {
-		return {
-			init: function() {
-				this.observers = {};
-				for( var opt in this.config ) { // automatically install observers that are defined in the configuration
-					if( opt.indexOf( 'on' ) === 0 ) {
-						this.on( opt.substring(2) , this.config[ opt ] );
-					}
-				}
-			},
-			_getObs: function( type ) {
-				return ( this.observers[ type.toLowerCase() ] || ( this.observers[ type.toLowerCase() ] = [] ) );
-			},
-			on: function( type, fn, params, thisp ) {
-				this._getObs( type ).push( { "cb" : fn, "args" : params || [] , "cx" : thisp || this } );
-				return this;
-			},
-			fire: function( type ) {
-				var params = Array.prototype.slice.call( arguments, 1 );
-				this._getObs( type ).slice().forEach( function( ob ) {
-					ob["cb"].apply( ob["cx"], ob["args"].concat( params ) );
-				} );
-				return this;
-			},
-			removeAllObservers: function() {
-				this.observers = {};
-			},
-			removeObserver: function( type, fn ) {
-				var obs = this._getObs( type ),
-					index = obs.reduce( function(p, t, i) { return (t.cb === fn) ? i : p; }, -1 );
-				if(index !== -1) {
-					obs.splice( index, 1 );
-				}
-				return this; // make observable functions chainable
-			},
-			hasObserver: function( type ) {
-				return !! this._getObs( type ).length;
-			}
-		};
-	})());
-
-})( this.app );
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singleton.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singleton.js
deleted file mode 100644
index 16dabaf87..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singleton.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ux = app.ns("ux");
-
-	var extend = ux.Observable.extend;
-	var instance = function() {
-		if( ! ("me" in this) ) {
-			this.me = new this();
-		}
-		return this.me;
-	};
-
-	ux.Singleton = ux.Observable.extend({});
-
-	ux.Singleton.extend = function() {
-		var Self = extend.apply( this, arguments );
-		Self.instance = instance;
-		return Self;
-	};
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singletonSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singletonSpec.js
deleted file mode 100644
index 7a137094a..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/singletonSpec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.ux.singleton", function(){
-
-var Singleton = window.app.ux.Singleton;
-
-	describe("creating a singleton", function() {
-		var X = Singleton.extend({
-			foo: function() {
-				return "bar";
-			}
-		});
-
-		var Y = Singleton.extend({
-			bar: function() {
-				return "baz";
-			}
-		});
-
-		it("should have properties like a normal class", function() {
-			var a = X.instance();
-
-			expect( a instanceof X ).toBe( true );
-			expect( a.foo() ).toBe( "bar" );
-		});
-
-		it("should return single instance each time instance() is called", function() {
-			var a = X.instance();
-			var b = X.instance();
-
-			expect( a ).toBe( b );
-		});
-
-		it("should not share instances with different singletons", function() {
-			var a = X.instance();
-			var c = Y.instance();
-
-			expect( a ).not.toBe( c );
-		});
-
-	});
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/table.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/table.css
deleted file mode 100644
index 7d829c4ce..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/table.css
+++ /dev/null
@@ -1,20 +0,0 @@
-TABLE.table {
-	border-collapse: collapse;
-}
-
-
-TABLE.table TH {
-	font-weight: normal;
-	text-align: left;
-	vertical-align: middle;
-}
-
-TABLE.table TBODY.striped TR:nth-child(odd) {
-	background: #eee;
-}
-
-TABLE.table H3 {
-	margin: 0;
-	font-weight: bold;
-	font-size: 140%;
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templateSpec.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templateSpec.js
deleted file mode 100644
index e75b80686..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templateSpec.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-describe("app.ut.byteSize_template", function() {
-
-	describe("byteSize_template()", function() {
-		var byteSize_template = window.app.ut.byteSize_template;
-
-		it("should postfix with a B and have not decimal for number less than 1000", function() {
-			expect( byteSize_template( 0 ) ).toBe( "0B" );
-			expect( byteSize_template( 1 ) ).toBe( "1B" );
-			expect( byteSize_template( 10 ) ).toBe( "10B" );
-			expect( byteSize_template( 100 ) ).toBe( "100B" );
-			expect( byteSize_template( 999 ) ).toBe( "999B" );
-		});
-
-		it("should have 0.xxX for values between 1000 and 1023", function() {
-			expect( byteSize_template( 1000  ) ).toBe( "0.98ki" );
-			expect( byteSize_template( 1024 * 1000 ) ).toBe( "0.98Mi" );
-		});
-
-		it("should always have three significant digits", function() {
-			expect( byteSize_template( 1023  ) ).toBe( "1.00ki" );
-			expect( byteSize_template( 1024  ) ).toBe( "1.00ki" );
-			expect( byteSize_template( 1025  ) ).toBe( "1.00ki" );
-			expect( byteSize_template( 1024 * 5 ) ).toBe( "5.00ki" );
-			expect( byteSize_template( 1024 * 55 ) ).toBe( "55.0ki" );
-			expect( byteSize_template( 1024 * 555 ) ).toBe( "555ki" );
-		});
-
-		it("should have the correct postfix", function() {
-			expect( byteSize_template( 3 * Math.pow( 1024, 1) ) ).toBe( "3.00ki" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 2) ) ).toBe( "3.00Mi" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 3) ) ).toBe( "3.00Gi" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 4) ) ).toBe( "3.00Ti" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 5) ) ).toBe( "3.00Pi" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 6) ) ).toBe( "3.00Ei" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 7) ) ).toBe( "3.00Zi" );
-			expect( byteSize_template( 3 * Math.pow( 1024, 8) ) ).toBe( "3.00Yi" );
-		});
-
-		it("should show an overflow for stupidly big numbers", function() {
-			expect( byteSize_template( 3 * Math.pow( 1024, 10) ) ).toBe( "3.00..E" );
-		});
-	});
-
-	describe("count_template()", function() {
-		var count_template = window.app.ut.count_template;
-
-		it("should not postfix and not decimal for number less than 1000", function() {
-			expect( count_template( 0 ) ).toBe( "0" );
-			expect( count_template( 1 ) ).toBe( "1" );
-			expect( count_template( 10 ) ).toBe( "10" );
-			expect( count_template( 100 ) ).toBe( "100" );
-			expect( count_template( 999 ) ).toBe( "999" );
-		});
-
-		it("should always have three significant digits", function() {
-			expect( count_template( 1000  ) ).toBe( "1.00k" );
-			expect( count_template( 1005  ) ).toBe( "1.00k" );
-			expect( count_template( 1055  ) ).toBe( "1.05k" );
-			expect( count_template( 1000 * 5 ) ).toBe( "5.00k" );
-			expect( count_template( 1000 * 55 ) ).toBe( "55.0k" );
-			expect( count_template( 1000 * 555 ) ).toBe( "555k" );
-		});
-
-		it("should have the correct postfix", function() {
-			expect( count_template( 3 * Math.pow( 1000, 1) ) ).toBe( "3.00k" );
-			expect( count_template( 3 * Math.pow( 1000, 2) ) ).toBe( "3.00M" );
-			expect( count_template( 3 * Math.pow( 1000, 3) ) ).toBe( "3.00G" );
-			expect( count_template( 3 * Math.pow( 1000, 4) ) ).toBe( "3.00T" );
-			expect( count_template( 3 * Math.pow( 1000, 5) ) ).toBe( "3.00P" );
-			expect( count_template( 3 * Math.pow( 1000, 6) ) ).toBe( "3.00E" );
-			expect( count_template( 3 * Math.pow( 1000, 7) ) ).toBe( "3.00Z" );
-			expect( count_template( 3 * Math.pow( 1000, 8) ) ).toBe( "3.00Y" );
-		});
-
-		it("should show an overflow for stupidly big numbers", function() {
-			expect( count_template( 3 * Math.pow( 1000, 10) ) ).toBe( "3.00..E" );
-		});
-	});
-
-
-});
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templates.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templates.js
deleted file mode 100644
index 8c1138499..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/app/ux/templates/templates.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function( app ) {
-
-	var ut = app.ns("ut");
-
-	ut.option_template = function(v) { return { tag: "OPTION", value: v, text: v }; };
-
-	ut.require_template = function(f) { return f.require ? { tag: "SPAN", cls: "require", text: "*" } : null; };
-
-
-	var sib_prefix = ['B','ki','Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'];
-
-	ut.byteSize_template = function(n) {
-		var i = 0;
-		while( n >= 1000 ) {
-			i++;
-			n /= 1024;
-		}
-		return (i === 0 ? n.toString() : n.toFixed( 3 - parseInt(n,10).toString().length )) + ( sib_prefix[ i ] || "..E" );
-	};
-
-	var sid_prefix = ['','k','M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
-
-	ut.count_template = function(n) {
-		var i = 0;
-		while( n >= 1000 ) {
-			i++;
-			n /= 1000;
-		}
-		return i === 0 ? n.toString() : ( n.toFixed( 3 - parseInt(n,10).toString().length ) + ( sid_prefix[ i ] || "..E" ) );
-	};
-
-})( this.app );
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/dateRangeParser/date-range-parser.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/dateRangeParser/date-range-parser.js
deleted file mode 100644
index 4b4796cfd..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/dateRangeParser/date-range-parser.js
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-/*!
- * date-range-parser.js
- * Contributed to the Apache Software Foundation by:
- *    Ben Birch - Aconex
- * fork me at https://github.com/mobz/date-range-parser
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-
-*/
-
-(function() {
-
-	var drp = window.dateRangeParser = {};
-
-	drp.defaultRange = 1000 * 60 * 60 * 24;
-
-	drp.now = null; // set a different value for now than the time at function invocation
-
-	drp.parse = function(v) {
-		try {
-			var r = drp._parse(v);
-			r.end && r.end--; // remove 1 millisecond from the final end range
-		} catch(e) {
-			r = null;
-		}
-		return r;
-	};
-
-	drp.print = function(t, p) {
-		var format = ["", "-", "-", " ", ":", ":", "."];
-		var da = makeArray(t);
-		var str = "";
-		for(var i = 0; i <= p; i++) {
-			str += format[i] + (da[i] < 10 ? "0" : "") + da[i];
-		}
-		return str;
-	};
-
-	(function() {
-		drp._relTokens = {};
-
-		var values = {
-			"yr"  : 365*24*60*60*1000,
-			"mon" : 31*24*60*60*1000,
-			"day" : 24*60*60*1000,
-			"hr"  : 60*60*1000,
-			"min" : 60*1000,
-			"sec" : 1000
-		};
-
-		var alias_lu = {
-			"yr" : "y,yr,yrs,year,years",
-			"mon" : "mo,mon,mos,mons,month,months",
-			"day" : "d,dy,dys,day,days",
-			"hr" : "h,hr,hrs,hour,hours",
-			"min" : "m,min,mins,minute,minutes",
-			"sec" : "s,sec,secs,second,seconds"
-		};
-
-		for(var key in alias_lu) {
-			if(alias_lu.hasOwnProperty(key)) {
-				var aliases = alias_lu[key].split(",");
-				for(var i = 0; i < aliases.length; i++) {
-					drp._relTokens[aliases[i]] = values[key];
-				}
-			}
-		}
-	})();
-
-	function makeArray(d) {
-		var da = new Date(d);
-		return [ da.getUTCFullYear(), da.getUTCMonth()+1, da.getUTCDate(), da.getUTCHours(), da.getUTCMinutes(), da.getUTCSeconds(), da.getUTCMilliseconds() ];
-	}
-
-	function fromArray(a) {
-		var d = [].concat(a); d[1]--;
-		return Date.UTC.apply(null, d);
-	}
-
-	drp._parse = function parse(v) {
-		var now = this.now || new Date().getTime();
-
-		function precArray(d, p, offset) {
-			var tn = makeArray(d);
-			tn[p] += offset || 0;
-			for(var i = p+1; i < 7; i++) {
-				tn[i] = i < 3 ? 1 : 0;
-			}
-			return tn;
-		}
-		function makePrecRange(dt, p, r) {
-			var ret = { };
-			ret.start = fromArray(dt);
-			dt[p] += r || 1;
-			ret.end = fromArray(dt);
-			return ret;
-		}
-		function procTerm(term) {
-			var m = term.replace(/\s/g, "").toLowerCase().match(/^([a-z ]+)$|^([ 0-9:-]+)$|^(\d+[a-z]+)$/);
-			if(m[1]) {	// matches ([a-z ]+)
-				function dra(p, o, r) {
-					var dt = precArray(now, p, o);
-					if(r) {
-						dt[2] -= new Date(fromArray(dt)).getUTCDay();
-					}
-					return makePrecRange(dt, p, r);
-				}
-				switch( m[1]) {
-					case "now" : return { start: now, end: now, now: now };
-					case "today" : return dra( 2, 0 );
-					case "thisweek" : return dra( 2, 0, 7 );
-					case "thismonth" : return dra( 1, 0 );
-					case "thisyear" : return dra( 0, 0 );
-					case "yesterday" : return dra( 2, -1 );
-					case "lastweek" : return dra( 2, -7, 7 );
-					case "lastmonth" : return dra( 1, -1 );
-					case "lastyear" : return dra( 0, -1 );
-					case "tomorrow" : return dra( 2, 1 );
-					case "nextweek" : return dra( 2, 7, 7 );
-					case "nextmonth" : return dra( 1, 1 );
-					case "nextyear" : return dra(0, 1 );
-				}
-				throw "unknown token " +  m[1];
-			} else if(m[2]) { // matches ([ 0-9:-]+)
-				dn = makeArray(now);
-				var dt = m[2].match(/^(?:(\d{4})(?:\-(\d\d))?(?:\-(\d\d))?)? ?(?:(\d{1,2})(?:\:(\d\d)(?:\:(\d\d))?)?)?$/);
-				dt.shift();
-				for(var p = 0, z = false, i = 0; i < 7; i++) {
-					if(dt[i]) {
-						dn[i] = parseInt(dt[i], 10);
-						p = i;
-						z = true;
-					} else {
-						if(z)
-							dn[i] = i < 3 ? 1 : 0;
-					}
-				}
-				return makePrecRange(dn, p);
-			} else if(m[3]) { // matches (\d+[a-z]{1,4})
-				var dr = m[3].match(/(\d+)\s*([a-z]+)/i);
-				var n = parseInt(dr[1], 10);
-				return { rel: n * drp._relTokens[dr[2]] };
-			}
-			throw "unknown term " + term;
-		}
-
-		if(!v) {
-			return { start: null, end: null };
-		}
-		var terms = v.split(/\s*([^<>]*[^<>-])?\s*(->|<>|<)?\s*([^<>]+)?\s*/);
-
-		var term1 = terms[1] ? procTerm(terms[1]) : null;
-		var op = terms[2] || "";
-		var term2 = terms[3] ? procTerm(terms[3]) : null;
-
-		if(op === "<" || op === "->" ) {
-			if(term1 && !term2) {
-				return { start: term1.start, end: null };
-			} else if(!term1 && term2) {
-				return { start: null, end: term2.end };
-			} else {
-				if(term2.rel) {
-					return { start: term1.start, end: term1.end + term2.rel };
-				} else if(term1.rel) {
-					return { start: term2.start - term1.rel, end: term2.end };
-				} else {
-					return { start: term1.start, end: term2.end };
-				}
-			}
-		} else if(op === "<>") {
-			if(!term2) {
-				return { start: term1.start - drp.defaultRange, end: term1.end + drp.defaultRange }
-			} else {
-				if(! ("rel" in term2)) throw "second term did not hav a range";
-				return { start: term1.start - term2.rel, end: term1.end + term2.rel };
-			}
-		} else {
-			if(term1.rel) {
-				return { start: now - term1.rel, end: now + term1.rel };
-			} else if(term1.now) {
-				return { start: term1.now - drp.defaultRange, end: term1.now + drp.defaultRange };
-			} else {
-				return { start: term1.start, end: term1.end };
-			}
-		}
-		throw "could not process value " + v;
-	};
-})();
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.css
deleted file mode 100644
index be7e15cb3..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.css
+++ /dev/null
@@ -1,1338 +0,0 @@
-/*!
- *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('fonts/fontawesome-webfont.eot?v=4.0.3');
-  src: url('fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.fa {
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-/* makes the font 33% larger relative to the icon container */
-.fa-lg {
-  font-size: 1.3333333333333333em;
-  line-height: 0.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.2857142857142858em;
-  text-align: center;
-}
-.fa-ul {
-  padding-left: 0;
-  margin-left: 2.142857142857143em;
-  list-style-type: none;
-}
-.fa-ul > li {
-  position: relative;
-}
-.fa-li {
-  position: absolute;
-  left: -2.142857142857143em;
-  width: 2.142857142857143em;
-  top: 0.14285714285714285em;
-  text-align: center;
-}
-.fa-li.fa-lg {
-  left: -1.8571428571428572em;
-}
-.fa-border {
-  padding: .2em .25em .15em;
-  border: solid 0.08em #eeeeee;
-  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: spin 2s infinite linear;
-  -moz-animation: spin 2s infinite linear;
-  -o-animation: spin 2s infinite linear;
-  animation: spin 2s infinite linear;
-}
-@-moz-keyframes spin {
-  0% {
-    -moz-transform: rotate(0deg);
-  }
-  100% {
-    -moz-transform: rotate(359deg);
-  }
-}
-@-webkit-keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-  }
-}
-@-o-keyframes spin {
-  0% {
-    -o-transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-  }
-}
-@-ms-keyframes spin {
-  0% {
-    -ms-transform: rotate(0deg);
-  }
-  100% {
-    -ms-transform: rotate(359deg);
-  }
-}
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(359deg);
-  }
-}
-.fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-.fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-.fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
-.fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
-  -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  -o-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);
-  -moz-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-.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: #ffffff;
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-   readers do not read off random characters that represent icons */
-.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-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-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 {
-  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: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-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-asc:before {
-  content: "\f0dd";
-}
-.fa-sort-up:before,
-.fa-sort-desc: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-reply-all:before {
-  content: "\f122";
-}
-.fa-mail-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 {
-  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";
-}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.min.css b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.min.css
deleted file mode 100644
index 449d6ac55..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/css/font-awesome.min.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- *  Font Awesome 4.0.3 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.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;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.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.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:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-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);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.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-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-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{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: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-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-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc: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-reply-all:before{content:"\f122"}.fa-mail-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{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"}
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/FontAwesome.otf b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/FontAwesome.otf
deleted file mode 100644
index 8b0f54e47..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/FontAwesome.otf
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.eot b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.eot
deleted file mode 100755
index 7c79c6a6b..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.eot
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.svg b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.svg
deleted file mode 100755
index 45fdf3383..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="1792" />
-<glyph unicode="&#xf198;" horiz-adv-x="1792" />
-<glyph unicode="&#xf199;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf
deleted file mode 100755
index e89738de5..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.ttf
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.woff b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.woff
deleted file mode 100755
index 8c1748aab..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/font-awesome/fonts/fontawesome-webfont.woff
+++ /dev/null
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/graphael/g.raphael.standalone.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/graphael/g.raphael.standalone.js
deleted file mode 100644
index f1eadb867..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/graphael/g.raphael.standalone.js
+++ /dev/null
@@ -1,5220 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-/*!
- * Raphael 1.5.2 - JavaScript Vector Library
- *
- * Copyright (c) 2010 Dmitry Baranovskiy (http://raphaeljs.com)
- * Licensed under the MIT (http://raphaeljs.com/license.html) license.
- * from fork at git@github.com:mobz/g.raphael.git
- */
-(function () {
-    function R() {
-        if (R.is(arguments[0], array)) {
-            var a = arguments[0],
-                cnv = create[apply](R, a.splice(0, 3 + R.is(a[0], nu))),
-                res = cnv.set();
-            for (var i = 0, ii = a[length]; i < ii; i++) {
-                var j = a[i] || {};
-                elements[has](j.type) && res[push](cnv[j.type]().attr(j));
-            }
-            return res;
-        }
-        return create[apply](R, arguments);
-    }
-    R.version = "1.5.2";
-    var separator = /[, ]+/,
-        elements = {circle: 1, rect: 1, path: 1, ellipse: 1, text: 1, image: 1},
-        formatrg = /\{(\d+)\}/g,
-        proto = "prototype",
-        has = "hasOwnProperty",
-        doc = document,
-        win = window,
-        oldRaphael = {
-            was: Object[proto][has].call(win, "Raphael"),
-            is: win.Raphael
-        },
-        Paper = function () {
-            this.customAttributes = {};
-        },
-        paperproto,
-        appendChild = "appendChild",
-        apply = "apply",
-        concat = "concat",
-        supportsTouch = "createTouch" in doc,
-        E = "",
-        S = " ",
-        Str = String,
-        split = "split",
-        events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend"[split](S),
-        touchMap = {
-            mousedown: "touchstart",
-            mousemove: "touchmove",
-            mouseup: "touchend"
-        },
-        join = "join",
-        length = "length",
-        lowerCase = Str[proto].toLowerCase,
-        math = Math,
-        mmax = math.max,
-        mmin = math.min,
-        abs = math.abs,
-        pow = math.pow,
-        PI = math.PI,
-        nu = "number",
-        string = "string",
-        array = "array",
-        toString = "toString",
-        fillString = "fill",
-        objectToString = Object[proto][toString],
-        paper = {},
-        push = "push",
-        ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i,
-        colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,
-        isnan = {"NaN": 1, "Infinity": 1, "-Infinity": 1},
-        bezierrg = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,
-        round = math.round,
-        setAttribute = "setAttribute",
-        toFloat = parseFloat,
-        toInt = parseInt,
-        ms = " progid:DXImageTransform.Microsoft",
-        upperCase = Str[proto].toUpperCase,
-        availableAttrs = {blur: 0, "clip-rect": "0 0 1e9 1e9", cursor: "default", cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", opacity: 1, path: "M0,0", r: 0, rotation: 0, rx: 0, ry: 0, scale: "1 1", src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", translation: "0 0", width: 0, x: 0, y: 0},
-        availableAnimAttrs = {along: "along", blur: nu, "clip-rect": "csv", cx: nu, cy: nu, fill: "colour", "fill-opacity": nu, "font-size": nu, height: nu, opacity: nu, path: "path", r: nu, rotation: "csv", rx: nu, ry: nu, scale: "csv", stroke: "colour", "stroke-opacity": nu, "stroke-width": nu, translation: "csv", width: nu, x: nu, y: nu},
-        rp = "replace",
-        animKeyFrames= /^(from|to|\d+%?)$/,
-        commaSpaces = /\s*,\s*/,
-        hsrg = {hs: 1, rg: 1},
-        p2s = /,?([achlmqrstvxz]),?/gi,
-        pathCommand = /([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,
-        pathValues = /(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,
-        radial_gradient = /^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/,
-        sortByKey = function (a, b) {
-            return a.key - b.key;
-        };
-
-    R.type = (win.SVGAngle || doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
-    if (R.type == "VML") {
-        var d = doc.createElement("div"),
-            b;
-        d.innerHTML = '<v:shape adj="1"/>';
-        b = d.firstChild;
-        b.style.behavior = "url(#default#VML)";
-        if (!(b && typeof b.adj == "object")) {
-            return R.type = null;
-        }
-        d = null;
-    }
-    R.svg = !(R.vml = R.type == "VML");
-    Paper[proto] = R[proto];
-    paperproto = Paper[proto];
-    R._id = 0;
-    R._oid = 0;
-    R.fn = {};
-    R.is = function (o, type) {
-        type = lowerCase.call(type);
-        if (type == "finite") {
-            return !isnan[has](+o);
-        }
-        return  (type == "null" && o === null) ||
-                (type == typeof o) ||
-                (type == "object" && o === Object(o)) ||
-                (type == "array" && Array.isArray && Array.isArray(o)) ||
-                objectToString.call(o).slice(8, -1).toLowerCase() == type;
-    };
-    R.angle = function (x1, y1, x2, y2, x3, y3) {
-        if (x3 == null) {
-            var x = x1 - x2,
-                y = y1 - y2;
-            if (!x && !y) {
-                return 0;
-            }
-            return ((x < 0) * 180 + math.atan(-y / -x) * 180 / PI + 360) % 360;
-        } else {
-            return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3);
-        }
-    };
-    R.rad = function (deg) {
-        return deg % 360 * PI / 180;
-    };
-    R.deg = function (rad) {
-        return rad * 180 / PI % 360;
-    };
-    R.snapTo = function (values, value, tolerance) {
-        tolerance = R.is(tolerance, "finite") ? tolerance : 10;
-        if (R.is(values, array)) {
-            var i = values.length;
-            while (i--) if (abs(values[i] - value) <= tolerance) {
-                return values[i];
-            }
-        } else {
-            values = +values;
-            var rem = value % values;
-            if (rem < tolerance) {
-                return value - rem;
-            }
-            if (rem > values - tolerance) {
-                return value - rem + values;
-            }
-        }
-        return value;
-    };
-    function createUUID() {
-        // http://www.ietf.org/rfc/rfc4122.txt
-        var s = [],
-            i = 0;
-        for (; i < 32; i++) {
-            s[i] = (~~(math.random() * 16))[toString](16);
-        }
-        s[12] = 4;  // bits 12-15 of the time_hi_and_version field to 0010
-        s[16] = ((s[16] & 3) | 8)[toString](16);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
-        return "r-" + s[join]("");
-    }
-
-    R.setWindow = function (newwin) {
-        win = newwin;
-        doc = win.document;
-    };
-    // colour utilities
-    var toHex = function (color) {
-        if (R.vml) {
-            // http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
-            var trim = /^\s+|\s+$/g;
-            var bod;
-            try {
-                var docum = new ActiveXObject("htmlfile");
-                docum.write("<body>");
-                docum.close();
-                bod = docum.body;
-            } catch(e) {
-                bod = createPopup().document.body;
-            }
-            var range = bod.createTextRange();
-            toHex = cacher(function (color) {
-                try {
-                    bod.style.color = Str(color)[rp](trim, E);
-                    var value = range.queryCommandValue("ForeColor");
-                    value = ((value & 255) << 16) | (value & 65280) | ((value & 16711680) >>> 16);
-                    return "#" + ("000000" + value[toString](16)).slice(-6);
-                } catch(e) {
-                    return "none";
-                }
-            });
-        } else {
-            var i = doc.createElement("i");
-            i.title = "Rapha\xebl Colour Picker";
-            i.style.display = "none";
-            doc.body[appendChild](i);
-            toHex = cacher(function (color) {
-                i.style.color = color;
-                return doc.defaultView.getComputedStyle(i, E).getPropertyValue("color");
-            });
-        }
-        return toHex(color);
-    },
-    hsbtoString = function () {
-        return "hsb(" + [this.h, this.s, this.b] + ")";
-    },
-    hsltoString = function () {
-        return "hsl(" + [this.h, this.s, this.l] + ")";
-    },
-    rgbtoString = function () {
-        return this.hex;
-    };
-    R.hsb2rgb = function (h, s, b, o) {
-        if (R.is(h, "object") && "h" in h && "s" in h && "b" in h) {
-            b = h.b;
-            s = h.s;
-            h = h.h;
-            o = h.o;
-        }
-        return R.hsl2rgb(h, s, b / 2, o);
-    };
-    R.hsl2rgb = function (h, s, l, o) {
-        if (R.is(h, "object") && "h" in h && "s" in h && "l" in h) {
-            l = h.l;
-            s = h.s;
-            h = h.h;
-        }
-        if (h > 1 || s > 1 || l > 1) {
-            h /= 360;
-            s /= 100;
-            l /= 100;
-        }
-        var rgb = {},
-            channels = ["r", "g", "b"],
-            t2, t1, t3, r, g, b;
-        if (!s) {
-            rgb = {
-                r: l,
-                g: l,
-                b: l
-            };
-        } else {
-            if (l < .5) {
-                t2 = l * (1 + s);
-            } else {
-                t2 = l + s - l * s;
-            }
-            t1 = 2 * l - t2;
-            for (var i = 0; i < 3; i++) {
-                t3 = h + 1 / 3 * -(i - 1);
-                t3 < 0 && t3++;
-                t3 > 1 && t3--;
-                if (t3 * 6 < 1) {
-                    rgb[channels[i]] = t1 + (t2 - t1) * 6 * t3;
-                } else if (t3 * 2 < 1) {
-                    rgb[channels[i]] = t2;
-                } else if (t3 * 3 < 2) {
-                    rgb[channels[i]] = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-                } else {
-                    rgb[channels[i]] = t1;
-                }
-            }
-        }
-        rgb.r *= 255;
-        rgb.g *= 255;
-        rgb.b *= 255;
-        rgb.hex = "#" + (16777216 | rgb.b | (rgb.g << 8) | (rgb.r << 16)).toString(16).slice(1);
-        R.is(o, "finite") && (rgb.opacity = o);
-        rgb.toString = rgbtoString;
-        return rgb;
-    };
-    R.rgb2hsb = function (red, green, blue) {
-        if (green == null && R.is(red, "object") && "r" in red && "g" in red && "b" in red) {
-            blue = red.b;
-            green = red.g;
-            red = red.r;
-        }
-        if (green == null && R.is(red, string)) {
-            var clr = R.getRGB(red);
-            red = clr.r;
-            green = clr.g;
-            blue = clr.b;
-        }
-        if (red > 1 || green > 1 || blue > 1) {
-            red /= 255;
-            green /= 255;
-            blue /= 255;
-        }
-        var max = mmax(red, green, blue),
-            min = mmin(red, green, blue),
-            hue,
-            saturation,
-            brightness = max;
-        if (min == max) {
-            return {h: 0, s: 0, b: max, toString: hsbtoString};
-        } else {
-            var delta = (max - min);
-            saturation = delta / max;
-            if (red == max) {
-                hue = (green - blue) / delta;
-            } else if (green == max) {
-                hue = 2 + ((blue - red) / delta);
-            } else {
-                hue = 4 + ((red - green) / delta);
-            }
-            hue /= 6;
-            hue < 0 && hue++;
-            hue > 1 && hue--;
-        }
-        return {h: hue, s: saturation, b: brightness, toString: hsbtoString};
-    };
-    R.rgb2hsl = function (red, green, blue) {
-        if (green == null && R.is(red, "object") && "r" in red && "g" in red && "b" in red) {
-            blue = red.b;
-            green = red.g;
-            red = red.r;
-        }
-        if (green == null && R.is(red, string)) {
-            var clr = R.getRGB(red);
-            red = clr.r;
-            green = clr.g;
-            blue = clr.b;
-        }
-        if (red > 1 || green > 1 || blue > 1) {
-            red /= 255;
-            green /= 255;
-            blue /= 255;
-        }
-        var max = mmax(red, green, blue),
-            min = mmin(red, green, blue),
-            h,
-            s,
-            l = (max + min) / 2,
-            hsl;
-        if (min == max) {
-            hsl =  {h: 0, s: 0, l: l};
-        } else {
-            var delta = max - min;
-            s = l < .5 ? delta / (max + min) : delta / (2 - max - min);
-            if (red == max) {
-                h = (green - blue) / delta;
-            } else if (green == max) {
-                h = 2 + (blue - red) / delta;
-            } else {
-                h = 4 + (red - green) / delta;
-            }
-            h /= 6;
-            h < 0 && h++;
-            h > 1 && h--;
-            hsl = {h: h, s: s, l: l};
-        }
-        hsl.toString = hsltoString;
-        return hsl;
-    };
-    R._path2string = function () {
-        return this.join(",")[rp](p2s, "$1");
-    };
-    function cacher(f, scope, postprocessor) {
-        function newf() {
-            var arg = Array[proto].slice.call(arguments, 0),
-                args = arg[join]("\u25ba"),
-                cache = newf.cache = newf.cache || {},
-                count = newf.count = newf.count || [];
-            if (cache[has](args)) {
-                return postprocessor ? postprocessor(cache[args]) : cache[args];
-            }
-            count[length] >= 1e3 && delete cache[count.shift()];
-            count[push](args);
-            cache[args] = f[apply](scope, arg);
-            return postprocessor ? postprocessor(cache[args]) : cache[args];
-        }
-        return newf;
-    }
- 
-    R.getRGB = cacher(function (colour) {
-        if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) {
-            return {r: -1, g: -1, b: -1, hex: "none", error: 1};
-        }
-        if (colour == "none") {
-            return {r: -1, g: -1, b: -1, hex: "none"};
-        }
-        !(hsrg[has](colour.toLowerCase().substring(0, 2)) || colour.charAt() == "#") && (colour = toHex(colour));
-        var res,
-            red,
-            green,
-            blue,
-            opacity,
-            t,
-            values,
-            rgb = colour.match(colourRegExp);
-        if (rgb) {
-            if (rgb[2]) {
-                blue = toInt(rgb[2].substring(5), 16);
-                green = toInt(rgb[2].substring(3, 5), 16);
-                red = toInt(rgb[2].substring(1, 3), 16);
-            }
-            if (rgb[3]) {
-                blue = toInt((t = rgb[3].charAt(3)) + t, 16);
-                green = toInt((t = rgb[3].charAt(2)) + t, 16);
-                red = toInt((t = rgb[3].charAt(1)) + t, 16);
-            }
-            if (rgb[4]) {
-                values = rgb[4][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                rgb[1].toLowerCase().slice(0, 4) == "rgba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-            }
-            if (rgb[5]) {
-                values = rgb[5][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsb2rgb(red, green, blue, opacity);
-            }
-            if (rgb[6]) {
-                values = rgb[6][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsla" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsl2rgb(red, green, blue, opacity);
-            }
-            rgb = {r: red, g: green, b: blue};
-            rgb.hex = "#" + (16777216 | blue | (green << 8) | (red << 16)).toString(16).slice(1);
-            R.is(opacity, "finite") && (rgb.opacity = opacity);
-            return rgb;
-        }
-        return {r: -1, g: -1, b: -1, hex: "none", error: 1};
-    }, R);
-    R.getColor = function (value) {
-        var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
-            rgb = this.hsb2rgb(start.h, start.s, start.b);
-        start.h += .075;
-        if (start.h > 1) {
-            start.h = 0;
-            start.s -= .2;
-            start.s <= 0 && (this.getColor.start = {h: 0, s: 1, b: start.b});
-        }
-        return rgb.hex;
-    };
-    R.getColor.reset = function () {
-        delete this.start;
-    };
-    // path utilities
-    R.parsePathString = cacher(function (pathString) {
-        if (!pathString) {
-            return null;
-        }
-        var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, q: 4, s: 4, t: 2, v: 1, z: 0},
-            data = [];
-        if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
-            data = pathClone(pathString);
-        }
-        if (!data[length]) {
-            Str(pathString)[rp](pathCommand, function (a, b, c) {
-                var params = [],
-                    name = lowerCase.call(b);
-                c[rp](pathValues, function (a, b) {
-                    b && params[push](+b);
-                });
-                if (name == "m" && params[length] > 2) {
-                    data[push]([b][concat](params.splice(0, 2)));
-                    name = "l";
-                    b = b == "m" ? "l" : "L";
-                }
-                while (params[length] >= paramCounts[name]) {
-                    data[push]([b][concat](params.splice(0, paramCounts[name])));
-                    if (!paramCounts[name]) {
-                        break;
-                    }
-                }
-            });
-        }
-        data[toString] = R._path2string;
-        return data;
-    });
-    R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-        var t1 = 1 - t,
-            x = pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
-            y = pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y,
-            mx = p1x + 2 * t * (c1x - p1x) + t * t * (c2x - 2 * c1x + p1x),
-            my = p1y + 2 * t * (c1y - p1y) + t * t * (c2y - 2 * c1y + p1y),
-            nx = c1x + 2 * t * (c2x - c1x) + t * t * (p2x - 2 * c2x + c1x),
-            ny = c1y + 2 * t * (c2y - c1y) + t * t * (p2y - 2 * c2y + c1y),
-            ax = (1 - t) * p1x + t * c1x,
-            ay = (1 - t) * p1y + t * c1y,
-            cx = (1 - t) * c2x + t * p2x,
-            cy = (1 - t) * c2y + t * p2y,
-            alpha = (90 - math.atan((mx - nx) / (my - ny)) * 180 / PI);
-        (mx > nx || my < ny) && (alpha += 180);
-        return {x: x, y: y, m: {x: mx, y: my}, n: {x: nx, y: ny}, start: {x: ax, y: ay}, end: {x: cx, y: cy}, alpha: alpha};
-    };
-    var pathDimensions = cacher(function (path) {
-        if (!path) {
-            return {x: 0, y: 0, width: 0, height: 0};
-        }
-        path = path2curve(path);
-        var x = 0, 
-            y = 0,
-            X = [],
-            Y = [],
-            p;
-        for (var i = 0, ii = path[length]; i < ii; i++) {
-            p = path[i];
-            if (p[0] == "M") {
-                x = p[1];
-                y = p[2];
-                X[push](x);
-                Y[push](y);
-            } else {
-                var dim = curveDim(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                X = X[concat](dim.min.x, dim.max.x);
-                Y = Y[concat](dim.min.y, dim.max.y);
-                x = p[5];
-                y = p[6];
-            }
-        }
-        var xmin = mmin[apply](0, X),
-            ymin = mmin[apply](0, Y);
-        return {
-            x: xmin,
-            y: ymin,
-            width: mmax[apply](0, X) - xmin,
-            height: mmax[apply](0, Y) - ymin
-        };
-    }),
-        pathClone = function (pathArray) {
-            var res = [];
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            for (var i = 0, ii = pathArray[length]; i < ii; i++) {
-                res[i] = [];
-                for (var j = 0, jj = pathArray[i][length]; j < jj; j++) {
-                    res[i][j] = pathArray[i][j];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        },
-        pathToRelative = cacher(function (pathArray) {
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = pathArray[0][1];
-                y = pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res[push](["M", x, y]);
-            }
-            for (var i = start, ii = pathArray[length]; i < ii; i++) {
-                var r = res[i] = [],
-                    pa = pathArray[i];
-                if (pa[0] != lowerCase.call(pa[0])) {
-                    r[0] = lowerCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "a":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] - x).toFixed(3);
-                            r[7] = +(pa[7] - y).toFixed(3);
-                            break;
-                        case "v":
-                            r[1] = +(pa[1] - y).toFixed(3);
-                            break;
-                        case "m":
-                            mx = pa[1];
-                            my = pa[2];
-                        default:
-                            for (var j = 1, jj = pa[length]; j < jj; j++) {
-                                r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
-                            }
-                    }
-                } else {
-                    r = res[i] = [];
-                    if (pa[0] == "m") {
-                        mx = pa[1] + x;
-                        my = pa[2] + y;
-                    }
-                    for (var k = 0, kk = pa[length]; k < kk; k++) {
-                        res[i][k] = pa[k];
-                    }
-                }
-                var len = res[i][length];
-                switch (res[i][0]) {
-                    case "z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "h":
-                        x += +res[i][len - 1];
-                        break;
-                    case "v":
-                        y += +res[i][len - 1];
-                        break;
-                    default:
-                        x += +res[i][len - 2];
-                        y += +res[i][len - 1];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        }, 0, pathClone),
-        pathToAbsolute = cacher(function (pathArray) {
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = +pathArray[0][1];
-                y = +pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res[0] = ["M", x, y];
-            }
-            for (var i = start, ii = pathArray[length]; i < ii; i++) {
-                var r = res[i] = [],
-                    pa = pathArray[i];
-                if (pa[0] != upperCase.call(pa[0])) {
-                    r[0] = upperCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "A":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] + x);
-                            r[7] = +(pa[7] + y);
-                            break;
-                        case "V":
-                            r[1] = +pa[1] + y;
-                            break;
-                        case "H":
-                            r[1] = +pa[1] + x;
-                            break;
-                        case "M":
-                            mx = +pa[1] + x;
-                            my = +pa[2] + y;
-                        default:
-                            for (var j = 1, jj = pa[length]; j < jj; j++) {
-                                r[j] = +pa[j] + ((j % 2) ? x : y);
-                            }
-                    }
-                } else {
-                    for (var k = 0, kk = pa[length]; k < kk; k++) {
-                        res[i][k] = pa[k];
-                    }
-                }
-                switch (r[0]) {
-                    case "Z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "H":
-                        x = r[1];
-                        break;
-                    case "V":
-                        y = r[1];
-                        break;
-                    case "M":
-                        mx = res[i][res[i][length] - 2];
-                        my = res[i][res[i][length] - 1];
-                    default:
-                        x = res[i][res[i][length] - 2];
-                        y = res[i][res[i][length] - 1];
-                }
-            }
-            res[toString] = R._path2string;
-            return res;
-        }, null, pathClone),
-        l2c = function (x1, y1, x2, y2) {
-            return [x1, y1, x2, y2, x2, y2];
-        },
-        q2c = function (x1, y1, ax, ay, x2, y2) {
-            var _13 = 1 / 3,
-                _23 = 2 / 3;
-            return [
-                    _13 * x1 + _23 * ax,
-                    _13 * y1 + _23 * ay,
-                    _13 * x2 + _23 * ax,
-                    _13 * y2 + _23 * ay,
-                    x2,
-                    y2
-                ];
-        },
-        a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
-            // for more information of where this math came from visit:
-            // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
-            var _120 = PI * 120 / 180,
-                rad = PI / 180 * (+angle || 0),
-                res = [],
-                xy,
-                rotate = cacher(function (x, y, rad) {
-                    var X = x * math.cos(rad) - y * math.sin(rad),
-                        Y = x * math.sin(rad) + y * math.cos(rad);
-                    return {x: X, y: Y};
-                });
-            if (!recursive) {
-                xy = rotate(x1, y1, -rad);
-                x1 = xy.x;
-                y1 = xy.y;
-                xy = rotate(x2, y2, -rad);
-                x2 = xy.x;
-                y2 = xy.y;
-                var cos = math.cos(PI / 180 * angle),
-                    sin = math.sin(PI / 180 * angle),
-                    x = (x1 - x2) / 2,
-                    y = (y1 - y2) / 2;
-                var h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
-                if (h > 1) {
-                    h = math.sqrt(h);
-                    rx = h * rx;
-                    ry = h * ry;
-                }
-                var rx2 = rx * rx,
-                    ry2 = ry * ry,
-                    k = (large_arc_flag == sweep_flag ? -1 : 1) *
-                        math.sqrt(abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
-                    cx = k * rx * y / ry + (x1 + x2) / 2,
-                    cy = k * -ry * x / rx + (y1 + y2) / 2,
-                    f1 = math.asin(((y1 - cy) / ry).toFixed(9)),
-                    f2 = math.asin(((y2 - cy) / ry).toFixed(9));
-
-                f1 = x1 < cx ? PI - f1 : f1;
-                f2 = x2 < cx ? PI - f2 : f2;
-                f1 < 0 && (f1 = PI * 2 + f1);
-                f2 < 0 && (f2 = PI * 2 + f2);
-                if (sweep_flag && f1 > f2) {
-                    f1 = f1 - PI * 2;
-                }
-                if (!sweep_flag && f2 > f1) {
-                    f2 = f2 - PI * 2;
-                }
-            } else {
-                f1 = recursive[0];
-                f2 = recursive[1];
-                cx = recursive[2];
-                cy = recursive[3];
-            }
-            var df = f2 - f1;
-            if (abs(df) > _120) {
-                var f2old = f2,
-                    x2old = x2,
-                    y2old = y2;
-                f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
-                x2 = cx + rx * math.cos(f2);
-                y2 = cy + ry * math.sin(f2);
-                res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
-            }
-            df = f2 - f1;
-            var c1 = math.cos(f1),
-                s1 = math.sin(f1),
-                c2 = math.cos(f2),
-                s2 = math.sin(f2),
-                t = math.tan(df / 4),
-                hx = 4 / 3 * rx * t,
-                hy = 4 / 3 * ry * t,
-                m1 = [x1, y1],
-                m2 = [x1 + hx * s1, y1 - hy * c1],
-                m3 = [x2 + hx * s2, y2 - hy * c2],
-                m4 = [x2, y2];
-            m2[0] = 2 * m1[0] - m2[0];
-            m2[1] = 2 * m1[1] - m2[1];
-            if (recursive) {
-                return [m2, m3, m4][concat](res);
-            } else {
-                res = [m2, m3, m4][concat](res)[join]()[split](",");
-                var newres = [];
-                for (var i = 0, ii = res[length]; i < ii; i++) {
-                    newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
-                }
-                return newres;
-            }
-        },
-        findDotAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-            var t1 = 1 - t;
-            return {
-                x: pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
-                y: pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y
-            };
-        },
-        curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
-            var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
-                b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
-                c = p1x - c1x,
-                t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                y = [p1y, p2y],
-                x = [p1x, p2x],
-                dot;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
-            b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
-            c = p1y - c1y;
-            t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x[push](dot.x);
-                y[push](dot.y);
-            }
-            return {
-                min: {x: mmin[apply](0, x), y: mmin[apply](0, y)},
-                max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
-            };
-        }),
-        path2curve = cacher(function (path, path2) {
-            var p = pathToAbsolute(path),
-                p2 = path2 && pathToAbsolute(path2),
-                attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                processPath = function (path, d) {
-                    var nx, ny;
-                    if (!path) {
-                        return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
-                    }
-                    !(path[0] in {T:1, Q:1}) && (d.qx = d.qy = null);
-                    switch (path[0]) {
-                        case "M":
-                            d.X = path[1];
-                            d.Y = path[2];
-                            break;
-                        case "A":
-                            path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
-                            break;
-                        case "S":
-                            nx = d.x + (d.x - (d.bx || d.x));
-                            ny = d.y + (d.y - (d.by || d.y));
-                            path = ["C", nx, ny][concat](path.slice(1));
-                            break;
-                        case "T":
-                            d.qx = d.x + (d.x - (d.qx || d.x));
-                            d.qy = d.y + (d.y - (d.qy || d.y));
-                            path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
-                            break;
-                        case "Q":
-                            d.qx = path[1];
-                            d.qy = path[2];
-                            path = ["C"][concat](q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
-                            break;
-                        case "L":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], path[2]));
-                            break;
-                        case "H":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], d.y));
-                            break;
-                        case "V":
-                            path = ["C"][concat](l2c(d.x, d.y, d.x, path[1]));
-                            break;
-                        case "Z":
-                            path = ["C"][concat](l2c(d.x, d.y, d.X, d.Y));
-                            break;
-                    }
-                    return path;
-                },
-                fixArc = function (pp, i) {
-                    if (pp[i][length] > 7) {
-                        pp[i].shift();
-                        var pi = pp[i];
-                        while (pi[length]) {
-                            pp.splice(i++, 0, ["C"][concat](pi.splice(0, 6)));
-                        }
-                        pp.splice(i, 1);
-                        ii = mmax(p[length], p2 && p2[length] || 0);
-                    }
-                },
-                fixM = function (path1, path2, a1, a2, i) {
-                    if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
-                        path2.splice(i, 0, ["M", a2.x, a2.y]);
-                        a1.bx = 0;
-                        a1.by = 0;
-                        a1.x = path1[i][1];
-                        a1.y = path1[i][2];
-                        ii = mmax(p[length], p2 && p2[length] || 0);
-                    }
-                };
-            for (var i = 0, ii = mmax(p[length], p2 && p2[length] || 0); i < ii; i++) {
-                p[i] = processPath(p[i], attrs);
-                fixArc(p, i);
-                p2 && (p2[i] = processPath(p2[i], attrs2));
-                p2 && fixArc(p2, i);
-                fixM(p, p2, attrs, attrs2, i);
-                fixM(p2, p, attrs2, attrs, i);
-                var seg = p[i],
-                    seg2 = p2 && p2[i],
-                    seglen = seg[length],
-                    seg2len = p2 && seg2[length];
-                attrs.x = seg[seglen - 2];
-                attrs.y = seg[seglen - 1];
-                attrs.bx = toFloat(seg[seglen - 4]) || attrs.x;
-                attrs.by = toFloat(seg[seglen - 3]) || attrs.y;
-                attrs2.bx = p2 && (toFloat(seg2[seg2len - 4]) || attrs2.x);
-                attrs2.by = p2 && (toFloat(seg2[seg2len - 3]) || attrs2.y);
-                attrs2.x = p2 && seg2[seg2len - 2];
-                attrs2.y = p2 && seg2[seg2len - 1];
-            }
-            return p2 ? [p, p2] : p;
-        }, null, pathClone),
-        parseDots = cacher(function (gradient) {
-            var dots = [];
-            for (var i = 0, ii = gradient[length]; i < ii; i++) {
-                var dot = {},
-                    par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
-                dot.color = R.getRGB(par[1]);
-                if (dot.color.error) {
-                    return null;
-                }
-                dot.color = dot.color.hex;
-                par[2] && (dot.offset = par[2] + "%");
-                dots[push](dot);
-            }
-            for (i = 1, ii = dots[length] - 1; i < ii; i++) {
-                if (!dots[i].offset) {
-                    var start = toFloat(dots[i - 1].offset || 0),
-                        end = 0;
-                    for (var j = i + 1; j < ii; j++) {
-                        if (dots[j].offset) {
-                            end = dots[j].offset;
-                            break;
-                        }
-                    }
-                    if (!end) {
-                        end = 100;
-                        j = ii;
-                    }
-                    end = toFloat(end);
-                    var d = (end - start) / (j - i + 1);
-                    for (; i < j; i++) {
-                        start += d;
-                        dots[i].offset = start + "%";
-                    }
-                }
-            }
-            return dots;
-        }),
-        getContainer = function (x, y, w, h) {
-            var container;
-            if (R.is(x, string) || R.is(x, "object")) {
-                container = R.is(x, string) ? doc.getElementById(x) : x;
-                if (container.tagName) {
-                    if (y == null) {
-                        return {
-                            container: container,
-                            width: container.style.pixelWidth || container.offsetWidth,
-                            height: container.style.pixelHeight || container.offsetHeight
-                        };
-                    } else {
-                        return {container: container, width: y, height: w};
-                    }
-                }
-            } else {
-                return {container: 1, x: x, y: y, width: w, height: h};
-            }
-        },
-        plugins = function (con, add) {
-            var that = this;
-            for (var prop in add) {
-                if (add[has](prop) && !(prop in con)) {
-                    switch (typeof add[prop]) {
-                        case "function":
-                            (function (f) {
-                                con[prop] = con === that ? f : function () { return f[apply](that, arguments); };
-                            })(add[prop]);
-                        break;
-                        case "object":
-                            con[prop] = con[prop] || {};
-                            plugins.call(this, con[prop], add[prop]);
-                        break;
-                        default:
-                            con[prop] = add[prop];
-                        break;
-                    }
-                }
-            }
-        },
-        tear = function (el, paper) {
-            el == paper.top && (paper.top = el.prev);
-            el == paper.bottom && (paper.bottom = el.next);
-            el.next && (el.next.prev = el.prev);
-            el.prev && (el.prev.next = el.next);
-        },
-        tofront = function (el, paper) {
-            if (paper.top === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = null;
-            el.prev = paper.top;
-            paper.top.next = el;
-            paper.top = el;
-        },
-        toback = function (el, paper) {
-            if (paper.bottom === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = paper.bottom;
-            el.prev = null;
-            paper.bottom.prev = el;
-            paper.bottom = el;
-        },
-        insertafter = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.top && (paper.top = el);
-            el2.next && (el2.next.prev = el);
-            el.next = el2.next;
-            el.prev = el2;
-            el2.next = el;
-        },
-        insertbefore = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.bottom && (paper.bottom = el);
-            el2.prev && (el2.prev.next = el);
-            el.prev = el2.prev;
-            el2.prev = el;
-            el.next = el2;
-        },
-        removed = function (methodname) {
-            return function () {
-                throw new Error("Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object");
-            };
-        };
-    R.pathToRelative = pathToRelative;
-    // SVG
-    if (R.svg) {
-        paperproto.svgns = "http://www.w3.org/2000/svg";
-        paperproto.xlink = "http://www.w3.org/1999/xlink";
-        round = function (num) {
-            return +num + (~~num === num) * .5;
-        };
-        var $ = function (el, attr) {
-            if (attr) {
-                for (var key in attr) {
-                    if (attr[has](key)) {
-                        el[setAttribute](key, Str(attr[key]));
-                    }
-                }
-            } else {
-                el = doc.createElementNS(paperproto.svgns, el);
-                el.style.webkitTapHighlightColor = "rgba(0,0,0,0)";
-                return el;
-            }
-        };
-        R[toString] = function () {
-            return  "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version;
-        };
-        var thePath = function (pathString, SVG) {
-            var el = $("path");
-            SVG.canvas && SVG.canvas[appendChild](el);
-            var p = new Element(el, SVG);
-            p.type = "path";
-            setFillAndStroke(p, {fill: "none", stroke: "#000", path: pathString});
-            return p;
-        };
-        var addGradientFill = function (o, gradient, SVG) {
-            var type = "linear",
-                fx = .5, fy = .5,
-                s = o.style;
-            gradient = Str(gradient)[rp](radial_gradient, function (all, _fx, _fy) {
-                type = "radial";
-                if (_fx && _fy) {
-                    fx = toFloat(_fx);
-                    fy = toFloat(_fy);
-                    var dir = ((fy > .5) * 2 - 1);
-                    pow(fx - .5, 2) + pow(fy - .5, 2) > .25 &&
-                        (fy = math.sqrt(.25 - pow(fx - .5, 2)) * dir + .5) &&
-                        fy != .5 &&
-                        (fy = fy.toFixed(5) - 1e-5 * dir);
-                }
-                return E;
-            });
-            gradient = gradient[split](/\s*\-\s*/);
-            if (type == "linear") {
-                var angle = gradient.shift();
-                angle = -toFloat(angle);
-                if (isNaN(angle)) {
-                    return null;
-                }
-                var vector = [0, 0, math.cos(angle * PI / 180), math.sin(angle * PI / 180)],
-                    max = 1 / (mmax(abs(vector[2]), abs(vector[3])) || 1);
-                vector[2] *= max;
-                vector[3] *= max;
-                if (vector[2] < 0) {
-                    vector[0] = -vector[2];
-                    vector[2] = 0;
-                }
-                if (vector[3] < 0) {
-                    vector[1] = -vector[3];
-                    vector[3] = 0;
-                }
-            }
-            var dots = parseDots(gradient);
-            if (!dots) {
-                return null;
-            }
-            var id = o.getAttribute(fillString);
-            id = id.match(/^url\(#(.*)\)$/);
-            id && SVG.defs.removeChild(doc.getElementById(id[1]));
-
-            var el = $(type + "Gradient");
-            el.id = createUUID();
-            $(el, type == "radial" ? {fx: fx, fy: fy} : {x1: vector[0], y1: vector[1], x2: vector[2], y2: vector[3]});
-            SVG.defs[appendChild](el);
-            for (var i = 0, ii = dots[length]; i < ii; i++) {
-                var stop = $("stop");
-                $(stop, {
-                    offset: dots[i].offset ? dots[i].offset : !i ? "0%" : "100%",
-                    "stop-color": dots[i].color || "#fff"
-                });
-                el[appendChild](stop);
-            }
-            $(o, {
-                fill: "url(#" + el.id + ")",
-                opacity: 1,
-                "fill-opacity": 1
-            });
-            s.fill = E;
-            s.opacity = 1;
-            s.fillOpacity = 1;
-            return 1;
-        };
-        var updatePosition = function (o) {
-            var bbox = o.getBBox();
-            $(o.pattern, {patternTransform: R.format("translate({0},{1})", bbox.x, bbox.y)});
-        };
-        var setFillAndStroke = function (o, params) {
-            var dasharray = {
-                    "": [0],
-                    "none": [0],
-                    "-": [3, 1],
-                    ".": [1, 1],
-                    "-.": [3, 1, 1, 1],
-                    "-..": [3, 1, 1, 1, 1, 1],
-                    ". ": [1, 3],
-                    "- ": [4, 3],
-                    "--": [8, 3],
-                    "- .": [4, 3, 1, 3],
-                    "--.": [8, 3, 1, 3],
-                    "--..": [8, 3, 1, 3, 1, 3]
-                },
-                node = o.node,
-                attrs = o.attrs,
-                rot = o.rotate(),
-                addDashes = function (o, value) {
-                    value = dasharray[lowerCase.call(value)];
-                    if (value) {
-                        var width = o.attrs["stroke-width"] || "1",
-                            butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
-                            dashes = [];
-                        var i = value[length];
-                        while (i--) {
-                            dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
-                        }
-                        $(node, {"stroke-dasharray": dashes[join](",")});
-                    }
-                };
-            params[has]("rotation") && (rot = params.rotation);
-            var rotxy = Str(rot)[split](separator);
-            if (!(rotxy.length - 1)) {
-                rotxy = null;
-            } else {
-                rotxy[1] = +rotxy[1];
-                rotxy[2] = +rotxy[2];
-            }
-            toFloat(rot) && o.rotate(0, true);
-            for (var att in params) {
-                if (params[has](att)) {
-                    if (!availableAttrs[has](att)) {
-                        continue;
-                    }
-                    var value = params[att];
-                    attrs[att] = value;
-                    switch (att) {
-                        case "blur":
-                            o.blur(value);
-                            break;
-                        case "rotation":
-                            o.rotate(value, true);
-                            break;
-                        case "href":
-                        case "title":
-                        case "target":
-                            var pn = node.parentNode;
-                            if (lowerCase.call(pn.tagName) != "a") {
-                                var hl = $("a");
-                                pn.insertBefore(hl, node);
-                                hl[appendChild](node);
-                                pn = hl;
-                            }
-                            if (att == "target" && value == "blank") {
-                                pn.setAttributeNS(o.paper.xlink, "show", "new");
-                            } else {
-                                pn.setAttributeNS(o.paper.xlink, att, value);
-                            }
-                            break;
-                        case "cursor":
-                            node.style.cursor = value;
-                            break;
-                        case "clip-rect":
-                            var rect = Str(value)[split](separator);
-                            if (rect[length] == 4) {
-                                o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
-                                var el = $("clipPath"),
-                                    rc = $("rect");
-                                el.id = createUUID();
-                                $(rc, {
-                                    x: rect[0],
-                                    y: rect[1],
-                                    width: rect[2],
-                                    height: rect[3]
-                                });
-                                el[appendChild](rc);
-                                o.paper.defs[appendChild](el);
-                                $(node, {"clip-path": "url(#" + el.id + ")"});
-                                o.clip = rc;
-                            }
-                            if (!value) {
-                                var clip = doc.getElementById(node.getAttribute("clip-path")[rp](/(^url\(#|\)$)/g, E));
-                                clip && clip.parentNode.removeChild(clip);
-                                $(node, {"clip-path": E});
-                                delete o.clip;
-                            }
-                        break;
-                        case "path":
-                            if (o.type == "path") {
-                                $(node, {d: value ? attrs.path = pathToAbsolute(value) : "M0,0"});
-                            }
-                            break;
-                        case "width":
-                            node[setAttribute](att, value);
-                            if (attrs.fx) {
-                                att = "x";
-                                value = attrs.x;
-                            } else {
-                                break;
-                            }
-                        case "x":
-                            if (attrs.fx) {
-                                value = -attrs.x - (attrs.width || 0);
-                            }
-                        case "rx":
-                            if (att == "rx" && o.type == "rect") {
-                                break;
-                            }
-                        case "cx":
-                            rotxy && (att == "x" || att == "cx") && (rotxy[1] += value - attrs[att]);
-                            node[setAttribute](att, value);
-                            o.pattern && updatePosition(o);
-                            break;
-                        case "height":
-                            node[setAttribute](att, value);
-                            if (attrs.fy) {
-                                att = "y";
-                                value = attrs.y;
-                            } else {
-                                break;
-                            }
-                        case "y":
-                            if (attrs.fy) {
-                                value = -attrs.y - (attrs.height || 0);
-                            }
-                        case "ry":
-                            if (att == "ry" && o.type == "rect") {
-                                break;
-                            }
-                        case "cy":
-                            rotxy && (att == "y" || att == "cy") && (rotxy[2] += value - attrs[att]);
-                            node[setAttribute](att, value);
-                            o.pattern && updatePosition(o);
-                            break;
-                        case "r":
-                            if (o.type == "rect") {
-                                $(node, {rx: value, ry: value});
-                            } else {
-                                node[setAttribute](att, value);
-                            }
-                            break;
-                        case "src":
-                            if (o.type == "image") {
-                                node.setAttributeNS(o.paper.xlink, "href", value);
-                            }
-                            break;
-                        case "stroke-width":
-                            node.style.strokeWidth = value;
-                            // Need following line for Firefox
-                            node[setAttribute](att, value);
-                            if (attrs["stroke-dasharray"]) {
-                                addDashes(o, attrs["stroke-dasharray"]);
-                            }
-                            break;
-                        case "stroke-dasharray":
-                            addDashes(o, value);
-                            break;
-                        case "translation":
-                            var xy = Str(value)[split](separator);
-                            xy[0] = +xy[0] || 0;
-                            xy[1] = +xy[1] || 0;
-                            if (rotxy) {
-                                rotxy[1] += xy[0];
-                                rotxy[2] += xy[1];
-                            }
-                            translate.call(o, xy[0], xy[1]);
-                            break;
-                        case "scale":
-                            xy = Str(value)[split](separator);
-                            o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, isNaN(toFloat(xy[2])) ? null : +xy[2], isNaN(toFloat(xy[3])) ? null : +xy[3]);
-                            break;
-                        case fillString:
-                            var isURL = Str(value).match(ISURL);
-                            if (isURL) {
-                                el = $("pattern");
-                                var ig = $("image");
-                                el.id = createUUID();
-                                $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
-                                $(ig, {x: 0, y: 0});
-                                ig.setAttributeNS(o.paper.xlink, "href", isURL[1]);
-                                el[appendChild](ig);
- 
-                                var img = doc.createElement("img");
-                                img.style.cssText = "position:absolute;left:-9999em;top-9999em";
-                                img.onload = function () {
-                                    $(el, {width: this.offsetWidth, height: this.offsetHeight});
-                                    $(ig, {width: this.offsetWidth, height: this.offsetHeight});
-                                    doc.body.removeChild(this);
-                                    o.paper.safari();
-                                };
-                                doc.body[appendChild](img);
-                                img.src = isURL[1];
-                                o.paper.defs[appendChild](el);
-                                node.style.fill = "url(#" + el.id + ")";
-                                $(node, {fill: "url(#" + el.id + ")"});
-                                o.pattern = el;
-                                o.pattern && updatePosition(o);
-                                break;
-                            }
-                            var clr = R.getRGB(value);
-                            if (!clr.error) {
-                                delete params.gradient;
-                                delete attrs.gradient;
-                                !R.is(attrs.opacity, "undefined") &&
-                                    R.is(params.opacity, "undefined") &&
-                                    $(node, {opacity: attrs.opacity});
-                                !R.is(attrs["fill-opacity"], "undefined") &&
-                                    R.is(params["fill-opacity"], "undefined") &&
-                                    $(node, {"fill-opacity": attrs["fill-opacity"]});
-                            } else if ((({circle: 1, ellipse: 1})[has](o.type) || Str(value).charAt() != "r") && addGradientFill(node, value, o.paper)) {
-                                attrs.gradient = value;
-                                attrs.fill = "none";
-                                break;
-                            }
-                            clr[has]("opacity") && $(node, {"fill-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                        case "stroke":
-                            clr = R.getRGB(value);
-                            node[setAttribute](att, clr.hex);
-                            att == "stroke" && clr[has]("opacity") && $(node, {"stroke-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                            break;
-                        case "gradient":
-                            (({circle: 1, ellipse: 1})[has](o.type) || Str(value).charAt() != "r") && addGradientFill(node, value, o.paper);
-                            break;
-                        case "opacity":
-                            if (attrs.gradient && !attrs[has]("stroke-opacity")) {
-                                $(node, {"stroke-opacity": value > 1 ? value / 100 : value});
-                            }
-                            // fall
-                        case "fill-opacity":
-                            if (attrs.gradient) {
-                                var gradient = doc.getElementById(node.getAttribute(fillString)[rp](/^url\(#|\)$/g, E));
-                                if (gradient) {
-                                    var stops = gradient.getElementsByTagName("stop");
-                                    stops[stops[length] - 1][setAttribute]("stop-opacity", value);
-                                }
-                                break;
-                            }
-                        default:
-                            att == "font-size" && (value = toInt(value, 10) + "px");
-                            var cssrule = att[rp](/(\-.)/g, function (w) {
-                                return upperCase.call(w.substring(1));
-                            });
-                            node.style[cssrule] = value;
-                            // Need following line for Firefox
-                            node[setAttribute](att, value);
-                            break;
-                    }
-                }
-            }
-            
-            tuneText(o, params);
-            if (rotxy) {
-                o.rotate(rotxy.join(S));
-            } else {
-                toFloat(rot) && o.rotate(rot, true);
-            }
-        };
-        var leading = 1.2,
-        tuneText = function (el, params) {
-            if (el.type != "text" || !(params[has]("text") || params[has]("font") || params[has]("font-size") || params[has]("x") || params[has]("y"))) {
-                return;
-            }
-            var a = el.attrs,
-                node = el.node,
-                fontSize = node.firstChild ? toInt(doc.defaultView.getComputedStyle(node.firstChild, E).getPropertyValue("font-size"), 10) : 10;
- 
-            if (params[has]("text")) {
-                a.text = params.text;
-                while (node.firstChild) {
-                    node.removeChild(node.firstChild);
-                }
-                var texts = Str(params.text)[split]("\n");
-                for (var i = 0, ii = texts[length]; i < ii; i++) if (texts[i]) {
-                    var tspan = $("tspan");
-                    i && $(tspan, {dy: fontSize * leading, x: a.x});
-                    tspan[appendChild](doc.createTextNode(texts[i]));
-                    node[appendChild](tspan);
-                }
-            } else {
-                texts = node.getElementsByTagName("tspan");
-                for (i = 0, ii = texts[length]; i < ii; i++) {
-                    i && $(texts[i], {dy: fontSize * leading, x: a.x});
-                }
-            }
-            $(node, {y: a.y});
-            var bb = el.getBBox(),
-                dif = a.y - (bb.y + bb.height / 2);
-            dif && R.is(dif, "finite") && $(node, {y: a.y + dif});
-        },
-        Element = function (node, svg) {
-            var X = 0,
-                Y = 0;
-            this[0] = node;
-            this.id = R._oid++;
-            this.node = node;
-            node.raphael = this;
-            this.paper = svg;
-            this.attrs = this.attrs || {};
-            this.transformations = []; // rotate, translate, scale
-            this._ = {
-                tx: 0,
-                ty: 0,
-                rt: {deg: 0, cx: 0, cy: 0},
-                sx: 1,
-                sy: 1
-            };
-            !svg.bottom && (svg.bottom = this);
-            this.prev = svg.top;
-            svg.top && (svg.top.next = this);
-            svg.top = this;
-            this.next = null;
-        };
-        var elproto = Element[proto];
-        Element[proto].rotate = function (deg, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            if (deg == null) {
-                if (this._.rt.cx) {
-                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy][join](S);
-                }
-                return this._.rt.deg;
-            }
-            var bbox = this.getBBox();
-            deg = Str(deg)[split](separator);
-            if (deg[length] - 1) {
-                cx = toFloat(deg[1]);
-                cy = toFloat(deg[2]);
-            }
-            deg = toFloat(deg[0]);
-            if (cx != null && cx !== false) {
-                this._.rt.deg = deg;
-            } else {
-                this._.rt.deg += deg;
-            }
-            (cy == null) && (cx = null);
-            this._.rt.cx = cx;
-            this._.rt.cy = cy;
-            cx = cx == null ? bbox.x + bbox.width / 2 : cx;
-            cy = cy == null ? bbox.y + bbox.height / 2 : cy;
-            if (this._.rt.deg) {
-                this.transformations[0] = R.format("rotate({0} {1} {2})", this._.rt.deg, cx, cy);
-                this.clip && $(this.clip, {transform: R.format("rotate({0} {1} {2})", -this._.rt.deg, cx, cy)});
-            } else {
-                this.transformations[0] = E;
-                this.clip && $(this.clip, {transform: E});
-            }
-            $(this.node, {transform: this.transformations[join](S)});
-            return this;
-        };
-        Element[proto].hide = function () {
-            !this.removed && (this.node.style.display = "none");
-            return this;
-        };
-        Element[proto].show = function () {
-            !this.removed && (this.node.style.display = "");
-            return this;
-        };
-        Element[proto].remove = function () {
-            if (this.removed) {
-                return;
-            }
-            tear(this, this.paper);
-            this.node.parentNode.removeChild(this.node);
-            for (var i in this) {
-                delete this[i];
-            }
-            this.removed = true;
-        };
-        Element[proto].getBBox = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.type == "path") {
-                return pathDimensions(this.attrs.path);
-            }
-            if (this.node.style.display == "none") {
-                this.show();
-                var hide = true;
-            }
-            var bbox = {};
-            try {
-                bbox = this.node.getBBox();
-            } catch(e) {
-                // Firefox 3.0.x plays badly here
-            } finally {
-                bbox = bbox || {};
-            }
-            if (this.type == "text") {
-                bbox = {x: bbox.x, y: Infinity, width: 0, height: 0};
-                for (var i = 0, ii = this.node.getNumberOfChars(); i < ii; i++) {
-                    var bb = this.node.getExtentOfChar(i);
-                    (bb.y < bbox.y) && (bbox.y = bb.y);
-                    (bb.y + bb.height - bbox.y > bbox.height) && (bbox.height = bb.y + bb.height - bbox.y);
-                    (bb.x + bb.width - bbox.x > bbox.width) && (bbox.width = bb.x + bb.width - bbox.x);
-                }
-            }
-            hide && this.hide();
-            return bbox;
-        };
-        Element[proto].attr = function (name, value) {
-            if (this.removed) {
-                return this;
-            }
-            if (name == null) {
-                var res = {};
-                for (var i in this.attrs) if (this.attrs[has](i)) {
-                    res[i] = this.attrs[i];
-                }
-                this._.rt.deg && (res.rotation = this.rotate());
-                (this._.sx != 1 || this._.sy != 1) && (res.scale = this.scale());
-                res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-                return res;
-            }
-            if (value == null && R.is(name, string)) {
-                if (name == "translation") {
-                    return translate.call(this);
-                }
-                if (name == "rotation") {
-                    return this.rotate();
-                }
-                if (name == "scale") {
-                    return this.scale();
-                }
-                if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
-                    return this.attrs.gradient;
-                }
-                return this.attrs[name];
-            }
-            if (value == null && R.is(name, array)) {
-                var values = {};
-                for (var j = 0, jj = name.length; j < jj; j++) {
-                    values[name[j]] = this.attr(name[j]);
-                }
-                return values;
-            }
-            if (value != null) {
-                var params = {};
-                params[name] = value;
-            } else if (name != null && R.is(name, "object")) {
-                params = name;
-            }
-            for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-                var par = this.paper.customAttributes[key].apply(this, [][concat](params[key]));
-                this.attrs[key] = params[key];
-                for (var subkey in par) if (par[has](subkey)) {
-                    params[subkey] = par[subkey];
-                }
-            }
-            setFillAndStroke(this, params);
-            return this;
-        };
-        Element[proto].toFront = function () {
-            if (this.removed) {
-                return this;
-            }
-            this.node.parentNode[appendChild](this.node);
-            var svg = this.paper;
-            svg.top != this && tofront(this, svg);
-            return this;
-        };
-        Element[proto].toBack = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.node.parentNode.firstChild != this.node) {
-                this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
-                toback(this, this.paper);
-                var svg = this.paper;
-            }
-            return this;
-        };
-        Element[proto].insertAfter = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            var node = element.node || element[element.length - 1].node;
-            if (node.nextSibling) {
-                node.parentNode.insertBefore(this.node, node.nextSibling);
-            } else {
-                node.parentNode[appendChild](this.node);
-            }
-            insertafter(this, element, this.paper);
-            return this;
-        };
-        Element[proto].insertBefore = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            var node = element.node || element[0].node;
-            node.parentNode.insertBefore(this.node, node);
-            insertbefore(this, element, this.paper);
-            return this;
-        };
-        Element[proto].blur = function (size) {
-            // Experimental. No Safari support. Use it on your own risk.
-            var t = this;
-            if (+size !== 0) {
-                var fltr = $("filter"),
-                    blur = $("feGaussianBlur");
-                t.attrs.blur = size;
-                fltr.id = createUUID();
-                $(blur, {stdDeviation: +size || 1.5});
-                fltr.appendChild(blur);
-                t.paper.defs.appendChild(fltr);
-                t._blur = fltr;
-                $(t.node, {filter: "url(#" + fltr.id + ")"});
-            } else {
-                if (t._blur) {
-                    t._blur.parentNode.removeChild(t._blur);
-                    delete t._blur;
-                    delete t.attrs.blur;
-                }
-                t.node.removeAttribute("filter");
-            }
-        };
-        var theCircle = function (svg, x, y, r) {
-            var el = $("circle");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
-            res.type = "circle";
-            $(el, res.attrs);
-            return res;
-        },
-        theRect = function (svg, x, y, w, h, r) {
-            var el = $("rect");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
-            res.type = "rect";
-            $(el, res.attrs);
-            return res;
-        },
-        theEllipse = function (svg, x, y, rx, ry) {
-            var el = $("ellipse");
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
-            res.type = "ellipse";
-            $(el, res.attrs);
-            return res;
-        },
-        theImage = function (svg, src, x, y, w, h) {
-            var el = $("image");
-            $(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
-            el.setAttributeNS(svg.xlink, "href", src);
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, width: w, height: h, src: src};
-            res.type = "image";
-            return res;
-        },
-        theText = function (svg, x, y, text) {
-            var el = $("text");
-            $(el, {x: x, y: y, "text-anchor": "middle"});
-            svg.canvas && svg.canvas[appendChild](el);
-            var res = new Element(el, svg);
-            res.attrs = {x: x, y: y, "text-anchor": "middle", text: text, font: availableAttrs.font, stroke: "none", fill: "#000"};
-            res.type = "text";
-            setFillAndStroke(res, res.attrs);
-            return res;
-        },
-        setSize = function (width, height) {
-            this.width = width || this.width;
-            this.height = height || this.height;
-            this.canvas[setAttribute]("width", this.width);
-            this.canvas[setAttribute]("height", this.height);
-            return this;
-        },
-        create = function () {
-            var con = getContainer[apply](0, arguments),
-                container = con && con.container,
-                x = con.x,
-                y = con.y,
-                width = con.width,
-                height = con.height;
-            if (!container) {
-                throw new Error("SVG container not found.");
-            }
-            var cnvs = $("svg");
-            x = x || 0;
-            y = y || 0;
-            width = width || 512;
-            height = height || 342;
-            $(cnvs, {
-                xmlns: "http://www.w3.org/2000/svg",
-                version: 1.1,
-                width: width,
-                height: height
-            });
-            if (container == 1) {
-                cnvs.style.cssText = "position:absolute;left:" + x + "px;top:" + y + "px";
-                doc.body[appendChild](cnvs);
-            } else {
-                if (container.firstChild) {
-                    container.insertBefore(cnvs, container.firstChild);
-                } else {
-                    container[appendChild](cnvs);
-                }
-            }
-            container = new Paper;
-            container.width = width;
-            container.height = height;
-            container.canvas = cnvs;
-            plugins.call(container, container, R.fn);
-            container.clear();
-            return container;
-        };
-        paperproto.clear = function () {
-            var c = this.canvas;
-            while (c.firstChild) {
-                c.removeChild(c.firstChild);
-            }
-            this.bottom = this.top = null;
-            (this.desc = $("desc"))[appendChild](doc.createTextNode("Created with Rapha\xebl"));
-            c[appendChild](this.desc);
-            c[appendChild](this.defs = $("defs"));
-        };
-        paperproto.remove = function () {
-            this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
-            for (var i in this) {
-                this[i] = removed(i);
-            }
-        };
-    }
-
-    // VML
-    if (R.vml) {
-        var map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
-            bites = /([clmz]),?([^clmz]*)/gi,
-            blurregexp = / progid:\S+Blur\([^\)]+\)/g,
-            val = /-?[^,\s-]+/g,
-            coordsize = 1e3 + S + 1e3,
-            zoom = 10,
-            pathlike = {path: 1, rect: 1},
-            path2vml = function (path) {
-                var total =  /[ahqstv]/ig,
-                    command = pathToAbsolute;
-                Str(path).match(total) && (command = path2curve);
-                total = /[clmz]/g;
-                if (command == pathToAbsolute && !Str(path).match(total)) {
-                    var res = Str(path)[rp](bites, function (all, command, args) {
-                        var vals = [],
-                            isMove = lowerCase.call(command) == "m",
-                            res = map[command];
-                        args[rp](val, function (value) {
-                            if (isMove && vals[length] == 2) {
-                                res += vals + map[command == "m" ? "l" : "L"];
-                                vals = [];
-                            }
-                            vals[push](round(value * zoom));
-                        });
-                        return res + vals;
-                    });
-                    return res;
-                }
-                var pa = command(path), p, r;
-                res = [];
-                for (var i = 0, ii = pa[length]; i < ii; i++) {
-                    p = pa[i];
-                    r = lowerCase.call(pa[i][0]);
-                    r == "z" && (r = "x");
-                    for (var j = 1, jj = p[length]; j < jj; j++) {
-                        r += round(p[j] * zoom) + (j != jj - 1 ? "," : E);
-                    }
-                    res[push](r);
-                }
-                return res[join](S);
-            };
-        
-        R[toString] = function () {
-            return  "Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl " + this.version;
-        };
-        thePath = function (pathString, vml) {
-            var g = createNode("group");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = vml.coordsize;
-            g.coordorigin = vml.coordorigin;
-            var el = createNode("shape"), ol = el.style;
-            ol.width = vml.width + "px";
-            ol.height = vml.height + "px";
-            el.coordsize = coordsize;
-            el.coordorigin = vml.coordorigin;
-            g[appendChild](el);
-            var p = new Element(el, g, vml),
-                attr = {fill: "none", stroke: "#000"};
-            pathString && (attr.path = pathString);
-            p.type = "path";
-            p.path = [];
-            p.Path = E;
-            setFillAndStroke(p, attr);
-            vml.canvas[appendChild](g);
-            return p;
-        };
-        setFillAndStroke = function (o, params) {
-            o.attrs = o.attrs || {};
-            var node = o.node,
-                a = o.attrs,
-                s = node.style,
-                xy,
-                newpath = (params.x != a.x || params.y != a.y || params.width != a.width || params.height != a.height || params.r != a.r) && o.type == "rect",
-                res = o;
-
-            for (var par in params) if (params[has](par)) {
-                a[par] = params[par];
-            }
-            if (newpath) {
-                a.path = rectPath(a.x, a.y, a.width, a.height, a.r);
-                o.X = a.x;
-                o.Y = a.y;
-                o.W = a.width;
-                o.H = a.height;
-            }
-            params.href && (node.href = params.href);
-            params.title && (node.title = params.title);
-            params.target && (node.target = params.target);
-            params.cursor && (s.cursor = params.cursor);
-            "blur" in params && o.blur(params.blur);
-            if (params.path && o.type == "path" || newpath) {
-                node.path = path2vml(a.path);
-            }
-            if (params.rotation != null) {
-                o.rotate(params.rotation, true);
-            }
-            if (params.translation) {
-                xy = Str(params.translation)[split](separator);
-                translate.call(o, xy[0], xy[1]);
-                if (o._.rt.cx != null) {
-                    o._.rt.cx +=+ xy[0];
-                    o._.rt.cy +=+ xy[1];
-                    o.setBox(o.attrs, xy[0], xy[1]);
-                }
-            }
-            if (params.scale) {
-                xy = Str(params.scale)[split](separator);
-                o.scale(+xy[0] || 1, +xy[1] || +xy[0] || 1, +xy[2] || null, +xy[3] || null);
-            }
-            if ("clip-rect" in params) {
-                var rect = Str(params["clip-rect"])[split](separator);
-                if (rect[length] == 4) {
-                    rect[2] = +rect[2] + (+rect[0]);
-                    rect[3] = +rect[3] + (+rect[1]);
-                    var div = node.clipRect || doc.createElement("div"),
-                        dstyle = div.style,
-                        group = node.parentNode;
-                    dstyle.clip = R.format("rect({1}px {2}px {3}px {0}px)", rect);
-                    if (!node.clipRect) {
-                        dstyle.position = "absolute";
-                        dstyle.top = 0;
-                        dstyle.left = 0;
-                        dstyle.width = o.paper.width + "px";
-                        dstyle.height = o.paper.height + "px";
-                        group.parentNode.insertBefore(div, group);
-                        div[appendChild](group);
-                        node.clipRect = div;
-                    }
-                }
-                if (!params["clip-rect"]) {
-                    node.clipRect && (node.clipRect.style.clip = E);
-                }
-            }
-            if (o.type == "image" && params.src) {
-                node.src = params.src;
-            }
-            if (o.type == "image" && params.opacity) {
-                node.filterOpacity = ms + ".Alpha(opacity=" + (params.opacity * 100) + ")";
-                s.filter = (node.filterMatrix || E) + (node.filterOpacity || E);
-            }
-            params.font && (s.font = params.font);
-            params["font-family"] && (s.fontFamily = '"' + params["font-family"][split](",")[0][rp](/^['"]+|['"]+$/g, E) + '"');
-            params["font-size"] && (s.fontSize = params["font-size"]);
-            params["font-weight"] && (s.fontWeight = params["font-weight"]);
-            params["font-style"] && (s.fontStyle = params["font-style"]);
-            if (params.opacity != null || 
-                params["stroke-width"] != null ||
-                params.fill != null ||
-                params.stroke != null ||
-                params["stroke-width"] != null ||
-                params["stroke-opacity"] != null ||
-                params["fill-opacity"] != null ||
-                params["stroke-dasharray"] != null ||
-                params["stroke-miterlimit"] != null ||
-                params["stroke-linejoin"] != null ||
-                params["stroke-linecap"] != null) {
-                node = o.shape || node;
-                var fill = (node.getElementsByTagName(fillString) && node.getElementsByTagName(fillString)[0]),
-                    newfill = false;
-                !fill && (newfill = fill = createNode(fillString));
-                if ("fill-opacity" in params || "opacity" in params) {
-                    var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+R.getRGB(params.fill).o + 1 || 2) - 1);
-                    opacity = mmin(mmax(opacity, 0), 1);
-                    fill.opacity = opacity;
-                }
-                params.fill && (fill.on = true);
-                if (fill.on == null || params.fill == "none") {
-                    fill.on = false;
-                }
-                if (fill.on && params.fill) {
-                    var isURL = params.fill.match(ISURL);
-                    if (isURL) {
-                        fill.src = isURL[1];
-                        fill.type = "tile";
-                    } else {
-                        fill.color = R.getRGB(params.fill).hex;
-                        fill.src = E;
-                        fill.type = "solid";
-                        if (R.getRGB(params.fill).error && (res.type in {circle: 1, ellipse: 1} || Str(params.fill).charAt() != "r") && addGradientFill(res, params.fill)) {
-                            a.fill = "none";
-                            a.gradient = params.fill;
-                        }
-                    }
-                }
-                newfill && node[appendChild](fill);
-                var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
-                newstroke = false;
-                !stroke && (newstroke = stroke = createNode("stroke"));
-                if ((params.stroke && params.stroke != "none") ||
-                    params["stroke-width"] ||
-                    params["stroke-opacity"] != null ||
-                    params["stroke-dasharray"] ||
-                    params["stroke-miterlimit"] ||
-                    params["stroke-linejoin"] ||
-                    params["stroke-linecap"]) {
-                    stroke.on = true;
-                }
-                (params.stroke == "none" || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
-                var strokeColor = R.getRGB(params.stroke);
-                stroke.on && params.stroke && (stroke.color = strokeColor.hex);
-                opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+strokeColor.o + 1 || 2) - 1);
-                var width = (toFloat(params["stroke-width"]) || 1) * .75;
-                opacity = mmin(mmax(opacity, 0), 1);
-                params["stroke-width"] == null && (width = a["stroke-width"]);
-                params["stroke-width"] && (stroke.weight = width);
-                width && width < 1 && (opacity *= width) && (stroke.weight = 1);
-                stroke.opacity = opacity;
-                
-                params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
-                stroke.miterlimit = params["stroke-miterlimit"] || 8;
-                params["stroke-linecap"] && (stroke.endcap = params["stroke-linecap"] == "butt" ? "flat" : params["stroke-linecap"] == "square" ? "square" : "round");
-                if (params["stroke-dasharray"]) {
-                    var dasharray = {
-                        "-": "shortdash",
-                        ".": "shortdot",
-                        "-.": "shortdashdot",
-                        "-..": "shortdashdotdot",
-                        ". ": "dot",
-                        "- ": "dash",
-                        "--": "longdash",
-                        "- .": "dashdot",
-                        "--.": "longdashdot",
-                        "--..": "longdashdotdot"
-                    };
-                    stroke.dashstyle = dasharray[has](params["stroke-dasharray"]) ? dasharray[params["stroke-dasharray"]] : E;
-                }
-                newstroke && node[appendChild](stroke);
-            }
-            if (res.type == "text") {
-                s = res.paper.span.style;
-                a.font && (s.font = a.font);
-                a["font-family"] && (s.fontFamily = a["font-family"]);
-                a["font-size"] && (s.fontSize = a["font-size"]);
-                a["font-weight"] && (s.fontWeight = a["font-weight"]);
-                a["font-style"] && (s.fontStyle = a["font-style"]);
-                res.node.string && (res.paper.span.innerHTML = Str(res.node.string)[rp](/</g, "&#60;")[rp](/&/g, "&#38;")[rp](/\n/g, "<br>"));
-                res.W = a.w = res.paper.span.offsetWidth;
-                res.H = a.h = res.paper.span.offsetHeight;
-                res.X = a.x;
-                res.Y = a.y + round(res.H / 2);
- 
-                // text-anchor emulationm
-                switch (a["text-anchor"]) {
-                    case "start":
-                        res.node.style["v-text-align"] = "left";
-                        res.bbx = round(res.W / 2);
-                    break;
-                    case "end":
-                        res.node.style["v-text-align"] = "right";
-                        res.bbx = -round(res.W / 2);
-                    break;
-                    default:
-                        res.node.style["v-text-align"] = "center";
-                    break;
-                }
-            }
-        };
-        addGradientFill = function (o, gradient) {
-            o.attrs = o.attrs || {};
-            var attrs = o.attrs,
-                fill,
-                type = "linear",
-                fxfy = ".5 .5";
-            o.attrs.gradient = gradient;
-            gradient = Str(gradient)[rp](radial_gradient, function (all, fx, fy) {
-                type = "radial";
-                if (fx && fy) {
-                    fx = toFloat(fx);
-                    fy = toFloat(fy);
-                    pow(fx - .5, 2) + pow(fy - .5, 2) > .25 && (fy = math.sqrt(.25 - pow(fx - .5, 2)) * ((fy > .5) * 2 - 1) + .5);
-                    fxfy = fx + S + fy;
-                }
-                return E;
-            });
-            gradient = gradient[split](/\s*\-\s*/);
-            if (type == "linear") {
-                var angle = gradient.shift();
-                angle = -toFloat(angle);
-                if (isNaN(angle)) {
-                    return null;
-                }
-            }
-            var dots = parseDots(gradient);
-            if (!dots) {
-                return null;
-            }
-            o = o.shape || o.node;
-            fill = o.getElementsByTagName(fillString)[0] || createNode(fillString);
-            !fill.parentNode && o.appendChild(fill);
-            if (dots[length]) {
-                fill.on = true;
-                fill.method = "none";
-                fill.color = dots[0].color;
-                fill.color2 = dots[dots[length] - 1].color;
-                var clrs = [];
-                for (var i = 0, ii = dots[length]; i < ii; i++) {
-                    dots[i].offset && clrs[push](dots[i].offset + S + dots[i].color);
-                }
-                fill.colors && (fill.colors.value = clrs[length] ? clrs[join]() : "0% " + fill.color);
-                if (type == "radial") {
-                    fill.type = "gradientradial";
-                    fill.focus = "100%";
-                    fill.focussize = fxfy;
-                    fill.focusposition = fxfy;
-                } else {
-                    fill.type = "gradient";
-                    fill.angle = (270 - angle) % 360;
-                }
-            }
-            return 1;
-        };
-        Element = function (node, group, vml) {
-            var Rotation = 0,
-                RotX = 0,
-                RotY = 0,
-                Scale = 1;
-            this[0] = node;
-            this.id = R._oid++;
-            this.node = node;
-            node.raphael = this;
-            this.X = 0;
-            this.Y = 0;
-            this.attrs = {};
-            this.Group = group;
-            this.paper = vml;
-            this._ = {
-                tx: 0,
-                ty: 0,
-                rt: {deg:0},
-                sx: 1,
-                sy: 1
-            };
-            !vml.bottom && (vml.bottom = this);
-            this.prev = vml.top;
-            vml.top && (vml.top.next = this);
-            vml.top = this;
-            this.next = null;
-        };
-        elproto = Element[proto];
-        elproto.rotate = function (deg, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            if (deg == null) {
-                if (this._.rt.cx) {
-                    return [this._.rt.deg, this._.rt.cx, this._.rt.cy][join](S);
-                }
-                return this._.rt.deg;
-            }
-            deg = Str(deg)[split](separator);
-            if (deg[length] - 1) {
-                cx = toFloat(deg[1]);
-                cy = toFloat(deg[2]);
-            }
-            deg = toFloat(deg[0]);
-            if (cx != null) {
-                this._.rt.deg = deg;
-            } else {
-                this._.rt.deg += deg;
-            }
-            cy == null && (cx = null);
-            this._.rt.cx = cx;
-            this._.rt.cy = cy;
-            this.setBox(this.attrs, cx, cy);
-            this.Group.style.rotation = this._.rt.deg;
-            // gradient fix for rotation. TODO
-            // var fill = (this.shape || this.node).getElementsByTagName(fillString);
-            // fill = fill[0] || {};
-            // var b = ((360 - this._.rt.deg) - 270) % 360;
-            // !R.is(fill.angle, "undefined") && (fill.angle = b);
-            return this;
-        };
-        elproto.setBox = function (params, cx, cy) {
-            if (this.removed) {
-                return this;
-            }
-            var gs = this.Group.style,
-                os = (this.shape && this.shape.style) || this.node.style;
-            params = params || {};
-            for (var i in params) if (params[has](i)) {
-                this.attrs[i] = params[i];
-            }
-            cx = cx || this._.rt.cx;
-            cy = cy || this._.rt.cy;
-            var attr = this.attrs,
-                x,
-                y,
-                w,
-                h;
-            switch (this.type) {
-                case "circle":
-                    x = attr.cx - attr.r;
-                    y = attr.cy - attr.r;
-                    w = h = attr.r * 2;
-                    break;
-                case "ellipse":
-                    x = attr.cx - attr.rx;
-                    y = attr.cy - attr.ry;
-                    w = attr.rx * 2;
-                    h = attr.ry * 2;
-                    break;
-                case "image":
-                    x = +attr.x;
-                    y = +attr.y;
-                    w = attr.width || 0;
-                    h = attr.height || 0;
-                    break;
-                case "text":
-                    this.textpath.v = ["m", round(attr.x), ", ", round(attr.y - 2), "l", round(attr.x) + 1, ", ", round(attr.y - 2)][join](E);
-                    x = attr.x - round(this.W / 2);
-                    y = attr.y - this.H / 2;
-                    w = this.W;
-                    h = this.H;
-                    break;
-                case "rect":
-                case "path":
-                    if (!this.attrs.path) {
-                        x = 0;
-                        y = 0;
-                        w = this.paper.width;
-                        h = this.paper.height;
-                    } else {
-                        var dim = pathDimensions(this.attrs.path);
-                        x = dim.x;
-                        y = dim.y;
-                        w = dim.width;
-                        h = dim.height;
-                    }
-                    break;
-                default:
-                    x = 0;
-                    y = 0;
-                    w = this.paper.width;
-                    h = this.paper.height;
-                    break;
-            }
-            cx = (cx == null) ? x + w / 2 : cx;
-            cy = (cy == null) ? y + h / 2 : cy;
-            var left = cx - this.paper.width / 2,
-                top = cy - this.paper.height / 2, t;
-            gs.left != (t = left + "px") && (gs.left = t);
-            gs.top != (t = top + "px") && (gs.top = t);
-            this.X = pathlike[has](this.type) ? -left : x;
-            this.Y = pathlike[has](this.type) ? -top : y;
-            this.W = w;
-            this.H = h;
-            if (pathlike[has](this.type)) {
-                os.left != (t = -left * zoom + "px") && (os.left = t);
-                os.top != (t = -top * zoom + "px") && (os.top = t);
-            } else if (this.type == "text") {
-                os.left != (t = -left + "px") && (os.left = t);
-                os.top != (t = -top + "px") && (os.top = t);
-            } else {
-                gs.width != (t = this.paper.width + "px") && (gs.width = t);
-                gs.height != (t = this.paper.height + "px") && (gs.height = t);
-                os.left != (t = x - left + "px") && (os.left = t);
-                os.top != (t = y - top + "px") && (os.top = t);
-                os.width != (t = w + "px") && (os.width = t);
-                os.height != (t = h + "px") && (os.height = t);
-            }
-        };
-        elproto.hide = function () {
-            !this.removed && (this.Group.style.display = "none");
-            return this;
-        };
-        elproto.show = function () {
-            !this.removed && (this.Group.style.display = "block");
-            return this;
-        };
-        elproto.getBBox = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (pathlike[has](this.type)) {
-                return pathDimensions(this.attrs.path);
-            }
-            return {
-                x: this.X + (this.bbx || 0),
-                y: this.Y,
-                width: this.W,
-                height: this.H
-            };
-        };
-        elproto.remove = function () {
-            if (this.removed) {
-                return;
-            }
-            tear(this, this.paper);
-            this.node.parentNode.removeChild(this.node);
-            this.Group.parentNode.removeChild(this.Group);
-            this.shape && this.shape.parentNode.removeChild(this.shape);
-            for (var i in this) {
-                delete this[i];
-            }
-            this.removed = true;
-        };
-        elproto.attr = function (name, value) {
-            if (this.removed) {
-                return this;
-            }
-            if (name == null) {
-                var res = {};
-                for (var i in this.attrs) if (this.attrs[has](i)) {
-                    res[i] = this.attrs[i];
-                }
-                this._.rt.deg && (res.rotation = this.rotate());
-                (this._.sx != 1 || this._.sy != 1) && (res.scale = this.scale());
-                res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-                return res;
-            }
-            if (value == null && R.is(name, "string")) {
-                if (name == "translation") {
-                    return translate.call(this);
-                }
-                if (name == "rotation") {
-                    return this.rotate();
-                }
-                if (name == "scale") {
-                    return this.scale();
-                }
-                if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
-                    return this.attrs.gradient;
-                }
-                return this.attrs[name];
-            }
-            if (this.attrs && value == null && R.is(name, array)) {
-                var ii, values = {};
-                for (i = 0, ii = name[length]; i < ii; i++) {
-                    values[name[i]] = this.attr(name[i]);
-                }
-                return values;
-            }
-            var params;
-            if (value != null) {
-                params = {};
-                params[name] = value;
-            }
-            value == null && R.is(name, "object") && (params = name);
-            if (params) {
-                for (var key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-                    var par = this.paper.customAttributes[key].apply(this, [][concat](params[key]));
-                    this.attrs[key] = params[key];
-                    for (var subkey in par) if (par[has](subkey)) {
-                        params[subkey] = par[subkey];
-                    }
-                }
-                if (params.text && this.type == "text") {
-                    this.node.string = params.text;
-                }
-                setFillAndStroke(this, params);
-                if (params.gradient && (({circle: 1, ellipse: 1})[has](this.type) || Str(params.gradient).charAt() != "r")) {
-                    addGradientFill(this, params.gradient);
-                }
-                (!pathlike[has](this.type) || this._.rt.deg) && this.setBox(this.attrs);
-            }
-            return this;
-        };
-        elproto.toFront = function () {
-            !this.removed && this.Group.parentNode[appendChild](this.Group);
-            this.paper.top != this && tofront(this, this.paper);
-            return this;
-        };
-        elproto.toBack = function () {
-            if (this.removed) {
-                return this;
-            }
-            if (this.Group.parentNode.firstChild != this.Group) {
-                this.Group.parentNode.insertBefore(this.Group, this.Group.parentNode.firstChild);
-                toback(this, this.paper);
-            }
-            return this;
-        };
-        elproto.insertAfter = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            if (element.constructor == Set) {
-                element = element[element.length - 1];
-            }
-            if (element.Group.nextSibling) {
-                element.Group.parentNode.insertBefore(this.Group, element.Group.nextSibling);
-            } else {
-                element.Group.parentNode[appendChild](this.Group);
-            }
-            insertafter(this, element, this.paper);
-            return this;
-        };
-        elproto.insertBefore = function (element) {
-            if (this.removed) {
-                return this;
-            }
-            if (element.constructor == Set) {
-                element = element[0];
-            }
-            element.Group.parentNode.insertBefore(this.Group, element.Group);
-            insertbefore(this, element, this.paper);
-            return this;
-        };
-        elproto.blur = function (size) {
-            var s = this.node.runtimeStyle,
-                f = s.filter;
-            f = f.replace(blurregexp, E);
-            if (+size !== 0) {
-                this.attrs.blur = size;
-                s.filter = f + S + ms + ".Blur(pixelradius=" + (+size || 1.5) + ")";
-                s.margin = R.format("-{0}px 0 0 -{0}px", round(+size || 1.5));
-            } else {
-                s.filter = f;
-                s.margin = 0;
-                delete this.attrs.blur;
-            }
-        };
- 
-        theCircle = function (vml, x, y, r) {
-            var g = createNode("group"),
-                o = createNode("oval"),
-                ol = o.style;
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "circle";
-            setFillAndStroke(res, {stroke: "#000", fill: "none"});
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.r = r;
-            res.setBox({x: x - r, y: y - r, width: r * 2, height: r * 2});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        function rectPath(x, y, w, h, r) {
-            if (r) {
-                return R.format("M{0},{1}l{2},0a{3},{3},0,0,1,{3},{3}l0,{5}a{3},{3},0,0,1,{4},{3}l{6},0a{3},{3},0,0,1,{4},{4}l0,{7}a{3},{3},0,0,1,{3},{4}z", x + r, y, w - r * 2, r, -r, h - r * 2, r * 2 - w, r * 2 - h);
-            } else {
-                return R.format("M{0},{1}l{2},0,0,{3},{4},0z", x, y, w, h, -w);
-            }
-        }
-        theRect = function (vml, x, y, w, h, r) {
-            var path = rectPath(x, y, w, h, r),
-                res = vml.path(path),
-                a = res.attrs;
-            res.X = a.x = x;
-            res.Y = a.y = y;
-            res.W = a.width = w;
-            res.H = a.height = h;
-            a.r = r;
-            a.path = path;
-            res.type = "rect";
-            return res;
-        };
-        theEllipse = function (vml, x, y, rx, ry) {
-            var g = createNode("group"),
-                o = createNode("oval"),
-                ol = o.style;
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "ellipse";
-            setFillAndStroke(res, {stroke: "#000"});
-            res.attrs.cx = x;
-            res.attrs.cy = y;
-            res.attrs.rx = rx;
-            res.attrs.ry = ry;
-            res.setBox({x: x - rx, y: y - ry, width: rx * 2, height: ry * 2});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        theImage = function (vml, src, x, y, w, h) {
-            var g = createNode("group"),
-                o = createNode("image");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            o.src = src;
-            g[appendChild](o);
-            var res = new Element(o, g, vml);
-            res.type = "image";
-            res.attrs.src = src;
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.w = w;
-            res.attrs.h = h;
-            res.setBox({x: x, y: y, width: w, height: h});
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        theText = function (vml, x, y, text) {
-            var g = createNode("group"),
-                el = createNode("shape"),
-                ol = el.style,
-                path = createNode("path"),
-                ps = path.style,
-                o = createNode("textpath");
-            g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px";
-            g.coordsize = coordsize;
-            g.coordorigin = vml.coordorigin;
-            path.v = R.format("m{0},{1}l{2},{1}", round(x * 10), round(y * 10), round(x * 10) + 1);
-            path.textpathok = true;
-            ol.width = vml.width;
-            ol.height = vml.height;
-            o.string = Str(text);
-            o.on = true;
-            el[appendChild](o);
-            el[appendChild](path);
-            g[appendChild](el);
-            var res = new Element(o, g, vml);
-            res.shape = el;
-            res.textpath = path;
-            res.type = "text";
-            res.attrs.text = text;
-            res.attrs.x = x;
-            res.attrs.y = y;
-            res.attrs.w = 1;
-            res.attrs.h = 1;
-            setFillAndStroke(res, {font: availableAttrs.font, stroke: "none", fill: "#000"});
-            res.setBox();
-            vml.canvas[appendChild](g);
-            return res;
-        };
-        setSize = function (width, height) {
-            var cs = this.canvas.style;
-            width == +width && (width += "px");
-            height == +height && (height += "px");
-            cs.width = width;
-            cs.height = height;
-            cs.clip = "rect(0 " + width + " " + height + " 0)";
-            return this;
-        };
-        var createNode;
-        doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-        try {
-            !doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-            createNode = function (tagName) {
-                return doc.createElement('<rvml:' + tagName + ' class="rvml">');
-            };
-        } catch (e) {
-            createNode = function (tagName) {
-                return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-            };
-        }
-        create = function () {
-            var con = getContainer[apply](0, arguments),
-                container = con.container,
-                height = con.height,
-                s,
-                width = con.width,
-                x = con.x,
-                y = con.y;
-            if (!container) {
-                throw new Error("VML container not found.");
-            }
-            var res = new Paper,
-                c = res.canvas = doc.createElement("div"),
-                cs = c.style;
-            x = x || 0;
-            y = y || 0;
-            width = width || 512;
-            height = height || 342;
-            width == +width && (width += "px");
-            height == +height && (height += "px");
-            res.width = 1e3;
-            res.height = 1e3;
-            res.coordsize = zoom * 1e3 + S + zoom * 1e3;
-            res.coordorigin = "0 0";
-            res.span = doc.createElement("span");
-            res.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
-            c[appendChild](res.span);
-            cs.cssText = R.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden", width, height);
-            if (container == 1) {
-                doc.body[appendChild](c);
-                cs.left = x + "px";
-                cs.top = y + "px";
-                cs.position = "absolute";
-            } else {
-                if (container.firstChild) {
-                    container.insertBefore(c, container.firstChild);
-                } else {
-                    container[appendChild](c);
-                }
-            }
-            plugins.call(res, res, R.fn);
-            return res;
-        };
-        paperproto.clear = function () {
-            this.canvas.innerHTML = E;
-            this.span = doc.createElement("span");
-            this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
-            this.canvas[appendChild](this.span);
-            this.bottom = this.top = null;
-        };
-        paperproto.remove = function () {
-            this.canvas.parentNode.removeChild(this.canvas);
-            for (var i in this) {
-                this[i] = removed(i);
-            }
-            return true;
-        };
-    }
- 
-    // rest
-    // WebKit rendering bug workaround method
-    var version = navigator.userAgent.match(/Version\/(.*?)\s/);
-    if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP")) {
-        paperproto.safari = function () {
-            var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"});
-            win.setTimeout(function () {rect.remove();});
-        };
-    } else {
-        paperproto.safari = function () {};
-    }
- 
-    // Events
-    var preventDefault = function () {
-        this.returnValue = false;
-    },
-    preventTouch = function () {
-        return this.originalEvent.preventDefault();
-    },
-    stopPropagation = function () {
-        this.cancelBubble = true;
-    },
-    stopTouch = function () {
-        return this.originalEvent.stopPropagation();
-    },
-    addEvent = (function () {
-        if (doc.addEventListener) {
-            return function (obj, type, fn, element) {
-                var realName = supportsTouch && touchMap[type] ? touchMap[type] : type;
-                var f = function (e) {
-                    if (supportsTouch && touchMap[has](type)) {
-                        for (var i = 0, ii = e.targetTouches && e.targetTouches.length; i < ii; i++) {
-                            if (e.targetTouches[i].target == obj) {
-                                var olde = e;
-                                e = e.targetTouches[i];
-                                e.originalEvent = olde;
-                                e.preventDefault = preventTouch;
-                                e.stopPropagation = stopTouch;
-                                break;
-                            }
-                        }
-                    }
-                    return fn.call(element, e);
-                };
-                obj.addEventListener(realName, f, false);
-                return function () {
-                    obj.removeEventListener(realName, f, false);
-                    return true;
-                };
-            };
-        } else if (doc.attachEvent) {
-            return function (obj, type, fn, element) {
-                var f = function (e) {
-                    e = e || win.event;
-                    e.preventDefault = e.preventDefault || preventDefault;
-                    e.stopPropagation = e.stopPropagation || stopPropagation;
-                    return fn.call(element, e);
-                };
-                obj.attachEvent("on" + type, f);
-                var detacher = function () {
-                    obj.detachEvent("on" + type, f);
-                    return true;
-                };
-                return detacher;
-            };
-        }
-    })(),
-    drag = [],
-    dragMove = function (e) {
-        var x = e.clientX,
-            y = e.clientY,
-            scrollY = doc.documentElement.scrollTop || doc.body.scrollTop,
-            scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft,
-            dragi,
-            j = drag.length;
-        while (j--) {
-            dragi = drag[j];
-            if (supportsTouch) {
-                var i = e.touches.length,
-                    touch;
-                while (i--) {
-                    touch = e.touches[i];
-                    if (touch.identifier == dragi.el._drag.id) {
-                        x = touch.clientX;
-                        y = touch.clientY;
-                        (e.originalEvent ? e.originalEvent : e).preventDefault();
-                        break;
-                    }
-                }
-            } else {
-                e.preventDefault();
-            }
-            x += scrollX;
-            y += scrollY;
-            dragi.move && dragi.move.call(dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
-        }
-    },
-    dragUp = function (e) {
-        R.unmousemove(dragMove).unmouseup(dragUp);
-        var i = drag.length,
-            dragi;
-        while (i--) {
-            dragi = drag[i];
-            dragi.el._drag = {};
-            dragi.end && dragi.end.call(dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
-        }
-        drag = [];
-    };
-    for (var i = events[length]; i--;) {
-        (function (eventName) {
-            R[eventName] = Element[proto][eventName] = function (fn, scope) {
-                if (R.is(fn, "function")) {
-                    this.events = this.events || [];
-                    this.events.push({name: eventName, f: fn, unbind: addEvent(this.shape || this.node || doc, eventName, fn, scope || this)});
-                }
-                return this;
-            };
-            R["un" + eventName] = Element[proto]["un" + eventName] = function (fn) {
-                var events = this.events,
-                    l = events[length];
-                while (l--) if (events[l].name == eventName && events[l].f == fn) {
-                    events[l].unbind();
-                    events.splice(l, 1);
-                    !events.length && delete this.events;
-                    return this;
-                }
-                return this;
-            };
-        })(events[i]);
-    }
-    elproto.hover = function (f_in, f_out, scope_in, scope_out) {
-        return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in);
-    };
-    elproto.unhover = function (f_in, f_out) {
-        return this.unmouseover(f_in).unmouseout(f_out);
-    };
-    elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) {
-        this._drag = {};
-        this.mousedown(function (e) {
-            (e.originalEvent || e).preventDefault();
-            var scrollY = doc.documentElement.scrollTop || doc.body.scrollTop,
-                scrollX = doc.documentElement.scrollLeft || doc.body.scrollLeft;
-            this._drag.x = e.clientX + scrollX;
-            this._drag.y = e.clientY + scrollY;
-            this._drag.id = e.identifier;
-            onstart && onstart.call(start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
-            !drag.length && R.mousemove(dragMove).mouseup(dragUp);
-            drag.push({el: this, move: onmove, end: onend, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
-        });
-        return this;
-    };
-    elproto.undrag = function (onmove, onstart, onend) {
-        var i = drag.length;
-        while (i--) {
-            drag[i].el == this && (drag[i].move == onmove && drag[i].end == onend) && drag.splice(i++, 1);
-        }
-        !drag.length && R.unmousemove(dragMove).unmouseup(dragUp);
-    };
-    paperproto.circle = function (x, y, r) {
-        return theCircle(this, x || 0, y || 0, r || 0);
-    };
-    paperproto.rect = function (x, y, w, h, r) {
-        return theRect(this, x || 0, y || 0, w || 0, h || 0, r || 0);
-    };
-    paperproto.ellipse = function (x, y, rx, ry) {
-        return theEllipse(this, x || 0, y || 0, rx || 0, ry || 0);
-    };
-    paperproto.path = function (pathString) {
-        pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
-        return thePath(R.format[apply](R, arguments), this);
-    };
-    paperproto.image = function (src, x, y, w, h) {
-        return theImage(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0);
-    };
-    paperproto.text = function (x, y, text) {
-        return theText(this, x || 0, y || 0, Str(text));
-    };
-    paperproto.set = function (itemsArray) {
-        arguments[length] > 1 && (itemsArray = Array[proto].splice.call(arguments, 0, arguments[length]));
-        return new Set(itemsArray);
-    };
-    paperproto.setSize = setSize;
-    paperproto.top = paperproto.bottom = null;
-    paperproto.raphael = R;
-    function x_y() {
-        return this.x + S + this.y;
-    }
-    elproto.resetScale = function () {
-        if (this.removed) {
-            return this;
-        }
-        this._.sx = 1;
-        this._.sy = 1;
-        this.attrs.scale = "1 1";
-    };
-    elproto.scale = function (x, y, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        if (x == null && y == null) {
-            return {
-                x: this._.sx,
-                y: this._.sy,
-                toString: x_y
-            };
-        }
-        y = y || x;
-        !+y && (y = x);
-        var dx,
-            dy,
-            dcx,
-            dcy,
-            a = this.attrs;
-        if (x != 0) {
-            var bb = this.getBBox(),
-                rcx = bb.x + bb.width / 2,
-                rcy = bb.y + bb.height / 2,
-                kx = abs(x / this._.sx),
-                ky = abs(y / this._.sy);
-            cx = (+cx || cx == 0) ? cx : rcx;
-            cy = (+cy || cy == 0) ? cy : rcy;
-            var posx = this._.sx > 0,
-                posy = this._.sy > 0,
-                dirx = ~~(x / abs(x)),
-                diry = ~~(y / abs(y)),
-                dkx = kx * dirx,
-                dky = ky * diry,
-                s = this.node.style,
-                ncx = cx + abs(rcx - cx) * dkx * (rcx > cx == posx ? 1 : -1),
-                ncy = cy + abs(rcy - cy) * dky * (rcy > cy == posy ? 1 : -1),
-                fr = (x * dirx > y * diry ? ky : kx);
-            switch (this.type) {
-                case "rect":
-                case "image":
-                    var neww = a.width * kx,
-                        newh = a.height * ky;
-                    this.attr({
-                        height: newh,
-                        r: a.r * fr,
-                        width: neww,
-                        x: ncx - neww / 2,
-                        y: ncy - newh / 2
-                    });
-                    break;
-                case "circle":
-                case "ellipse":
-                    this.attr({
-                        rx: a.rx * kx,
-                        ry: a.ry * ky,
-                        r: a.r * fr,
-                        cx: ncx,
-                        cy: ncy
-                    });
-                    break;
-                case "text":
-                    this.attr({
-                        x: ncx,
-                        y: ncy
-                    });
-                    break;
-                case "path":
-                    var path = pathToRelative(a.path),
-                        skip = true,
-                        fx = posx ? dkx : kx,
-                        fy = posy ? dky : ky;
-                    for (var i = 0, ii = path[length]; i < ii; i++) {
-                        var p = path[i],
-                            P0 = upperCase.call(p[0]);
-                        if (P0 == "M" && skip) {
-                            continue;
-                        } else {
-                            skip = false;
-                        }
-                        if (P0 == "A") {
-                            p[path[i][length] - 2] *= fx;
-                            p[path[i][length] - 1] *= fy;
-                            p[1] *= kx;
-                            p[2] *= ky;
-                            p[5] = +(dirx + diry ? !!+p[5] : !+p[5]);
-                        } else if (P0 == "H") {
-                            for (var j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= fx;
-                            }
-                        } else if (P0 == "V") {
-                            for (j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= fy;
-                            }
-                         } else {
-                            for (j = 1, jj = p[length]; j < jj; j++) {
-                                p[j] *= (j % 2) ? fx : fy;
-                            }
-                        }
-                    }
-                    var dim2 = pathDimensions(path);
-                    dx = ncx - dim2.x - dim2.width / 2;
-                    dy = ncy - dim2.y - dim2.height / 2;
-                    path[0][1] += dx;
-                    path[0][2] += dy;
-                    this.attr({path: path});
-                break;
-            }
-            if (this.type in {text: 1, image:1} && (dirx != 1 || diry != 1)) {
-                if (this.transformations) {
-                    this.transformations[2] = "scale("[concat](dirx, ",", diry, ")");
-                    this.node[setAttribute]("transform", this.transformations[join](S));
-                    dx = (dirx == -1) ? -a.x - (neww || 0) : a.x;
-                    dy = (diry == -1) ? -a.y - (newh || 0) : a.y;
-                    this.attr({x: dx, y: dy});
-                    a.fx = dirx - 1;
-                    a.fy = diry - 1;
-                } else {
-                    this.node.filterMatrix = ms + ".Matrix(M11="[concat](dirx,
-                        ", M12=0, M21=0, M22=", diry,
-                        ", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");
-                    s.filter = (this.node.filterMatrix || E) + (this.node.filterOpacity || E);
-                }
-            } else {
-                if (this.transformations) {
-                    this.transformations[2] = E;
-                    this.node[setAttribute]("transform", this.transformations[join](S));
-                    a.fx = 0;
-                    a.fy = 0;
-                } else {
-                    this.node.filterMatrix = E;
-                    s.filter = (this.node.filterMatrix || E) + (this.node.filterOpacity || E);
-                }
-            }
-            a.scale = [x, y, cx, cy][join](S);
-            this._.sx = x;
-            this._.sy = y;
-        }
-        return this;
-    };
-    elproto.clone = function () {
-        if (this.removed) {
-            return null;
-        }
-        var attr = this.attr();
-        delete attr.scale;
-        delete attr.translation;
-        return this.paper[this.type]().attr(attr);
-    };
-    var curveslengths = {},
-    getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
-        var len = 0,
-            precision = 100,
-            name = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y].join(),
-            cache = curveslengths[name],
-            old, dot;
-        !cache && (curveslengths[name] = cache = {data: []});
-        cache.timer && clearTimeout(cache.timer);
-        cache.timer = setTimeout(function () {delete curveslengths[name];}, 2000);
-        if (length != null) {
-            var total = getPointAtSegmentLength(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
-            precision = ~~total * 10;
-        }
-        for (var i = 0; i < precision + 1; i++) {
-            if (cache.data[length] > i) {
-                dot = cache.data[i * precision];
-            } else {
-                dot = R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, i / precision);
-                cache.data[i] = dot;
-            }
-            i && (len += pow(pow(old.x - dot.x, 2) + pow(old.y - dot.y, 2), .5));
-            if (length != null && len >= length) {
-                return dot;
-            }
-            old = dot;
-        }
-        if (length == null) {
-            return len;
-        }
-    },
-    getLengthFactory = function (istotal, subpath) {
-        return function (path, length, onlystart) {
-            path = path2curve(path);
-            var x, y, p, l, sp = "", subpaths = {}, point,
-                len = 0;
-            for (var i = 0, ii = path.length; i < ii; i++) {
-                p = path[i];
-                if (p[0] == "M") {
-                    x = +p[1];
-                    y = +p[2];
-                } else {
-                    l = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                    if (len + l > length) {
-                        if (subpath && !subpaths.start) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            sp += ["C", point.start.x, point.start.y, point.m.x, point.m.y, point.x, point.y];
-                            if (onlystart) {return sp;}
-                            subpaths.start = sp;
-                            sp = ["M", point.x, point.y + "C", point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]][join]();
-                            len += l;
-                            x = +p[5];
-                            y = +p[6];
-                            continue;
-                        }
-                        if (!istotal && !subpath) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            return {x: point.x, y: point.y, alpha: point.alpha};
-                        }
-                    }
-                    len += l;
-                    x = +p[5];
-                    y = +p[6];
-                }
-                sp += p;
-            }
-            subpaths.end = sp;
-            point = istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[1], p[2], p[3], p[4], p[5], p[6], 1);
-            point.alpha && (point = {x: point.x, y: point.y, alpha: point.alpha});
-            return point;
-        };
-    };
-    var getTotalLength = getLengthFactory(1),
-        getPointAtLength = getLengthFactory(),
-        getSubpathsAtLength = getLengthFactory(0, 1);
-    elproto.getTotalLength = function () {
-        if (this.type != "path") {return;}
-        if (this.node.getTotalLength) {
-            return this.node.getTotalLength();
-        }
-        return getTotalLength(this.attrs.path);
-    };
-    elproto.getPointAtLength = function (length) {
-        if (this.type != "path") {return;}
-        return getPointAtLength(this.attrs.path, length);
-    };
-    elproto.getSubpath = function (from, to) {
-        if (this.type != "path") {return;}
-        if (abs(this.getTotalLength() - to) < "1e-6") {
-            return getSubpathsAtLength(this.attrs.path, from).end;
-        }
-        var a = getSubpathsAtLength(this.attrs.path, to, 1);
-        return from ? getSubpathsAtLength(a, from).end : a;
-    };
-
-    // animation easing formulas
-    R.easing_formulas = {
-        linear: function (n) {
-            return n;
-        },
-        "<": function (n) {
-            return pow(n, 3);
-        },
-        ">": function (n) {
-            return pow(n - 1, 3) + 1;
-        },
-        "<>": function (n) {
-            n = n * 2;
-            if (n < 1) {
-                return pow(n, 3) / 2;
-            }
-            n -= 2;
-            return (pow(n, 3) + 2) / 2;
-        },
-        backIn: function (n) {
-            var s = 1.70158;
-            return n * n * ((s + 1) * n - s);
-        },
-        backOut: function (n) {
-            n = n - 1;
-            var s = 1.70158;
-            return n * n * ((s + 1) * n + s) + 1;
-        },
-        elastic: function (n) {
-            if (n == 0 || n == 1) {
-                return n;
-            }
-            var p = .3,
-                s = p / 4;
-            return pow(2, -10 * n) * math.sin((n - s) * (2 * PI) / p) + 1;
-        },
-        bounce: function (n) {
-            var s = 7.5625,
-                p = 2.75,
-                l;
-            if (n < (1 / p)) {
-                l = s * n * n;
-            } else {
-                if (n < (2 / p)) {
-                    n -= (1.5 / p);
-                    l = s * n * n + .75;
-                } else {
-                    if (n < (2.5 / p)) {
-                        n -= (2.25 / p);
-                        l = s * n * n + .9375;
-                    } else {
-                        n -= (2.625 / p);
-                        l = s * n * n + .984375;
-                    }
-                }
-            }
-            return l;
-        }
-    };
-
-    var animationElements = [],
-        animation = function () {
-            var Now = +new Date;
-            for (var l = 0; l < animationElements[length]; l++) {
-                var e = animationElements[l];
-                if (e.stop || e.el.removed) {
-                    continue;
-                }
-                var time = Now - e.start,
-                    ms = e.ms,
-                    easing = e.easing,
-                    from = e.from,
-                    diff = e.diff,
-                    to = e.to,
-                    t = e.t,
-                    that = e.el,
-                    set = {},
-                    now;
-                if (time < ms) {
-                    var pos = easing(time / ms);
-                    for (var attr in from) if (from[has](attr)) {
-                        switch (availableAnimAttrs[attr]) {
-                            case "along":
-                                now = pos * ms * diff[attr];
-                                to.back && (now = to.len - now);
-                                var point = getPointAtLength(to[attr], now);
-                                that.translate(diff.sx - diff.x || 0, diff.sy - diff.y || 0);
-                                diff.x = point.x;
-                                diff.y = point.y;
-                                that.translate(point.x - diff.sx, point.y - diff.sy);
-                                to.rot && that.rotate(diff.r + point.alpha, point.x, point.y);
-                                break;
-                            case nu:
-                                now = +from[attr] + pos * ms * diff[attr];
-                                break;
-                            case "colour":
-                                now = "rgb(" + [
-                                    upto255(round(from[attr].r + pos * ms * diff[attr].r)),
-                                    upto255(round(from[attr].g + pos * ms * diff[attr].g)),
-                                    upto255(round(from[attr].b + pos * ms * diff[attr].b))
-                                ][join](",") + ")";
-                                break;
-                            case "path":
-                                now = [];
-                                for (var i = 0, ii = from[attr][length]; i < ii; i++) {
-                                    now[i] = [from[attr][i][0]];
-                                    for (var j = 1, jj = from[attr][i][length]; j < jj; j++) {
-                                        now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
-                                    }
-                                    now[i] = now[i][join](S);
-                                }
-                                now = now[join](S);
-                                break;
-                            case "csv":
-                                switch (attr) {
-                                    case "translation":
-                                        var x = pos * ms * diff[attr][0] - t.x,
-                                            y = pos * ms * diff[attr][1] - t.y;
-                                        t.x += x;
-                                        t.y += y;
-                                        now = x + S + y;
-                                    break;
-                                    case "rotation":
-                                        now = +from[attr][0] + pos * ms * diff[attr][0];
-                                        from[attr][1] && (now += "," + from[attr][1] + "," + from[attr][2]);
-                                    break;
-                                    case "scale":
-                                        now = [+from[attr][0] + pos * ms * diff[attr][0], +from[attr][1] + pos * ms * diff[attr][1], (2 in to[attr] ? to[attr][2] : E), (3 in to[attr] ? to[attr][3] : E)][join](S);
-                                    break;
-                                    case "clip-rect":
-                                        now = [];
-                                        i = 4;
-                                        while (i--) {
-                                            now[i] = +from[attr][i] + pos * ms * diff[attr][i];
-                                        }
-                                    break;
-                                }
-                                break;
-                            default:
-                              var from2 = [].concat(from[attr]);
-                                now = [];
-                                i = that.paper.customAttributes[attr].length;
-                                while (i--) {
-                                    now[i] = +from2[i] + pos * ms * diff[attr][i];
-                                }
-                                break;
-                        }
-                        set[attr] = now;
-                    }
-                    that.attr(set);
-                    that._run && that._run.call(that);
-                } else {
-                    if (to.along) {
-                        point = getPointAtLength(to.along, to.len * !to.back);
-                        that.translate(diff.sx - (diff.x || 0) + point.x - diff.sx, diff.sy - (diff.y || 0) + point.y - diff.sy);
-                        to.rot && that.rotate(diff.r + point.alpha, point.x, point.y);
-                    }
-                    (t.x || t.y) && that.translate(-t.x, -t.y);
-                    to.scale && (to.scale += E);
-                    that.attr(to);
-                    animationElements.splice(l--, 1);
-                }
-            }
-            R.svg && that && that.paper && that.paper.safari();
-            animationElements[length] && setTimeout(animation);
-        },
-        keyframesRun = function (attr, element, time, prev, prevcallback) {
-            var dif = time - prev;
-            element.timeouts.push(setTimeout(function () {
-                R.is(prevcallback, "function") && prevcallback.call(element);
-                element.animate(attr, dif, attr.easing);
-            }, prev));
-        },
-        upto255 = function (color) {
-            return mmax(mmin(color, 255), 0);
-        },
-        translate = function (x, y) {
-            if (x == null) {
-                return {x: this._.tx, y: this._.ty, toString: x_y};
-            }
-            this._.tx += +x;
-            this._.ty += +y;
-            switch (this.type) {
-                case "circle":
-                case "ellipse":
-                    this.attr({cx: +x + this.attrs.cx, cy: +y + this.attrs.cy});
-                    break;
-                case "rect":
-                case "image":
-                case "text":
-                    this.attr({x: +x + this.attrs.x, y: +y + this.attrs.y});
-                    break;
-                case "path":
-                    var path = pathToRelative(this.attrs.path);
-                    path[0][1] += +x;
-                    path[0][2] += +y;
-                    this.attr({path: path});
-                break;
-            }
-            return this;
-        };
-    elproto.animateWith = function (element, params, ms, easing, callback) {
-        for (var i = 0, ii = animationElements.length; i < ii; i++) {
-            if (animationElements[i].el.id == element.id) {
-                params.start = animationElements[i].start;
-            }
-        }
-        return this.animate(params, ms, easing, callback);
-    };
-    elproto.animateAlong = along();
-    elproto.animateAlongBack = along(1);
-    function along(isBack) {
-        return function (path, ms, rotate, callback) {
-            var params = {back: isBack};
-            R.is(rotate, "function") ? (callback = rotate) : (params.rot = rotate);
-            path && path.constructor == Element && (path = path.attrs.path);
-            path && (params.along = path);
-            return this.animate(params, ms, callback);
-        };
-    }
-    function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
-        var cx = 3 * p1x,
-            bx = 3 * (p2x - p1x) - cx,
-            ax = 1 - cx - bx,
-            cy = 3 * p1y,
-            by = 3 * (p2y - p1y) - cy,
-            ay = 1 - cy - by;
-        function sampleCurveX(t) {
-            return ((ax * t + bx) * t + cx) * t;
-        }
-        function solve(x, epsilon) {
-            var t = solveCurveX(x, epsilon);
-            return ((ay * t + by) * t + cy) * t;
-        }
-        function solveCurveX(x, epsilon) {
-            var t0, t1, t2, x2, d2, i;
-            for(t2 = x, i = 0; i < 8; i++) {
-                x2 = sampleCurveX(t2) - x;
-                if (abs(x2) < epsilon) {
-                    return t2;
-                }
-                d2 = (3 * ax * t2 + 2 * bx) * t2 + cx;
-                if (abs(d2) < 1e-6) {
-                    break;
-                }
-                t2 = t2 - x2 / d2;
-            }
-            t0 = 0;
-            t1 = 1;
-            t2 = x;
-            if (t2 < t0) {
-                return t0;
-            }
-            if (t2 > t1) {
-                return t1;
-            }
-            while (t0 < t1) {
-                x2 = sampleCurveX(t2);
-                if (abs(x2 - x) < epsilon) {
-                    return t2;
-                }
-                if (x > x2) {
-                    t0 = t2;
-                } else {
-                    t1 = t2;
-                }
-                t2 = (t1 - t0) / 2 + t0;
-            }
-            return t2;
-        }
-        return solve(t, 1 / (200 * duration));
-    }
-    elproto.onAnimation = function (f) {
-        this._run = f || 0;
-        return this;
-    };
-    elproto.animate = function (params, ms, easing, callback) {
-        var element = this;
-        element.timeouts = element.timeouts || [];
-        if (R.is(easing, "function") || !easing) {
-            callback = easing || null;
-        }
-        if (element.removed) {
-            callback && callback.call(element);
-            return element;
-        }
-        var from = {},
-            to = {},
-            animateable = false,
-            diff = {};
-        for (var attr in params) if (params[has](attr)) {
-            if (availableAnimAttrs[has](attr) || element.paper.customAttributes[has](attr)) {
-                animateable = true;
-                from[attr] = element.attr(attr);
-                (from[attr] == null) && (from[attr] = availableAttrs[attr]);
-                to[attr] = params[attr];
-                switch (availableAnimAttrs[attr]) {
-                    case "along":
-                        var len = getTotalLength(params[attr]);
-                        var point = getPointAtLength(params[attr], len * !!params.back);
-                        var bb = element.getBBox();
-                        diff[attr] = len / ms;
-                        diff.tx = bb.x;
-                        diff.ty = bb.y;
-                        diff.sx = point.x;
-                        diff.sy = point.y;
-                        to.rot = params.rot;
-                        to.back = params.back;
-                        to.len = len;
-                        params.rot && (diff.r = toFloat(element.rotate()) || 0);
-                        break;
-                    case nu:
-                        diff[attr] = (to[attr] - from[attr]) / ms;
-                        break;
-                    case "colour":
-                        from[attr] = R.getRGB(from[attr]);
-                        var toColour = R.getRGB(to[attr]);
-                        diff[attr] = {
-                            r: (toColour.r - from[attr].r) / ms,
-                            g: (toColour.g - from[attr].g) / ms,
-                            b: (toColour.b - from[attr].b) / ms
-                        };
-                        break;
-                    case "path":
-                        var pathes = path2curve(from[attr], to[attr]);
-                        from[attr] = pathes[0];
-                        var toPath = pathes[1];
-                        diff[attr] = [];
-                        for (var i = 0, ii = from[attr][length]; i < ii; i++) {
-                            diff[attr][i] = [0];
-                            for (var j = 1, jj = from[attr][i][length]; j < jj; j++) {
-                                diff[attr][i][j] = (toPath[i][j] - from[attr][i][j]) / ms;
-                            }
-                        }
-                        break;
-                    case "csv":
-                        var values = Str(params[attr])[split](separator),
-                            from2 = Str(from[attr])[split](separator);
-                        switch (attr) {
-                            case "translation":
-                                from[attr] = [0, 0];
-                                diff[attr] = [values[0] / ms, values[1] / ms];
-                            break;
-                            case "rotation":
-                                from[attr] = (from2[1] == values[1] && from2[2] == values[2]) ? from2 : [0, values[1], values[2]];
-                                diff[attr] = [(values[0] - from[attr][0]) / ms, 0, 0];
-                            break;
-                            case "scale":
-                                params[attr] = values;
-                                from[attr] = Str(from[attr])[split](separator);
-                                diff[attr] = [(values[0] - from[attr][0]) / ms, (values[1] - from[attr][1]) / ms, 0, 0];
-                            break;
-                            case "clip-rect":
-                                from[attr] = Str(from[attr])[split](separator);
-                                diff[attr] = [];
-                                i = 4;
-                                while (i--) {
-                                    diff[attr][i] = (values[i] - from[attr][i]) / ms;
-                                }
-                            break;
-                        }
-                        to[attr] = values;
-                        break;
-                    default:
-                        values = [].concat(params[attr]);
-                        from2 = [].concat(from[attr]);
-                        diff[attr] = [];
-                        i = element.paper.customAttributes[attr][length];
-                        while (i--) {
-                            diff[attr][i] = ((values[i] || 0) - (from2[i] || 0)) / ms;
-                        }
-                        break;
-                }
-            }
-        }
-        if (!animateable) {
-            var attrs = [],
-                lastcall;
-            for (var key in params) if (params[has](key) && animKeyFrames.test(key)) {
-                attr = {value: params[key]};
-                key == "from" && (key = 0);
-                key == "to" && (key = 100);
-                attr.key = toInt(key, 10);
-                attrs.push(attr);
-            }
-            attrs.sort(sortByKey);
-            if (attrs[0].key) {
-                attrs.unshift({key: 0, value: element.attrs});
-            }
-            for (i = 0, ii = attrs[length]; i < ii; i++) {
-                keyframesRun(attrs[i].value, element, ms / 100 * attrs[i].key, ms / 100 * (attrs[i - 1] && attrs[i - 1].key || 0), attrs[i - 1] && attrs[i - 1].value.callback);
-            }
-            lastcall = attrs[attrs[length] - 1].value.callback;
-            if (lastcall) {
-                element.timeouts.push(setTimeout(function () {lastcall.call(element);}, ms));
-            }
-        } else {
-            var easyeasy = R.easing_formulas[easing];
-            if (!easyeasy) {
-                easyeasy = Str(easing).match(bezierrg);
-                if (easyeasy && easyeasy[length] == 5) {
-                    var curve = easyeasy;
-                    easyeasy = function (t) {
-                        return CubicBezierAtTime(t, +curve[1], +curve[2], +curve[3], +curve[4], ms);
-                    };
-                } else {
-                    easyeasy = function (t) {
-                        return t;
-                    };
-                }
-            }
-            animationElements.push({
-                start: params.start || +new Date,
-                ms: ms,
-                easing: easyeasy,
-                from: from,
-                diff: diff,
-                to: to,
-                el: element,
-                t: {x: 0, y: 0}
-            });
-            R.is(callback, "function") && (element._ac = setTimeout(function () {
-                callback.call(element);
-            }, ms));
-            animationElements[length] == 1 && setTimeout(animation);
-        }
-        return this;
-    };
-    elproto.stop = function () {
-        for (var i = 0; i < animationElements.length; i++) {
-            animationElements[i].el.id == this.id && animationElements.splice(i--, 1);
-        }
-        for (i = 0, ii = this.timeouts && this.timeouts.length; i < ii; i++) {
-            clearTimeout(this.timeouts[i]);
-        }
-        this.timeouts = [];
-        clearTimeout(this._ac);
-        delete this._ac;
-        return this;
-    };
-    elproto.translate = function (x, y) {
-        return this.attr({translation: x + " " + y});
-    };
-    elproto[toString] = function () {
-        return "Rapha\xebl\u2019s object";
-    };
-    R.ae = animationElements;
- 
-    // Set
-    var Set = function (items) {
-        this.items = [];
-        this[length] = 0;
-        this.type = "set";
-        if (items) {
-            for (var i = 0, ii = items[length]; i < ii; i++) {
-                if (items[i] && (items[i].constructor == Element || items[i].constructor == Set)) {
-                    this[this.items[length]] = this.items[this.items[length]] = items[i];
-                    this[length]++;
-                }
-            }
-        }
-    };
-    Set[proto][push] = function () {
-        var item,
-            len;
-        for (var i = 0, ii = arguments[length]; i < ii; i++) {
-            item = arguments[i];
-            if (item && (item.constructor == Element || item.constructor == Set)) {
-                len = this.items[length];
-                this[len] = this.items[len] = item;
-                this[length]++;
-            }
-        }
-        return this;
-    };
-    Set[proto].pop = function () {
-        delete this[this[length]--];
-        return this.items.pop();
-    };
-    for (var method in elproto) if (elproto[has](method)) {
-        Set[proto][method] = (function (methodname) {
-            return function () {
-                for (var i = 0, ii = this.items[length]; i < ii; i++) {
-                    this.items[i][methodname][apply](this.items[i], arguments);
-                }
-                return this;
-            };
-        })(method);
-    }
-    Set[proto].attr = function (name, value) {
-        if (name && R.is(name, array) && R.is(name[0], "object")) {
-            for (var j = 0, jj = name[length]; j < jj; j++) {
-                this.items[j].attr(name[j]);
-            }
-        } else {
-            for (var i = 0, ii = this.items[length]; i < ii; i++) {
-                this.items[i].attr(name, value);
-            }
-        }
-        return this;
-    };
-    Set[proto].animate = function (params, ms, easing, callback) {
-        (R.is(easing, "function") || !easing) && (callback = easing || null);
-        var len = this.items[length],
-            i = len,
-            item,
-            set = this,
-            collector;
-        callback && (collector = function () {
-            !--len && callback.call(set);
-        });
-        easing = R.is(easing, string) ? easing : collector;
-        item = this.items[--i].animate(params, ms, easing, collector);
-        while (i--) {
-            this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, params, ms, easing, collector);
-        }
-        return this;
-    };
-    Set[proto].insertAfter = function (el) {
-        var i = this.items[length];
-        while (i--) {
-            this.items[i].insertAfter(el);
-        }
-        return this;
-    };
-    Set[proto].getBBox = function () {
-        var x = [],
-            y = [],
-            w = [],
-            h = [];
-        for (var i = this.items[length]; i--;) {
-            var box = this.items[i].getBBox();
-            x[push](box.x);
-            y[push](box.y);
-            w[push](box.x + box.width);
-            h[push](box.y + box.height);
-        }
-        x = mmin[apply](0, x);
-        y = mmin[apply](0, y);
-        return {
-            x: x,
-            y: y,
-            width: mmax[apply](0, w) - x,
-            height: mmax[apply](0, h) - y
-        };
-    };
-    Set[proto].clone = function (s) {
-        s = new Set;
-        for (var i = 0, ii = this.items[length]; i < ii; i++) {
-            s[push](this.items[i].clone());
-        }
-        return s;
-    };
-
-    R.registerFont = function (font) {
-        if (!font.face) {
-            return font;
-        }
-        this.fonts = this.fonts || {};
-        var fontcopy = {
-                w: font.w,
-                face: {},
-                glyphs: {}
-            },
-            family = font.face["font-family"];
-        for (var prop in font.face) if (font.face[has](prop)) {
-            fontcopy.face[prop] = font.face[prop];
-        }
-        if (this.fonts[family]) {
-            this.fonts[family][push](fontcopy);
-        } else {
-            this.fonts[family] = [fontcopy];
-        }
-        if (!font.svg) {
-            fontcopy.face["units-per-em"] = toInt(font.face["units-per-em"], 10);
-            for (var glyph in font.glyphs) if (font.glyphs[has](glyph)) {
-                var path = font.glyphs[glyph];
-                fontcopy.glyphs[glyph] = {
-                    w: path.w,
-                    k: {},
-                    d: path.d && "M" + path.d[rp](/[mlcxtrv]/g, function (command) {
-                            return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
-                        }) + "z"
-                };
-                if (path.k) {
-                    for (var k in path.k) if (path[has](k)) {
-                        fontcopy.glyphs[glyph].k[k] = path.k[k];
-                    }
-                }
-            }
-        }
-        return font;
-    };
-    paperproto.getFont = function (family, weight, style, stretch) {
-        stretch = stretch || "normal";
-        style = style || "normal";
-        weight = +weight || {normal: 400, bold: 700, lighter: 300, bolder: 800}[weight] || 400;
-        if (!R.fonts) {
-            return;
-        }
-        var font = R.fonts[family];
-        if (!font) {
-            var name = new RegExp("(^|\\s)" + family[rp](/[^\w\d\s+!~.:_-]/g, E) + "(\\s|$)", "i");
-            for (var fontName in R.fonts) if (R.fonts[has](fontName)) {
-                if (name.test(fontName)) {
-                    font = R.fonts[fontName];
-                    break;
-                }
-            }
-        }
-        var thefont;
-        if (font) {
-            for (var i = 0, ii = font[length]; i < ii; i++) {
-                thefont = font[i];
-                if (thefont.face["font-weight"] == weight && (thefont.face["font-style"] == style || !thefont.face["font-style"]) && thefont.face["font-stretch"] == stretch) {
-                    break;
-                }
-            }
-        }
-        return thefont;
-    };
-    paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
-        origin = origin || "middle"; // baseline|middle
-        letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
-        var out = this.set(),
-            letters = Str(string)[split](E),
-            shift = 0,
-            path = E,
-            scale;
-        R.is(font, string) && (font = this.getFont(font));
-        if (font) {
-            scale = (size || 16) / font.face["units-per-em"];
-            var bb = font.face.bbox.split(separator),
-                top = +bb[0],
-                height = +bb[1] + (origin == "baseline" ? bb[3] - bb[1] + (+font.face.descent) : (bb[3] - bb[1]) / 2);
-            for (var i = 0, ii = letters[length]; i < ii; i++) {
-                var prev = i && font.glyphs[letters[i - 1]] || {},
-                    curr = font.glyphs[letters[i]];
-                shift += i ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
-                curr && curr.d && out[push](this.path(curr.d).attr({fill: "#000", stroke: "none", translation: [shift, 0]}));
-            }
-            out.scale(scale, scale, top, height).translate(x - top, y - height);
-        }
-        return out;
-    };
-
-    R.format = function (token, params) {
-        var args = R.is(params, array) ? [0][concat](params) : arguments;
-        token && R.is(token, string) && args[length] - 1 && (token = token[rp](formatrg, function (str, i) {
-            return args[++i] == null ? E : args[i];
-        }));
-        return token || E;
-    };
-    R.ninja = function () {
-        oldRaphael.was ? (win.Raphael = oldRaphael.is) : delete Raphael;
-        return R;
-    };
-    R.el = elproto;
-    R.st = Set[proto];
-
-    oldRaphael.was ? (win.Raphael = R) : (Raphael = R);
-})();/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
- 
- 
-(function () {
-    var mmax = Math.max,
-        mmin = Math.min;
-    Raphael.fn.g = Raphael.fn.g || {};
-    Raphael.fn.g.markers = {
-        disc: "disc",
-        o: "disc",
-        flower: "flower",
-        f: "flower",
-        diamond: "diamond",
-        d: "diamond",
-        square: "square",
-        s: "square",
-        triangle: "triangle",
-        t: "triangle",
-        star: "star",
-        "*": "star",
-        cross: "cross",
-        x: "cross",
-        plus: "plus",
-        "+": "plus",
-        arrow: "arrow",
-        "->": "arrow"
-    };
-    Raphael.fn.g.shim = {stroke: "none", fill: "#000", "fill-opacity": 0};
-    Raphael.fn.g.txtattr = {font: "12px Arial, sans-serif"};
-    Raphael.fn.g.colors = [];
-    var hues = [.6, .2, .05, .1333, .75, 0];
-    for (var i = 0; i < 10; i++) {
-        if (i < hues.length) {
-            Raphael.fn.g.colors.push("hsb(" + hues[i] + ", .75, .75)");
-        } else {
-            Raphael.fn.g.colors.push("hsb(" + hues[i - hues.length] + ", 1, .5)");
-        }
-    }
-    Raphael.fn.g.text = function (x, y, text) {
-        return this.text(x, y, text).attr(this.g.txtattr);
-    };
-    Raphael.fn.g.labelise = function (label, val, total) {
-        if (label) {
-            return (label + "").replace(/(##+(?:\.#+)?)|(%%+(?:\.%+)?)/g, function (all, value, percent) {
-                if (value) {
-                    return (+val).toFixed(value.replace(/^#+\.?/g, "").length);
-                }
-                if (percent) {
-                    return (val * 100 / total).toFixed(percent.replace(/^%+\.?/g, "").length) + "%";
-                }
-            });
-        } else {
-            return (+val).toFixed(0);
-        }
-    };
-
-    Raphael.fn.g.finger = function (x, y, width, height, dir, ending, isPath) {
-        // dir 0 for horisontal and 1 for vertical
-        if ((dir && !height) || (!dir && !width)) {
-            return isPath ? "" : this.path();
-        }
-        ending = {square: "square", sharp: "sharp", soft: "soft"}[ending] || "round";
-        var path;
-        height = Math.round(height);
-        width = Math.round(width);
-        x = Math.round(x);
-        y = Math.round(y);
-        switch (ending) {
-            case "round":
-            if (!dir) {
-                var r = ~~(height / 2);
-                if (width < r) {
-                    r = width;
-                    path = ["M", x + .5, y + .5 - ~~(height / 2), "l", 0, 0, "a", r, ~~(height / 2), 0, 0, 1, 0, height, "l", 0, 0, "z"];
-                } else {
-                    path = ["M", x + .5, y + .5 - r, "l", width - r, 0, "a", r, r, 0, 1, 1, 0, height, "l", r - width, 0, "z"];
-                }
-            } else {
-                r = ~~(width / 2);
-                if (height < r) {
-                    r = height;
-                    path = ["M", x - ~~(width / 2), y, "l", 0, 0, "a", ~~(width / 2), r, 0, 0, 1, width, 0, "l", 0, 0, "z"];
-                } else {
-                    path = ["M", x - r, y, "l", 0, r - height, "a", r, r, 0, 1, 1, width, 0, "l", 0, height - r, "z"];
-                }
-            }
-            break;
-            case "sharp":
-            if (!dir) {
-                var half = ~~(height / 2);
-                path = ["M", x, y + half, "l", 0, -height, mmax(width - half, 0), 0, mmin(half, width), half, -mmin(half, width), half + (half * 2 < height), "z"];
-            } else {
-                half = ~~(width / 2);
-                path = ["M", x + half, y, "l", -width, 0, 0, -mmax(height - half, 0), half, -mmin(half, height), half, mmin(half, height), half, "z"];
-            }
-            break;
-            case "square":
-            if (!dir) {
-                path = ["M", x, y + ~~(height / 2), "l", 0, -height, width, 0, 0, height, "z"];
-            } else {
-                path = ["M", x + ~~(width / 2), y, "l", 1 - width, 0, 0, -height, width - 1, 0, "z"];
-            }
-            break;
-            case "soft":
-            if (!dir) {
-                r = mmin(width, Math.round(height / 5));
-                path = ["M", x + .5, y + .5 - ~~(height / 2), "l", width - r, 0, "a", r, r, 0, 0, 1, r, r, "l", 0, height - r * 2, "a", r, r, 0, 0, 1, -r, r, "l", r - width, 0, "z"];
-            } else {
-                r = mmin(Math.round(width / 5), height);
-                path = ["M", x - ~~(width / 2), y, "l", 0, r - height, "a", r, r, 0, 0, 1, r, -r, "l", width - 2 * r, 0, "a", r, r, 0, 0, 1, r, r, "l", 0, height - r, "z"];
-            }
-        }
-        if (isPath) {
-            return path.join(",");
-        } else {
-            return this.path(path);
-        }
-    };
-
-    // Symbols
-    Raphael.fn.g.disc = function (cx, cy, r) {
-        return this.circle(cx, cy, r);
-    };
-    Raphael.fn.g.line = function (cx, cy, r) {
-        return this.rect(cx - r, cy - r / 5, 2 * r, 2 * r / 5);
-    };
-    Raphael.fn.g.square = function (cx, cy, r) {
-        r = r * .7;
-        return this.rect(cx - r, cy - r, 2 * r, 2 * r);
-    };
-    Raphael.fn.g.triangle = function (cx, cy, r) {
-        r *= 1.75;
-        return this.path("M".concat(cx, ",", cy, "m0-", r * .58, "l", r * .5, ",", r * .87, "-", r, ",0z"));
-    };
-    Raphael.fn.g.diamond = function (cx, cy, r) {
-        return this.path(["M", cx, cy - r, "l", r, r, -r, r, -r, -r, r, -r, "z"]);
-    };
-    Raphael.fn.g.flower = function (cx, cy, r, n) {
-        r = r * 1.25;
-        var rout = r,
-            rin = rout * .5;
-        n = +n < 3 || !n ? 5 : n;
-        var points = ["M", cx, cy + rin, "Q"],
-            R;
-        for (var i = 1; i < n * 2 + 1; i++) {
-            R = i % 2 ? rout : rin;
-            points = points.concat([+(cx + R * Math.sin(i * Math.PI / n)).toFixed(3), +(cy + R * Math.cos(i * Math.PI / n)).toFixed(3)]);
-        }
-        points.push("z");
-        return this.path(points.join(","));
-    };
-    Raphael.fn.g.star = function (cx, cy, r, r2, rays) {
-        r2 = r2 || r * .382;
-        rays = rays || 5;
-        var points = ["M", cx, cy + r2, "L"],
-            R;
-        for (var i = 1; i < rays * 2; i++) {
-            R = i % 2 ? r : r2;
-            points = points.concat([(cx + R * Math.sin(i * Math.PI / rays)), (cy + R * Math.cos(i * Math.PI / rays))]);
-        }
-        points.push("z");
-        return this.path(points.join(","));
-    };
-    Raphael.fn.g.cross = function (cx, cy, r) {
-        r = r / 2.5;
-        return this.path("M".concat(cx - r, ",", cy, "l", [-r, -r, r, -r, r, r, r, -r, r, r, -r, r, r, r, -r, r, -r, -r, -r, r, -r, -r, "z"]));
-    };
-    Raphael.fn.g.plus = function (cx, cy, r) {
-        r = r / 2;
-        return this.path("M".concat(cx - r / 2, ",", cy - r / 2, "l", [0, -r, r, 0, 0, r, r, 0, 0, r, -r, 0, 0, r, -r, 0, 0, -r, -r, 0, 0, -r, "z"]));
-    };
-    Raphael.fn.g.arrow = function (cx, cy, r) {
-        return this.path("M".concat(cx - r * .7, ",", cy - r * .4, "l", [r * .6, 0, 0, -r * .4, r, r * .8, -r, r * .8, 0, -r * .4, -r * .6, 0], "z"));
-    };
-
-    // Tooltips
-    Raphael.fn.g.tag = function (x, y, text, angle, r) {
-        angle = angle || 0;
-        r = r == null ? 5 : r;
-        text = text == null ? "$9.99" : text;
-        var R = .5522 * r,
-            res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function () {
-            this.rotate(0, x, y);
-            var bb = this[1].getBBox();
-            if (bb.height >= r * 2) {
-                this[0].attr({path: ["M", x, y + r, "a", r, r, 0, 1, 1, 0, -r * 2, r, r, 0, 1, 1, 0, r * 2, "m", 0, -r * 2 -d, "a", r + d, r + d, 0, 1, 0, 0, (r + d) * 2, "L", x + r + d, y + bb.height / 2 + d, "l", bb.width + 2 * d, 0, 0, -bb.height - 2 * d, -bb.width - 2 * d, 0, "L", x, y - r - d].join(",")});
-            } else {
-                var dx = Math.sqrt(Math.pow(r + d, 2) - Math.pow(bb.height / 2 + d, 2));
-                this[0].attr({path: ["M", x, y + r, "c", -R, 0, -r, R - r, -r, -r, 0, -R, r - R, -r, r, -r, R, 0, r, r - R, r, r, 0, R, R - r, r, -r, r, "M", x + dx, y - bb.height / 2 - d, "a", r + d, r + d, 0, 1, 0, 0, bb.height + 2 * d, "l", r + d - dx + bb.width + 2 * d, 0, 0, -bb.height - 2 * d, "L", x + dx, y - bb.height / 2 - d].join(",")});
-            }
-            this[1].attr({x: x + r + d + bb.width / 2, y: y});
-            angle = (360 - angle) % 360;
-            this.rotate(angle, x, y);
-            angle > 90 && angle < 270 && this[1].attr({x: x - r - d - bb.width / 2, y: y, rotation: [180 + angle, x, y]});
-            return this;
-        };
-        res.update();
-        return res;
-    };
-    Raphael.fn.g.popupit = function (x, y, set, dir, size) {
-        dir = dir == null ? 2 : dir;
-        size = size || 5;
-        x = Math.round(x);
-        y = Math.round(y);
-        var bb = set.getBBox(),
-            w = Math.round(bb.width / 2),
-            h = Math.round(bb.height / 2),
-            dx = [0, w + size * 2, 0, -w - size * 2],
-            dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
-            p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
-                "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
-                "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
-                "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
-                "l", -mmax(w - size, 0), 0, "z"].join(","),
-            xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir];
-        set.translate(xy.x - w - bb.x, xy.y - h - bb.y);
-        return this.path(p).attr({fill: "#000", stroke: "none"}).insertBefore(set.node ? set : set[0]);
-    };
-    Raphael.fn.g.popup = function (x, y, text, dir, size) {
-        dir = dir == null ? 2 : dir > 3 ? 3 : dir;
-        size = size || 5;
-        text = text || "$9.99";
-        var res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function (X, Y, withAnimation) {
-            X = X || x;
-            Y = Y || y;
-            var bb = this[1].getBBox(),
-                w = bb.width / 2,
-                h = bb.height / 2,
-                dx = [0, w + size * 2, 0, -w - size * 2],
-                dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
-                p = ["M", X - dx[dir], Y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
-                    "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
-                    "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
-                    "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
-                    "l", -mmax(w - size, 0), 0, "z"].join(","),
-                xy = [{x: X, y: Y + size * 2 + h}, {x: X - size * 2 - w, y: Y}, {x: X, y: Y - size * 2 - h}, {x: X + size * 2 + w, y: Y}][dir];
-            xy.path = p;
-            if (withAnimation) {
-                this.animate(xy, 500, ">");
-            } else {
-                this.attr(xy);
-            }
-            return this;
-        };
-        return res.update(x, y);
-    };
-    Raphael.fn.g.flag = function (x, y, text, angle) {
-        angle = angle || 0;
-        text = text || "$9.99";
-        var res = this.set(),
-            d = 3;
-        res.push(this.path().attr({fill: "#000", stroke: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
-        res.update = function (x, y) {
-            this.rotate(0, x, y);
-            var bb = this[1].getBBox(),
-                h = bb.height / 2;
-            this[0].attr({path: ["M", x, y, "l", h + d, -h - d, bb.width + 2 * d, 0, 0, bb.height + 2 * d, -bb.width - 2 * d, 0, "z"].join(",")});
-            this[1].attr({x: x + h + d + bb.width / 2, y: y});
-            angle = 360 - angle;
-            this.rotate(angle, x, y);
-            angle > 90 && angle < 270 && this[1].attr({x: x - r - d - bb.width / 2, y: y, rotation: [180 + angle, x, y]});
-            return this;
-        };
-        return res.update(x, y);
-    };
-    Raphael.fn.g.label = function (x, y, text) {
-        var res = this.set();
-        res.push(this.rect(x, y, 10, 10).attr({stroke: "none", fill: "#000"}));
-        res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff"}));
-        res.update = function () {
-            var bb = this[1].getBBox(),
-                r = mmin(bb.width + 10, bb.height + 10) / 2;
-            this[0].attr({x: bb.x - r / 2, y: bb.y - r / 2, width: bb.width + r, height: bb.height + r, r: r});
-        };
-        res.update();
-        return res;
-    };
-    Raphael.fn.g.labelit = function (set) {
-        var bb = set.getBBox(),
-            r = mmin(20, bb.width + 10, bb.height + 10) / 2;
-        return this.rect(bb.x - r / 2, bb.y - r / 2, bb.width + r, bb.height + r, r).attr({stroke: "none", fill: "#000"}).insertBefore(set.node ? set : set[0]);
-    };
-    Raphael.fn.g.drop = function (x, y, text, size, angle) {
-        size = size || 30;
-        angle = angle || 0;
-        var res = this.set();
-        res.push(this.path(["M", x, y, "l", size, 0, "A", size * .4, size * .4, 0, 1, 0, x + size * .7, y - size * .7, "z"]).attr({fill: "#000", stroke: "none", rotation: [22.5 - angle, x, y]}));
-        angle = (angle + 90) * Math.PI / 180;
-        res.push(this.text(x + size * Math.sin(angle), y + size * Math.cos(angle), text).attr(this.g.txtattr).attr({"font-size": size * 12 / 30, fill: "#fff"}));
-        res.drop = res[0];
-        res.text = res[1];
-        return res;
-    };
-    Raphael.fn.g.blob = function (x, y, text, angle, size) {
-        angle = (+angle + 1 ? angle : 45) + 90;
-        size = size || 12;
-        var rad = Math.PI / 180,
-            fontSize = size * 12 / 12;
-        var res = this.set();
-        res.push(this.path().attr({fill: "#000", stroke: "none"}));
-        res.push(this.text(x + size * Math.sin((angle) * rad), y + size * Math.cos((angle) * rad) - fontSize / 2, text).attr(this.g.txtattr).attr({"font-size": fontSize, fill: "#fff"}));
-        res.update = function (X, Y, withAnimation) {
-            X = X || x;
-            Y = Y || y;
-            var bb = this[1].getBBox(),
-                w = mmax(bb.width + fontSize, size * 25 / 12),
-                h = mmax(bb.height + fontSize, size * 25 / 12),
-                x2 = X + size * Math.sin((angle - 22.5) * rad),
-                y2 = Y + size * Math.cos((angle - 22.5) * rad),
-                x1 = X + size * Math.sin((angle + 22.5) * rad),
-                y1 = Y + size * Math.cos((angle + 22.5) * rad),
-                dx = (x1 - x2) / 2,
-                dy = (y1 - y2) / 2,
-                rx = w / 2,
-                ry = h / 2,
-                k = -Math.sqrt(Math.abs(rx * rx * ry * ry - rx * rx * dy * dy - ry * ry * dx * dx) / (rx * rx * dy * dy + ry * ry * dx * dx)),
-                cx = k * rx * dy / ry + (x1 + x2) / 2,
-                cy = k * -ry * dx / rx + (y1 + y2) / 2;
-            if (withAnimation) {
-                this.animate({x: cx, y: cy, path: ["M", x, y, "L", x1, y1, "A", rx, ry, 0, 1, 1, x2, y2, "z"].join(",")}, 500, ">");
-            } else {
-                this.attr({x: cx, y: cy, path: ["M", x, y, "L", x1, y1, "A", rx, ry, 0, 1, 1, x2, y2, "z"].join(",")});
-            }
-            return this;
-        };
-        res.update(x, y);
-        return res;
-    };
-
-    Raphael.fn.g.colorValue = function (value, total, s, b) {
-        return "hsb(" + [mmin((1 - value / total) * .4, 1), s || .75, b || .75] + ")";
-    };
-
-    Raphael.fn.g.snapEnds = function (from, to, steps) {
-        var f = from,
-            t = to;
-        if (f == t) {
-            return {from: f, to: t, power: 0};
-        }
-        function round(a) {
-            return Math.abs(a - .5) < .25 ? ~~(a) + .5 : Math.round(a);
-        }
-        var d = (t - f) / steps,
-            r = ~~(d),
-            R = r,
-            i = 0;
-        if (r) {
-            while (R) {
-                i--;
-                R = ~~(d * Math.pow(10, i)) / Math.pow(10, i);
-            }
-            i ++;
-        } else {
-            while (!r) {
-                i = i || 1;
-                r = ~~(d * Math.pow(10, i)) / Math.pow(10, i);
-                i++;
-            }
-            i && i--;
-        }
-        t = round(to * Math.pow(10, i)) / Math.pow(10, i);
-        if (t < to) {
-            t = round((to + .5) * Math.pow(10, i)) / Math.pow(10, i);
-        }
-        f = round((from - (i > 0 ? 0 : .5)) * Math.pow(10, i)) / Math.pow(10, i);
-        return {from: f, to: t, power: i};
-    };
-    Raphael.fn.g.axis = function (x, y, length, from, to, steps, orientation, labels, type, dashsize) {
-        dashsize = dashsize == null ? 2 : dashsize;
-        type = type || "t";
-        steps = steps || 10;
-        var path = type == "|" || type == " " ? ["M", x + .5, y, "l", 0, .001] : orientation == 1 || orientation == 3 ? ["M", x + .5, y, "l", 0, -length] : ["M", x, y + .5, "l", length, 0],
-            ends = this.g.snapEnds(from, to, steps),
-            f = ends.from,
-            t = ends.to,
-            i = ends.power,
-            j = 0,
-            text = this.set();
-        d = (t - f) / steps;
-        var label = f,
-            rnd = i > 0 ? i : 0;
-            dx = length / steps;
-        if (+orientation == 1 || +orientation == 3) {
-            var Y = y,
-                addon = (orientation - 1 ? 1 : -1) * (dashsize + 3 + !!(orientation - 1));
-            while (Y >= y - length) {
-                type != "-" && type != " " && (path = path.concat(["M", x - (type == "+" || type == "|" ? dashsize : !(orientation - 1) * dashsize * 2), Y + .5, "l", dashsize * 2 + 1, 0]));
-                text.push(this.text(x + addon, Y, (labels && labels[j++]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr).attr({"text-anchor": orientation - 1 ? "start" : "end"}));
-                label += d;
-                Y -= dx;
-            }
-            if (Math.round(Y + dx - (y - length))) {
-                type != "-" && type != " " && (path = path.concat(["M", x - (type == "+" || type == "|" ? dashsize : !(orientation - 1) * dashsize * 2), y - length + .5, "l", dashsize * 2 + 1, 0]));
-                text.push(this.text(x + addon, y - length, (labels && labels[j]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr).attr({"text-anchor": orientation - 1 ? "start" : "end"}));
-            }
-        } else {
-            label = f;
-            rnd = (i > 0) * i;
-            addon = (orientation ? -1 : 1) * (dashsize + 9 + !orientation);
-            var X = x,
-                dx = length / steps,
-                txt = 0,
-                prev = 0;
-            while (X <= x + length) {
-                type != "-" && type != " " && (path = path.concat(["M", X + .5, y - (type == "+" ? dashsize : !!orientation * dashsize * 2), "l", 0, dashsize * 2 + 1]));
-                text.push(txt = this.text(X, y + addon, (labels && labels[j++]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr));
-                var bb = txt.getBBox();
-                if (prev >= bb.x - 5) {
-                    text.pop(text.length - 1).remove();
-                } else {
-                    prev = bb.x + bb.width;
-                }
-                label += d;
-                X += dx;
-            }
-            if (Math.round(X - dx - x - length)) {
-                type != "-" && type != " " && (path = path.concat(["M", x + length + .5, y - (type == "+" ? dashsize : !!orientation * dashsize * 2), "l", 0, dashsize * 2 + 1]));
-                text.push(this.text(x + length, y + addon, (labels && labels[j]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(this.g.txtattr));
-            }
-        }
-        var res = this.path(path);
-        res.text = text;
-        res.all = this.set([res, text]);
-        res.remove = function () {
-            this.text.remove();
-            this.constructor.prototype.remove.call(this);
-        };
-        return res;
-    };
-
-    Raphael.el.lighter = function (times) {
-        times = times || 2;
-        var fs = [this.attrs.fill, this.attrs.stroke];
-        this.fs = this.fs || [fs[0], fs[1]];
-        fs[0] = Raphael.rgb2hsb(Raphael.getRGB(fs[0]).hex);
-        fs[1] = Raphael.rgb2hsb(Raphael.getRGB(fs[1]).hex);
-        fs[0].b = mmin(fs[0].b * times, 1);
-        fs[0].s = fs[0].s / times;
-        fs[1].b = mmin(fs[1].b * times, 1);
-        fs[1].s = fs[1].s / times;
-        this.attr({fill: "hsb(" + [fs[0].h, fs[0].s, fs[0].b] + ")", stroke: "hsb(" + [fs[1].h, fs[1].s, fs[1].b] + ")"});
-    };
-    Raphael.el.darker = function (times) {
-        times = times || 2;
-        var fs = [this.attrs.fill, this.attrs.stroke];
-        this.fs = this.fs || [fs[0], fs[1]];
-        fs[0] = Raphael.rgb2hsb(Raphael.getRGB(fs[0]).hex);
-        fs[1] = Raphael.rgb2hsb(Raphael.getRGB(fs[1]).hex);
-        fs[0].s = mmin(fs[0].s * times, 1);
-        fs[0].b = fs[0].b / times;
-        fs[1].s = mmin(fs[1].s * times, 1);
-        fs[1].b = fs[1].b / times;
-        this.attr({fill: "hsb(" + [fs[0].h, fs[0].s, fs[0].b] + ")", stroke: "hsb(" + [fs[1].h, fs[1].s, fs[1].b] + ")"});
-    };
-    Raphael.el.original = function () {
-        if (this.fs) {
-            this.attr({fill: this.fs[0], stroke: this.fs[1]});
-            delete this.fs;
-        }
-    };
-})();/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.barchart = function (x, y, width, height, values, opts) {
-    opts = opts || {};
-    var type = {round: "round", sharp: "sharp", soft: "soft"}[opts.type] || "square",
-        gutter = parseFloat(opts.gutter || "20%"),
-        chart = this.set(),
-        bars = this.set(),
-        covers = this.set(),
-        covers2 = this.set(),
-        total = Math.max.apply(Math, values),
-        stacktotal = [],
-        paper = this,
-        multi = 0,
-        colors = opts.colors || this.g.colors,
-        len = values.length;
-    if (this.raphael.is(values[0], "array")) {
-        total = [];
-        multi = len;
-        len = 0;
-        for (var i = values.length; i--;) {
-            bars.push(this.set());
-            total.push(Math.max.apply(Math, values[i]));
-            len = Math.max(len, values[i].length);
-        }
-        if (opts.stacked) {
-            for (var i = len; i--;) {
-                var tot = 0;
-                for (var j = values.length; j--;) {
-                    tot +=+ values[j][i] || 0;
-                }
-                stacktotal.push(tot);
-            }
-        }
-        for (var i = values.length; i--;) {
-            if (values[i].length < len) {
-                for (var j = len; j--;) {
-                    values[i].push(0);
-                }
-            }
-        }
-        total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
-    }
-    
-    total = (opts.to) || total;
-    var barwidth = width / (len * (100 + gutter) + gutter) * 100,
-        barhgutter = barwidth * gutter / 100,
-        barvgutter = opts.vgutter == null ? 20 : opts.vgutter,
-        stack = [],
-        X = x + barhgutter,
-        Y = (height - 2 * barvgutter) / total;
-    if (!opts.stretch) {
-        barhgutter = Math.round(barhgutter);
-        barwidth = Math.floor(barwidth);
-    }
-    !opts.stacked && (barwidth /= multi || 1);
-    for (var i = 0; i < len; i++) {
-        stack = [];
-        for (var j = 0; j < (multi || 1); j++) {
-            var h = Math.round((multi ? values[j][i] : values[i]) * Y),
-                top = y + height - barvgutter - h,
-                bar = this.g.finger(Math.round(X + barwidth / 2), top + h, barwidth, h, true, type).attr({stroke: "none", fill: colors[multi ? j : i]});
-            if (multi) {
-                bars[j].push(bar);
-            } else {
-                bars.push(bar);
-            }
-            bar.y = top;
-            bar.x = Math.round(X + barwidth / 2);
-            bar.w = barwidth;
-            bar.h = h;
-						bar.index = i;
-            bar.value = multi ? values[j][i] : values[i];
-            if (!opts.stacked) {
-                X += barwidth;
-            } else {
-                stack.push(bar);
-            }
-        }
-        if (opts.stacked) {
-            var cvr;
-            covers2.push(cvr = this.rect(stack[0].x - stack[0].w / 2, y, barwidth, height).attr(this.g.shim));
-            cvr.bars = this.set();
-            var size = 0;
-            for (var s = stack.length; s--;) {
-                stack[s].toFront();
-            }
-            for (var s = 0, ss = stack.length; s < ss; s++) {
-                var bar = stack[s],
-                    cover,
-                    h = (size + bar.value) * Y,
-                    path = this.g.finger(bar.x, y + height - barvgutter - !!size * .5, barwidth, h, true, type, 1);
-                cvr.bars.push(bar);
-                size && bar.attr({path: path});
-                bar.h = h;
-                bar.y = y + height - barvgutter - !!size * .5 - h;
-                covers.push(cover = this.rect(bar.x - bar.w / 2, bar.y, barwidth, bar.value * Y).attr(this.g.shim));
-                cover.bar = bar;
-                cover.value = bar.value;
-                size += bar.value;
-            }
-            X += barwidth;
-        }
-        X += barhgutter;
-    }
-    covers2.toFront();
-    X = x + barhgutter;
-    if (!opts.stacked) {
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < (multi || 1); j++) {
-                var cover;
-                covers.push(cover = this.rect(Math.round(X), y + barvgutter, barwidth, height - barvgutter).attr(this.g.shim));
-                cover.bar = multi ? bars[j][i] : bars[i];
-                cover.value = cover.bar.value;
-                X += barwidth;
-            }
-            X += barhgutter;
-        }
-    }
-    chart.label = function (labels, isBottom, rotate) {
-        labels = labels || [];
-        isBottom = isBottom == undefined ? true : isBottom;
-	rotate = rotate == undefined ? false : rotate;
-        this.labels = paper.set();
-        var L, l = -Infinity;
-        if (opts.stacked) {
-            for (var i = 0; i < len; i++) {
-                var tot = 0;
-                for (var j = 0; j < (multi || 1); j++) {
-                    tot += multi ? values[j][i] : values[i];
-                    if (j == 0) {
-                        var label = paper.g.labelise(labels[j][i], tot, total);
-                        L = paper.g.text(bars[j][i].x, isBottom ? y + height - barvgutter / 2 : bars[j][i].y - 10, label);
-			if (rotate) {
-				L.rotate(90);
-			}
-                        var bb = L.getBBox();
-                        if (bb.x - 7 < l) {
-                            L.remove();
-                        } else {
-                            this.labels.push(L);
-                            l = bb.x + (rotate ? bb.height : bb.width);
-                        }
-                    }
-                }
-            }
-        } else {
-            for (var i = 0; i < len; i++) {
-                for (var j = 0; j < (multi || 1); j++) {
-                    // did not remove the loop because don't yet know whether to accept multi array input for arrays
-                    var label = paper.g.labelise(multi ? labels[0] && labels[0][i] : labels[i], multi ? values[0][i] : values[i], total);
-                     L = paper.g.text(bars[0][i].x, isBottom ? y + 5 + height - barvgutter / 2 : bars[0][i].y - 10, label);
-			if (rotate) {
-				L.rotate(90);
-				// If we rotated it, we need to move it as well. Still have to use the width
-				// to get the "length" of the label, divided it in two and shift down.
-				L.translate(0, (L.getBBox().width / 2));
-			}
-                    var bb = L.getBBox();
-//                    if (bb.x - 7 < l) {
-                    if (bb.x - (this.getBBox().width) < l) {
-                        L.remove();
-                    } else {
-                        this.labels.push(L);
-                        l = bb.x + (rotate ? bb.height : bb.width);
-                    }
-                }
-            }
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        covers2.hide();
-        covers.show();
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.hoverColumn = function (fin, fout) {
-        covers.hide();
-        covers2.show();
-        fout = fout || function () {};
-        covers2.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.click = function (f) {
-        covers2.hide();
-        covers.show();
-        covers.click(f);
-        return this;
-    };
-    chart.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers2.length; i--;) {
-            f.call(covers2[i]);
-        }
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        covers.hide();
-        covers2.show();
-        covers2.click(f);
-        return this;
-    };
-    chart.push(bars, covers, covers2);
-    chart.bars = bars;
-    chart.covers = covers;
-    return chart;
-};
-Raphael.fn.g.hbarchart = function (x, y, width, height, values, opts) {
-    opts = opts || {};
-    var type = {round: "round", sharp: "sharp", soft: "soft"}[opts.type] || "square",
-        gutter = parseFloat(opts.gutter || "20%"),
-        chart = this.set(),
-        bars = this.set(),
-        covers = this.set(),
-        covers2 = this.set(),
-        total = Math.max.apply(Math, values),
-        stacktotal = [],
-        paper = this,
-        multi = 0,
-        colors = opts.colors || this.g.colors,
-        len = values.length;
-    if (this.raphael.is(values[0], "array")) {
-        total = [];
-        multi = len;
-        len = 0;
-        for (var i = values.length; i--;) {
-            bars.push(this.set());
-            total.push(Math.max.apply(Math, values[i]));
-            len = Math.max(len, values[i].length);
-        }
-        if (opts.stacked) {
-            for (var i = len; i--;) {
-                var tot = 0;
-                for (var j = values.length; j--;) {
-                    tot +=+ values[j][i] || 0;
-                }
-                stacktotal.push(tot);
-            }
-        }
-        for (var i = values.length; i--;) {
-            if (values[i].length < len) {
-                for (var j = len; j--;) {
-                    values[i].push(0);
-                }
-            }
-        }
-        total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
-    }
-    
-    total = (opts.to) || total;
-    var barheight = Math.floor(height / (len * (100 + gutter) + gutter) * 100),
-        bargutter = Math.floor(barheight * gutter / 100),
-        stack = [],
-        Y = y + bargutter,
-        X = (width - 1) / total;
-    !opts.stacked && (barheight /= multi || 1);
-    for (var i = 0; i < len; i++) {
-        stack = [];
-        for (var j = 0; j < (multi || 1); j++) {
-            var val = multi ? values[j][i] : values[i],
-                bar = this.g.finger(x, Y + barheight / 2, Math.round(val * X), barheight - 1, false, type).attr({stroke: "none", fill: colors[multi ? j : i]});
-            if (multi) {
-                bars[j].push(bar);
-            } else {
-                bars.push(bar);
-            }
-            bar.x = x + Math.round(val * X);
-            bar.y = Y + barheight / 2;
-            bar.w = Math.round(val * X);
-            bar.h = barheight;
-            bar.value = +val;
-            if (!opts.stacked) {
-                Y += barheight;
-            } else {
-                stack.push(bar);
-            }
-        }
-        if (opts.stacked) {
-            var cvr = this.rect(x, stack[0].y - stack[0].h / 2, width, barheight).attr(this.g.shim);
-            covers2.push(cvr);
-            cvr.bars = this.set();
-            var size = 0;
-            for (var s = stack.length; s--;) {
-                stack[s].toFront();
-            }
-            for (var s = 0, ss = stack.length; s < ss; s++) {
-                var bar = stack[s],
-                    cover,
-                    val = Math.round((size + bar.value) * X),
-                    path = this.g.finger(x, bar.y, val, barheight - 1, false, type, 1);
-                cvr.bars.push(bar);
-                size && bar.attr({path: path});
-                bar.w = val;
-                bar.x = x + val;
-                covers.push(cover = this.rect(x + size * X, bar.y - bar.h / 2, bar.value * X, barheight).attr(this.g.shim));
-                cover.bar = bar;
-                size += bar.value;
-            }
-            Y += barheight;
-        }
-        Y += bargutter;
-    }
-    covers2.toFront();
-    Y = y + bargutter;
-    if (!opts.stacked) {
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < (multi || 1); j++) {
-                var cover = this.rect(x, Y, width, barheight).attr(this.g.shim);
-                covers.push(cover);
-                cover.bar = multi ? bars[j][i] : bars[i];
-                cover.value = cover.bar.value;
-                Y += barheight;
-            }
-            Y += bargutter;
-        }
-    }
-    chart.label = function (labels, isRight) {
-        labels = labels || [];
-        this.labels = paper.set();
-        for (var i = 0; i < len; i++) {
-            for (var j = 0; j < multi; j++) {
-                var  label = paper.g.labelise(multi ? labels[j] && labels[j][i] : labels[i], multi ? values[j][i] : values[i], total);
-                var X = isRight ? bars[i * (multi || 1) + j].x - barheight / 2 + 3 : x + 5,
-                    A = isRight ? "end" : "start",
-                    L;
-                this.labels.push(L = paper.g.text(X, bars[i * (multi || 1) + j].y, label).attr({"text-anchor": A}).insertBefore(covers[0]));
-                if (L.getBBox().x < x + 5) {
-                    L.attr({x: x + 5, "text-anchor": "start"});
-                } else {
-                    bars[i * (multi || 1) + j].label = L;
-                }
-            }
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        covers2.hide();
-        covers.show();
-        fout = fout || function () {};
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.hoverColumn = function (fin, fout) {
-        covers.hide();
-        covers2.show();
-        fout = fout || function () {};
-        covers2.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers2.length; i--;) {
-            f.call(covers2[i]);
-        }
-        return this;
-    };
-    chart.click = function (f) {
-        covers2.hide();
-        covers.show();
-        covers.click(f);
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        covers.hide();
-        covers2.show();
-        covers2.click(f);
-        return this;
-    };
-    chart.push(bars, covers, covers2);
-    chart.bars = bars;
-    chart.covers = covers;
-    return chart;
-};
-/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.dotchart = function (x, y, width, height, valuesx, valuesy, size, opts) {
-    function drawAxis(ax) {
-        +ax[0] && (ax[0] = paper.g.axis(x + gutter, y + gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 2, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[1] && (ax[1] = paper.g.axis(x + width - gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 3, opts.axisylabels || null, opts.axisytype || "t"));
-        +ax[2] && (ax[2] = paper.g.axis(x + gutter, y + height - gutter + maxR, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[3] && (ax[3] = paper.g.axis(x + gutter - maxR, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 1, opts.axisylabels || null, opts.axisytype || "t"));
-    }
-    opts = opts || {};
-    var xdim = this.g.snapEnds(Math.min.apply(Math, valuesx), Math.max.apply(Math, valuesx), valuesx.length - 1),
-        minx = xdim.from,
-        maxx = xdim.to,
-        gutter = opts.gutter || 10,
-        ydim = this.g.snapEnds(Math.min.apply(Math, valuesy), Math.max.apply(Math, valuesy), valuesy.length - 1),
-        miny = ydim.from,
-        maxy = ydim.to,
-        len = Math.max(valuesx.length, valuesy.length, size.length),
-        symbol = this.g.markers[opts.symbol] || "disc",
-        res = this.set(),
-        series = this.set(),
-        max = opts.max || 100,
-        top = Math.max.apply(Math, size),
-        R = [],
-        paper = this,
-        k = Math.sqrt(top / Math.PI) * 2 / max;
-
-    for (var i = 0; i < len; i++) {
-        R[i] = Math.min(Math.sqrt(size[i] / Math.PI) * 2 / k, max);
-    }
-    gutter = Math.max.apply(Math, R.concat(gutter));
-    var axis = this.set(),
-        maxR = Math.max.apply(Math, R);
-    if (opts.axis) {
-        var ax = (opts.axis + "").split(/[,\s]+/);
-        drawAxis(ax);
-        var g = [], b = [];
-        for (var i = 0, ii = ax.length; i < ii; i++) {
-            var bb = ax[i].all ? ax[i].all.getBBox()[["height", "width"][i % 2]] : 0;
-            g[i] = bb + gutter;
-            b[i] = bb;
-        }
-        gutter = Math.max.apply(Math, g.concat(gutter));
-        for (var i = 0, ii = ax.length; i < ii; i++) if (ax[i].all) {
-            ax[i].remove();
-            ax[i] = 1;
-        }
-        drawAxis(ax);
-        for (var i = 0, ii = ax.length; i < ii; i++) if (ax[i].all) {
-            axis.push(ax[i].all);
-        }
-        res.axis = axis;
-    }
-    var kx = (width - gutter * 2) / ((maxx - minx) || 1),
-        ky = (height - gutter * 2) / ((maxy - miny) || 1);
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        var sym = this.raphael.is(symbol, "array") ? symbol[i] : symbol,
-            X = x + gutter + (valuesx[i] - minx) * kx,
-            Y = y + height - gutter - (valuesy[i] - miny) * ky;
-        sym && R[i] && series.push(this.g[sym](X, Y, R[i]).attr({fill: opts.heat ? this.g.colorValue(R[i], maxR) : Raphael.fn.g.colors[0], "fill-opacity": opts.opacity ? R[i] / max : 1, stroke: "none"}));
-    }
-    var covers = this.set();
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        var X = x + gutter + (valuesx[i] - minx) * kx,
-            Y = y + height - gutter - (valuesy[i] - miny) * ky;
-        covers.push(this.circle(X, Y, maxR).attr(this.g.shim));
-        opts.href && opts.href[i] && covers[i].attr({href: opts.href[i]});
-        covers[i].r = +R[i].toFixed(3);
-        covers[i].x = +X.toFixed(3);
-        covers[i].y = +Y.toFixed(3);
-        covers[i].X = valuesx[i];
-        covers[i].Y = valuesy[i];
-        covers[i].value = size[i] || 0;
-        covers[i].dot = series[i];
-    }
-    res.covers = covers;
-    res.series = series;
-    res.push(series, axis, covers);
-    res.hover = function (fin, fout) {
-        covers.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    res.click = function (f) {
-        covers.click(f);
-        return this;
-    };
-    res.each = function (f) {
-        if (!Raphael.is(f, "function")) {
-            return this;
-        }
-        for (var i = covers.length; i--;) {
-            f.call(covers[i]);
-        }
-        return this;
-    };
-    res.href = function (map) {
-        var cover;
-        for (var i = covers.length; i--;) {
-            cover = covers[i];
-            if (cover.X == map.x && cover.Y == map.y && cover.value == map.value) {
-                cover.attr({href: map.href});
-            }
-        }
-    };
-    return res;
-};
-/*!
- * g.Raphael 0.4.2 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.linechart = function (x, y, width, height, valuesx, valuesy, opts) {
-    function shrink(values, dim) {
-        var k = values.length / dim,
-            j = 0,
-            l = k,
-            sum = 0,
-            res = [];
-        while (j < values.length) {
-            l--;
-            if (l < 0) {
-                sum += values[j] * (1 + l);
-                res.push(sum / k);
-                sum = values[j++] * -l;
-                l += k;
-            } else {
-                sum += values[j++];
-            }
-        }
-        return res;
-    }
-    function getAnchors(p1x, p1y, p2x, p2y, p3x, p3y) {
-        var l1 = (p2x - p1x) / 2,
-            l2 = (p3x - p2x) / 2,
-            a = Math.atan((p2x - p1x) / Math.abs(p2y - p1y)),
-            b = Math.atan((p3x - p2x) / Math.abs(p2y - p3y));
-        a = p1y < p2y ? Math.PI - a : a;
-        b = p3y < p2y ? Math.PI - b : b;
-        var alpha = Math.PI / 2 - ((a + b) % (Math.PI * 2)) / 2,
-            dx1 = l1 * Math.sin(alpha + a),
-            dy1 = l1 * Math.cos(alpha + a),
-            dx2 = l2 * Math.sin(alpha + b),
-            dy2 = l2 * Math.cos(alpha + b);
-        return {
-            x1: p2x - dx1,
-            y1: p2y + dy1,
-            x2: p2x + dx2,
-            y2: p2y + dy2
-        };
-    }
-    opts = opts || {};
-    if (!this.raphael.is(valuesx[0], "array")) {
-        valuesx = [valuesx];
-    }
-    if (!this.raphael.is(valuesy[0], "array")) {
-        valuesy = [valuesy];
-    }
-    var gutter = opts.gutter || 10,
-        len = Math.max(valuesx[0].length, valuesy[0].length),
-        symbol = opts.symbol || "",
-        colors = opts.colors || Raphael.fn.g.colors,
-        that = this,
-        columns = null,
-        dots = null,
-        chart = this.set(),
-        path = [];
-
-    for (var i = 0, ii = valuesy.length; i < ii; i++) {
-        len = Math.max(len, valuesy[i].length);
-    }
-    var shades = this.set();
-    for (i = 0, ii = valuesy.length; i < ii; i++) {
-        if (opts.shade) {
-            shades.push(this.path().attr({stroke: "none", fill: colors[i], opacity: opts.nostroke ? 1 : .3}));
-        }
-        if (valuesy[i].length > width - 2 * gutter) {
-            valuesy[i] = shrink(valuesy[i], width - 2 * gutter);
-            len = width - 2 * gutter;
-        }
-        if (valuesx[i] && valuesx[i].length > width - 2 * gutter) {
-            valuesx[i] = shrink(valuesx[i], width - 2 * gutter);
-        }
-    }
-    var allx = Array.prototype.concat.apply([], valuesx),
-        ally = Array.prototype.concat.apply([], valuesy),
-        xdim = this.g.snapEnds(Math.min.apply(Math, allx), Math.max.apply(Math, allx), valuesx[0].length - 1);
-        if(opts.clip) {
-            var minx = opts.minx || xdim.from,
-                maxx = opts.maxx || xdim.to,
-                ydim = this.g.snapEnds(Math.min.apply(Math, ally), Math.max.apply(Math, ally), valuesy[0].length - 1),
-                miny = opts.miny || ydim.from,
-                maxy = opts.maxy || ydim.to;
-        } else {
-            var minx = opts.minx && Math.min(opts.minx, xdim.from) || xdim.from,
-                maxx = opts.maxx && Math.max(opts.maxx, xdimt.to) || xdim.to,
-                ydim = this.g.snapEnds(Math.min.apply(Math, ally), Math.max.apply(Math, ally), valuesy[0].length - 1),
-                miny = opts.miny && Math.min(opts.miny, ydim.from) || ydim.from,
-                maxy = opts.maxy && Math.max(opts.maxy, ydim.to) || ydim.to;
-        }
-        kx = (width - gutter * 2) / ((maxx - minx) || 1),
-        ky = (height - gutter * 2) / ((maxy - miny) || 1);
-
-    var lines = this.set(),
-        symbols = this.set(),
-        line;
-    for (i = 0, ii = valuesy.length; i < ii; i++) {
-        if (!opts.nostroke) {
-            lines.push(line = this.path().attr({
-                stroke: colors[i],
-                "stroke-width": opts.width || 2,
-                "stroke-linejoin": "round",
-                "stroke-linecap": "round",
-                "stroke-dasharray": opts.dash || ""
-            }));
-        }
-        var sym = this.raphael.is(symbol, "array") ? symbol[i] : symbol,
-            symset = this.set();
-        path = [];
-        for (var j = 0, jj = valuesy[i].length; j < jj; j++) {
-            var X = x + gutter + ((valuesx[i] || valuesx[0])[j] - minx) * kx,
-                Y = y + height - gutter - (valuesy[i][j] - miny) * ky;
-            (Raphael.is(sym, "array") ? sym[j] : sym) && symset.push(this.g[Raphael.fn.g.markers[this.raphael.is(sym, "array") ? sym[j] : sym]](X, Y, (opts.width || 2) * 3).attr({fill: colors[i], stroke: "none"}));
-            if (opts.smooth) {
-                if (j && j != jj - 1) {
-                    var X0 = x + gutter + ((valuesx[i] || valuesx[0])[j - 1] - minx) * kx,
-                        Y0 = y + height - gutter - (valuesy[i][j - 1] - miny) * ky,
-                        X2 = x + gutter + ((valuesx[i] || valuesx[0])[j + 1] - minx) * kx,
-                        Y2 = y + height - gutter - (valuesy[i][j + 1] - miny) * ky;
-                    var a = getAnchors(X0, Y0, X, Y, X2, Y2);
-                    path = path.concat([a.x1, a.y1, X, Y, a.x2, a.y2]);
-                }
-                if (!j) {
-                    path = ["M", X, Y, "C", X, Y];
-                }
-            } else {
-                path = path.concat([j ? "L" : "M", X, Y]);
-            }
-        }
-        if (opts.smooth) {
-            path = path.concat([X, Y, X, Y]);
-        }
-        symbols.push(symset);
-        if (opts.shade) {
-            shades[i].attr({path: path.concat(["L", X, y + height - gutter, "L",  x + gutter + ((valuesx[i] || valuesx[0])[0] - minx) * kx, y + height - gutter, "z"]).join(",")});
-        }
-        !opts.nostroke && line.attr({path: path.join(","), 'clip-rect': [x + gutter, y + gutter, width - 2 * gutter, height - 2 * gutter].join(",")});
-    }
-
-    function createColumns(f) {
-        // unite Xs together
-        var Xs = [];
-        for (var i = 0, ii = valuesx.length; i < ii; i++) {
-            Xs = Xs.concat(valuesx[i]);
-        }
-        Xs.sort(function(a,b) { return a - b; });
-        // remove duplicates
-        var Xs2 = [],
-            xs = [];
-        for (i = 0, ii = Xs.length; i < ii; i++) {
-            Xs[i] != Xs[i - 1] && Xs2.push(Xs[i]) && xs.push(x + gutter + (Xs[i] - minx) * kx);
-        }
-        Xs = Xs2;
-        ii = Xs.length;
-        var cvrs = f || that.set();
-        for (i = 0; i < ii; i++) {
-            var X = xs[i] - (xs[i] - (xs[i - 1] || x)) / 2,
-                w = ((xs[i + 1] || x + width) - xs[i]) / 2 + (xs[i] - (xs[i - 1] || x)) / 2,
-                C;
-            f ? (C = {}) : cvrs.push(C = that.rect(X - 1, y, Math.max(w + 1, 1), height).attr({stroke: "none", fill: "#000", opacity: 0}));
-            C.values = [];
-            C.symbols = that.set();
-            C.y = [];
-            C.x = xs[i];
-            C.axis = Xs[i];
-            for (var j = 0, jj = valuesy.length; j < jj; j++) {
-                Xs2 = valuesx[j] || valuesx[0];
-                for (var k = 0, kk = Xs2.length; k < kk; k++) {
-                    if (Xs2[k] == Xs[i]) {
-                        C.values.push(valuesy[j][k]);
-                        C.y.push(y + height - gutter - (valuesy[j][k] - miny) * ky);
-                        C.symbols.push(chart.symbols[j][k]);
-                    }
-                }
-            }
-            f && f.call(C);
-        }
-        !f && (columns = cvrs);
-    }
-    function createDots(f) {
-        var cvrs = f || that.set(),
-            C;
-        for (var i = 0, ii = valuesy.length; i < ii; i++) {
-            for (var j = 0, jj = valuesy[i].length; j < jj; j++) {
-                var X = x + gutter + ((valuesx[i] || valuesx[0])[j] - minx) * kx,
-                    nearX = x + gutter + ((valuesx[i] || valuesx[0])[j ? j - 1 : 1] - minx) * kx,
-                    Y = y + height - gutter - (valuesy[i][j] - miny) * ky;
-                f ? (C = {}) : cvrs.push(C = that.circle(X, Y, Math.abs(nearX - X) / 2).attr({stroke: "none", fill: "#000", opacity: 0}));
-                C.x = X;
-                C.y = Y;
-                C.value = valuesy[i][j];
-                C.line = chart.lines[i];
-                C.shade = chart.shades[i];
-                C.symbol = chart.symbols[i][j];
-                C.symbols = chart.symbols[i];
-                C.axis = (valuesx[i] || valuesx[0])[j];
-                f && f.call(C);
-            }
-        }
-        !f && (dots = cvrs);
-    }
-
-    var axis = this.set();
-    if (opts.axis) {
-        var ax = (opts.axis + "").split(/[,\s]+/);
-        +ax[0] && axis.push(this.g.axis(x + gutter, y + gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 2, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[1] && axis.push(this.g.axis(x + width - gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 3, opts.axisylabels || null, opts.axisytype || "t"));
-        +ax[2] && axis.push(this.g.axis(x + gutter, y + height - gutter, width - 2 * gutter, minx, maxx, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, opts.axisxlabels || null, opts.axisxtype || "t"));
-        +ax[3] && axis.push(this.g.axis(x + gutter, y + height - gutter, height - 2 * gutter, miny, maxy, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 1, opts.axisylabels || null, opts.axisytype || "t"));
-    }
-
-    chart.push(lines, shades, symbols, axis, columns, dots);
-    chart.lines = lines;
-    chart.shades = shades;
-    chart.symbols = symbols;
-    chart.axis = axis;
-    chart.hoverColumn = function (fin, fout) {
-        !columns && createColumns();
-        columns.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.clickColumn = function (f) {
-        !columns && createColumns();
-        columns.click(f);
-        return this;
-    };
-    chart.hrefColumn = function (cols) {
-        var hrefs = that.raphael.is(arguments[0], "array") ? arguments[0] : arguments;
-        if (!(arguments.length - 1) && typeof cols == "object") {
-            for (var x in cols) {
-                for (var i = 0, ii = columns.length; i < ii; i++) if (columns[i].axis == x) {
-                    columns[i].attr("href", cols[x]);
-                }
-            }
-        }
-        !columns && createColumns();
-        for (i = 0, ii = hrefs.length; i < ii; i++) {
-            columns[i] && columns[i].attr("href", hrefs[i]);
-        }
-        return this;
-    };
-    chart.hover = function (fin, fout) {
-        !dots && createDots();
-        dots.mouseover(fin).mouseout(fout);
-        return this;
-    };
-    chart.click = function (f) {
-        !dots && createDots();
-        dots.click(f);
-        return this;
-    };
-    chart.each = function (f) {
-        createDots(f);
-        return this;
-    };
-    chart.eachColumn = function (f) {
-        createColumns(f);
-        return this;
-    };
-    return chart;
-};
-/*!
- * g.Raphael 0.4.1 - Charting library, based on Raphaël
- *
- * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
- * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
- */
-Raphael.fn.g.piechart = function (cx, cy, r, values, opts) {
-    opts = opts || {};
-    var paper = this,
-        sectors = [],
-        covers = this.set(),
-        chart = this.set(),
-        series = this.set(),
-        order = [],
-        len = values.length,
-        angle = 0,
-        total = 0,
-        others = 0,
-        cut = 9,
-        defcut = true;
-
-    var sum = 0;
-    for (var i = 0; i < len; i++)
-        sum += values[i];
-    var single = false;
-    var single_index = -1;
-    for (var i = 0; i < len; i++)
-        if (sum == values[i]) {
-            single = true;
-            single_index = i;
-            break;
-        }
-    if (len == 1 || single == true) {
-        for(var i = 0; i < len; i++) {
-            var radius = 0.1;
-            if (i == single_index) {
-                radius = r;
-            }
-            series.push(this.circle(cx, cy, radius).attr({fill: opts.colors && opts.colors[i] || this.g.colors[i], stroke: opts.stroke || "#fff", "stroke-width": opts.strokewidth == null ? 1 : opts.strokewidth}));
-            covers.push(this.circle(cx, cy, radius).attr({href: opts.href ? opts.href[i] : null}).attr(this.g.shim));
-            values[i] = {value: values[i], order: i, valueOf: function () { return this.value; }};
-            series[i].middle = {x: cx, y: cy};
-            series[i].mangle = 180;
-        }
-        total = values[single_index];
-    } else {
-        function sector(cx, cy, r, startAngle, endAngle, fill) {
-            var rad = Math.PI / 180,
-                x1 = cx + r * Math.cos(-startAngle * rad),
-                x2 = cx + r * Math.cos(-endAngle * rad),
-                xm = cx + r / 2 * Math.cos(-(startAngle + (endAngle - startAngle) / 2) * rad),
-                y1 = cy + r * Math.sin(-startAngle * rad),
-                y2 = cy + r * Math.sin(-endAngle * rad),
-                ym = cy + r / 2 * Math.sin(-(startAngle + (endAngle - startAngle) / 2) * rad),
-                res = ["M", cx, cy, "L", x1, y1, "A", r, r, 0, +(Math.abs(endAngle - startAngle) > 180), 1, x2, y2, "z"];
-            res.middle = {x: xm, y: ym};
-            return res;
-        }
-        for (var i = 0; i < len; i++) {
-            total += values[i];
-            values[i] = {value: values[i], order: i, valueOf: function () { return this.value; }};
-        }
-        values.sort(function (a, b) {
-            return b.value - a.value;
-        });
-        for (i = 0; i < len; i++) {
-            if (defcut && values[i] * 360 / total <= 1.5) {
-                cut = i;
-                defcut = false;
-            }
-            if (i > cut) {
-                defcut = false;
-                values[cut].value += values[i];
-                values[cut].others = true;
-                others = values[cut].value;
-            }
-        }
-        len = Math.min(cut + 1, values.length);
-        others && values.splice(len) && (values[cut].others = true);
-        for (i = 0; i < len; i++) {
-            var valueOrder = values[i].order;
-            var mangle = angle - 360 * values[i] / total / 2;
-            if (!i) {
-                angle = 90 - mangle;
-                mangle = angle - 360 * values[i] / total / 2;
-            }
-            if (opts.init) {
-                var ipath = sector(cx, cy, 1, angle, angle - 360 * values[i] / total).join(",");
-            }
-            var path = sector(cx, cy, r, angle, angle -= 360 * values[i] / total);
-            var p = this.path(opts.init ? ipath : path).attr({fill: opts.colors && opts.colors[valueOrder] || this.g.colors[valueOrder] || "#666", stroke: opts.stroke || "#fff", "stroke-width": (opts.strokewidth == null ? 1 : opts.strokewidth), "stroke-linejoin": "round"});
-            p.value = values[i];
-            p.middle = path.middle;
-            p.mangle = mangle;
-            sectors.push(p);
-            series.push(p);
-            opts.init && p.animate({path: path.join(",")}, (+opts.init - 1) || 1000, ">");
-        }
-        for (i = 0; i < len; i++) {
-            p = paper.path(sectors[i].attr("path")).attr(this.g.shim);
-            var valueOrder = values[i].order;
-            opts.href && opts.href[valueOrder] && p.attr({href: opts.href[valueOrder]});
-            //p.attr = function () {}; // this breaks translate!
-            covers.push(p);
-        }
-    }
-
-    chart.hover = function (fin, fout) {
-        fout = fout || function () {};
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    mx: sector.middle.x,
-                    my: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                cover.mouseover(function () {
-                    fin.call(o);
-                }).mouseout(function () {
-                    fout.call(o);
-                });
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    // x: where label could be put
-    // y: where label could be put
-    // value: value to show
-    // total: total number to count %
-    chart.each = function (f) {
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    x: sector.middle.x,
-                    y: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                f.call(o);
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    chart.click = function (f) {
-        var that = this;
-        for (var i = 0; i < len; i++) {
-            (function (sector, cover, j) {
-                var o = {
-                    sector: sector,
-                    cover: cover,
-                    cx: cx,
-                    cy: cy,
-                    mx: sector.middle.x,
-                    my: sector.middle.y,
-                    mangle: sector.mangle,
-                    r: r,
-                    value: values[j],
-                    total: total,
-                    label: that.labels && that.labels[j]
-                };
-                cover.click(function () { f.call(o); });
-            })(series[i], covers[i], i);
-        }
-        return this;
-    };
-    chart.inject = function (element) {
-        element.insertBefore(covers[0]);
-    };
-    var legend = function (labels, otherslabel, mark, dir) {
-        var x = cx + r + r / 5,
-            y = cy,
-            h = y + 10;
-        labels = labels || [];
-        dir = (dir && dir.toLowerCase && dir.toLowerCase()) || "east";
-        mark = paper.g.markers[mark && mark.toLowerCase()] || "disc";
-        chart.labels = paper.set();
-        for (var i = 0; i < len; i++) {
-            var clr = series[i].attr("fill"),
-                j = values[i].order,
-                txt;
-            values[i].others && (labels[j] = otherslabel || "Others");
-            labels[j] = paper.g.labelise(labels[j], values[i], total);
-            chart.labels.push(paper.set());
-            chart.labels[i].push(paper.g[mark](x + 5, h, 5).attr({fill: clr, stroke: "none"}));
-            chart.labels[i].push(txt = paper.text(x + 20, h, labels[j] || values[j]).attr(paper.g.txtattr).attr({fill: opts.legendcolor || "#000", "text-anchor": "start"}));
-            covers[i].label = chart.labels[i];
-            h += txt.getBBox().height * 1.2;
-        }
-        var bb = chart.labels.getBBox(),
-            tr = {
-                east: [0, -bb.height / 2],
-                west: [-bb.width - 2 * r - 20, -bb.height / 2],
-                north: [-r - bb.width / 2, -r - bb.height - 10],
-                south: [-r - bb.width / 2, r + 10]
-            }[dir];
-        chart.labels.translate.apply(chart.labels, tr);
-        chart.push(chart.labels);
-    };
-    if (opts.legend) {
-        legend(opts.legend, opts.legendothers, opts.legendmark, opts.legendpos);
-    }
-    chart.push(series, covers);
-    chart.series = series;
-    chart.covers = covers;
-    
-    var w = paper.width,
-        h = paper.height,
-        bb = chart.getBBox(),
-        tr = [(w - bb.width)/2 - bb.x, (h - bb.height)/2 - bb.y];
-    cx += tr[0];
-    cy += tr[1];
-    chart.translate.apply(chart, tr);
-    return chart;
-};
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/i18n/i18n.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/i18n/i18n.js
deleted file mode 100644
index 9765ded86..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/i18n/i18n.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function() {
-	/**
-	 * provides text formatting and i18n key storage features<br>
-	 * implements most of the Sun Java MessageFormat functionality.
-	 * @see <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/MessageFormat.html" target="sun">Sun's Documentation</a>
-	 */
-
-	var keys = {};
-
-	var format = function(message, args) {
-		var substitute = function() {
-			var format = arguments[1].split(',');
-			var substr = escape(args[format.shift()]);
-			if(format.length === 0) {
-				return substr; // simple substitution eg {0}
-			}
-			switch(format.shift()) {
-				case "number" : return (new Number(substr)).toLocaleString();
-				case "date" : return (new Date(+substr)).toLocaleDateString(); // date and time require milliseconds since epoch
-				case "time" : return (new Date(+substr)).toLocaleTimeString(); //  eg i18n.text("Key", +(new Date())); for current time
-			}
-			var styles = format.join("").split("|").map(function(style) {
-				return style.match(/(-?[\.\d]+)(#|<)([^{}]*)/);
-			});
-			var match = styles[0][3];
-			for(var i=0; i<styles.length; i++) {
-				if((styles[i][2] === "#" && (+styles[i][1]) === (+substr)) ||
-						(styles[i][2] === "<" && ((+styles[i][1]) < (+substr)))) {
-					match = styles[i][3];
-				}
-			}
-			return match;
-		};
-
-		return message && message.replace(/'(')|'([^']+)'|([^{']+)|([^']+)/g, function(x, sq, qs, ss, sub) {
-			do {} while(sub && (sub !== (sub = (sub.replace(/\{([^{}]+)\}/, substitute)))));
-			return sq || qs || ss || unescape(sub);
-		});
-	};
-
-	this.i18n = {
-
-		setKeys: function(strings) {
-			for(var key in strings) {
-				keys[key] = strings[key];
-			}
-		},
-
-		text: function() {
-			var args = Array.prototype.slice.call(arguments),
-				key = keys[args.shift()];
-			if(args.length === 0) {
-				return key;
-			}
-			return format(key, args);
-		},
-
-		complex: function() {
-			var args = Array.prototype.slice.call(arguments),
-				key = keys[args.shift()],
-				ret = [],
-				replacer = function(x, pt, sub) { ret.push(pt || args[+sub]); return ""; };
-			do {} while(key && key !== (key = key.replace(/([^{]+)|\{(\d+)\}/, replacer )));
-			return ret;
-		}
-
-	};
-
-})();
-
-(function() {
-	var nav = window.navigator;
-	var userLang = ( nav.languages && nav.languages[0] ) || nav.language || nav.userLanguage;
-	var scripts = document.getElementsByTagName('script');
-	var data = scripts[ scripts.length - 1].dataset;
-	if( ! data["langs"] ) {
-		return;
-	}
-	var langs = data["langs"].split(/\s*,\s*/);
-	var script0 = scripts[0];
-	function install( lang ) {
-		var s = document.createElement("script");
-		s.src = data["basedir"] + "/" + lang + '_strings.js';
-		s.async = false;
-		script0.parentNode.appendChild(s);
-		script0 = s;
-	}
-
-	install( langs.shift() ); // always install primary language
-	userLang && langs
-		.filter( function( lang ) { return userLang.indexOf( lang ) === 0; } )
-		.forEach( install );
-}());
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/joey/joey.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/joey/joey.js
deleted file mode 100644
index 317b35298..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/joey/joey.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function() {
-
-	var joey = this.joey = function joey(elementDef, parentNode) {
-		return createNode( elementDef, parentNode, parentNode ? parentNode.ownerDocument : this.document );
-	};
-
-	var shortcuts = joey.shortcuts = {
-		"text" : "textContent",
-		"cls" : "className"
-	};
-
-	var plugins = joey.plugins = [
-		function( obj, context ) {
-			if( typeof obj === 'string' ) {
-				return context.createTextNode( obj );
-			}
-		},
-		function( obj, context ) {
-			if( "tag" in obj ) {
-				var el = context.createElement( obj.tag );
-				for( var attr in obj ) {
-					addAttr( el, attr, obj[ attr ], context );
-				}
-				return el;
-			}
-		}
-	];
-
-	function addAttr( el, attr, value, context ) {
-		attr = shortcuts[attr] || attr;
-		if( attr === 'children' ) {
-			for( var i = 0; i < value.length; i++) {
-				createNode( value[i], el, context );
-			}
-		} else if( attr === 'style' || attr === 'dataset' ) {
-			for( var prop in value ) {
-				el[ attr ][ prop ] = value[ prop ];
-			}
-		} else if( attr.indexOf("on") === 0 ) {
-			el.addEventListener( attr.substr(2), value, false );
-		} else if( value !== undefined ) {
-			el[ attr ] = value;
-		}
-	}
-
-	function createNode( obj, parent, context ) {
-		var el;
-		if( obj != null ) {
-			plugins.some( function( plug ) {
-				return ( el = plug( obj, context ) );
-			});
-			parent && parent.appendChild( el );
-			return el;
-		}
-	}
-
-}());
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/jquery/jquery.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/jquery/jquery.js
deleted file mode 100644
index d96debcd1..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/jquery/jquery.js
+++ /dev/null
@@ -1,8951 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-/*!
- * jQuery JavaScript Library v1.6.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu May 12 15:04:36 2011 -0400
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Check for digits
-	rdigit = /\d/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = quickExpr.exec( selector );
-			}
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = (context ? context.ownerDocument || context : document);
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if (selector.selector !== undefined) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.6.1",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.done( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			readyList.resolveWith( document, [ jQuery ] );
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).unbind( "ready" );
-			}
-		}
-	},
-
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
-
-		readyList = jQuery._Deferred();
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	// A crude way of determining if an object is a window
-	isWindow: function( obj ) {
-		return obj && typeof obj === "object" && "setInterval" in obj;
-	},
-
-	isNaN: function( obj ) {
-		return obj == null || !rdigit.test( obj ) || isNaN( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		// Not own constructor property must be Object
-		if ( obj.constructor &&
-			!hasOwn.call(obj, "constructor") &&
-			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw msg;
-	},
-
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return (new Function( "return " + data ))();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	// (xml & tmp used internally)
-	parseXML: function( data , xml , tmp ) {
-
-		if ( window.DOMParser ) { // Standard
-			tmp = new DOMParser();
-			xml = tmp.parseFromString( data , "text/xml" );
-		} else { // IE
-			xml = new ActiveXObject( "Microsoft.XMLDOM" );
-			xml.async = "false";
-			xml.loadXML( data );
-		}
-
-		tmp = xml.documentElement;
-
-		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-
-		if ( indexOf ) {
-			return indexOf.call( array, elem );
-		}
-
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can be optionally by executed if its a function
-	access: function( elems, key, value, exec, fn, pass ) {
-		var length = elems.length;
-
-		// Setting many attributes
-		if ( typeof key === "object" ) {
-			for ( var k in key ) {
-				jQuery.access( elems, k, key[k], exec, fn, value );
-			}
-			return elems;
-		}
-
-		// Setting one attribute
-		if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = !pass && exec && jQuery.isFunction(value);
-
-			for ( var i = 0; i < length; i++ ) {
-				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-			}
-
-			return elems;
-		}
-
-		// Getting an attribute
-		return length ? fn( elems[0], key ) : undefined;
-	},
-
-	now: function() {
-		return (new Date()).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
-
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-// Expose jQuery to the global object
-return jQuery;
-
-})();
-
-
-var // Promise methods
-	promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ),
-	// Static reference to slice
-	sliceDeferred = [].slice;
-
-jQuery.extend({
-	// Create a simple deferred (one callbacks list)
-	_Deferred: function() {
-		var // callbacks list
-			callbacks = [],
-			// stored [ context , args ]
-			fired,
-			// to avoid firing when already doing so
-			firing,
-			// flag to know if the deferred has been cancelled
-			cancelled,
-			// the deferred itself
-			deferred  = {
-
-				// done( f1, f2, ...)
-				done: function() {
-					if ( !cancelled ) {
-						var args = arguments,
-							i,
-							length,
-							elem,
-							type,
-							_fired;
-						if ( fired ) {
-							_fired = fired;
-							fired = 0;
-						}
-						for ( i = 0, length = args.length; i < length; i++ ) {
-							elem = args[ i ];
-							type = jQuery.type( elem );
-							if ( type === "array" ) {
-								deferred.done.apply( deferred, elem );
-							} else if ( type === "function" ) {
-								callbacks.push( elem );
-							}
-						}
-						if ( _fired ) {
-							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
-						}
-					}
-					return this;
-				},
-
-				// resolve with given context and args
-				resolveWith: function( context, args ) {
-					if ( !cancelled && !fired && !firing ) {
-						// make sure args are available (#8421)
-						args = args || [];
-						firing = 1;
-						try {
-							while( callbacks[ 0 ] ) {
-								callbacks.shift().apply( context, args );
-							}
-						}
-						finally {
-							fired = [ context, args ];
-							firing = 0;
-						}
-					}
-					return this;
-				},
-
-				// resolve with this as context and given arguments
-				resolve: function() {
-					deferred.resolveWith( this, arguments );
-					return this;
-				},
-
-				// Has this deferred been resolved?
-				isResolved: function() {
-					return !!( firing || fired );
-				},
-
-				// Cancel
-				cancel: function() {
-					cancelled = 1;
-					callbacks = [];
-					return this;
-				}
-			};
-
-		return deferred;
-	},
-
-	// Full fledged deferred (two callbacks list)
-	Deferred: function( func ) {
-		var deferred = jQuery._Deferred(),
-			failDeferred = jQuery._Deferred(),
-			promise;
-		// Add errorDeferred methods, then and promise
-		jQuery.extend( deferred, {
-			then: function( doneCallbacks, failCallbacks ) {
-				deferred.done( doneCallbacks ).fail( failCallbacks );
-				return this;
-			},
-			always: function() {
-				return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments );
-			},
-			fail: failDeferred.done,
-			rejectWith: failDeferred.resolveWith,
-			reject: failDeferred.resolve,
-			isRejected: failDeferred.isResolved,
-			pipe: function( fnDone, fnFail ) {
-				return jQuery.Deferred(function( newDefer ) {
-					jQuery.each( {
-						done: [ fnDone, "resolve" ],
-						fail: [ fnFail, "reject" ]
-					}, function( handler, data ) {
-						var fn = data[ 0 ],
-							action = data[ 1 ],
-							returned;
-						if ( jQuery.isFunction( fn ) ) {
-							deferred[ handler ](function() {
-								returned = fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise().then( newDefer.resolve, newDefer.reject );
-								} else {
-									newDefer[ action ]( returned );
-								}
-							});
-						} else {
-							deferred[ handler ]( newDefer[ action ] );
-						}
-					});
-				}).promise();
-			},
-			// Get a promise for this deferred
-			// If obj is provided, the promise aspect is added to the object
-			promise: function( obj ) {
-				if ( obj == null ) {
-					if ( promise ) {
-						return promise;
-					}
-					promise = obj = {};
-				}
-				var i = promiseMethods.length;
-				while( i-- ) {
-					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
-				}
-				return obj;
-			}
-		});
-		// Make sure only one callback list will be used
-		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
-		// Unexpose cancel
-		delete deferred.cancel;
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( firstParam ) {
-		var args = arguments,
-			i = 0,
-			length = args.length,
-			count = length,
-			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
-				firstParam :
-				jQuery.Deferred();
-		function resolveFunc( i ) {
-			return function( value ) {
-				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				if ( !( --count ) ) {
-					// Strange bug in FF4:
-					// Values changed onto the arguments object sometimes end up as undefined values
-					// outside the $.when method. Cloning the object into a fresh array solves the issue
-					deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) );
-				}
-			};
-		}
-		if ( length > 1 ) {
-			for( ; i < length; i++ ) {
-				if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) {
-					args[ i ].promise().then( resolveFunc(i), deferred.reject );
-				} else {
-					--count;
-				}
-			}
-			if ( !count ) {
-				deferred.resolveWith( deferred, args );
-			}
-		} else if ( deferred !== firstParam ) {
-			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
-		}
-		return deferred.promise();
-	}
-});
-
-
-
-jQuery.support = (function() {
-
-	var div = document.createElement( "div" ),
-		documentElement = document.documentElement,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		marginDiv,
-		support,
-		fragment,
-		body,
-		bodyStyle,
-		tds,
-		events,
-		eventName,
-		i,
-		isSupported;
-
-	// Preliminary tests
-	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName( "*" );
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement( "select" );
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName( "input" )[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName( "tbody" ).length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName( "link" ).length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute( "href" ) === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-			div.detachEvent( "onclick", click );
-		});
-		div.cloneNode( true ).fireEvent( "onclick" );
-	}
-
-	// Check if a radio maintains it's value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute("type", "radio");
-	support.radioValue = input.value === "t";
-
-	input.setAttribute("checked", "checked");
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	div.innerHTML = "";
-
-	// Figure out if the W3C box model works as expected
-	div.style.width = div.style.paddingLeft = "1px";
-
-	// We use our own, invisible, body
-	body = document.createElement( "body" );
-	bodyStyle = {
-		visibility: "hidden",
-		width: 0,
-		height: 0,
-		border: 0,
-		margin: 0,
-		// Set background to avoid IE crashes when removing (#9028)
-		background: "none"
-	};
-	for ( i in bodyStyle ) {
-		body.style[ i ] = bodyStyle[ i ];
-	}
-	body.appendChild( div );
-	documentElement.insertBefore( body, documentElement.firstChild );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	support.boxModel = div.offsetWidth === 2;
-
-	if ( "zoom" in div.style ) {
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		// (IE < 8 does this)
-		div.style.display = "inline";
-		div.style.zoom = 1;
-		support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
-
-		// Check if elements with layout shrink-wrap their children
-		// (IE 6 does this)
-		div.style.display = "";
-		div.innerHTML = "<div style='width:4px;'></div>";
-		support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
-	}
-
-	div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
-	tds = div.getElementsByTagName( "td" );
-
-	// Check if table cells still have offsetWidth/Height when they are set
-	// to display:none and there are still other visible table cells in a
-	// table row; if so, offsetWidth/Height are not reliable for use when
-	// determining if an element has been hidden directly using
-	// display:none (it is still safe to use offsets if a parent element is
-	// hidden; don safety goggles and see bug #4512 for more information).
-	// (only IE 8 fails this test)
-	isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-	tds[ 0 ].style.display = "";
-	tds[ 1 ].style.display = "none";
-
-	// Check if empty table cells still have offsetWidth/Height
-	// (IE < 8 fail this test)
-	support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-	div.innerHTML = "";
-
-	// Check if div with explicit width and no margin-right incorrectly
-	// gets computed margin-right based on width of container. For more
-	// info see bug #3333
-	// Fails in WebKit before Feb 2011 nightlies
-	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-	if ( document.defaultView && document.defaultView.getComputedStyle ) {
-		marginDiv = document.createElement( "div" );
-		marginDiv.style.width = "0";
-		marginDiv.style.marginRight = "0";
-		div.appendChild( marginDiv );
-		support.reliableMarginRight =
-			( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
-	}
-
-	// Remove the body element we added
-	body.innerHTML = "";
-	documentElement.removeChild( body );
-
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for( i in {
-			submit: 1,
-			change: 1,
-			focusin: 1
-		} ) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	return support;
-})();
-
-// Keep track of boxModel
-jQuery.boxModel = jQuery.support.boxModel;
-
-
-
-
-var rbrace = /^(?:\{.*\}|\[.*\])$/,
-	rmultiDash = /([a-z])([A-Z])/g;
-
-jQuery.extend({
-	cache: {},
-
-	// Please use with caution
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
-
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
-
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
-
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
-
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
-			return;
-		}
-
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ jQuery.expando ] = id = ++jQuery.uuid;
-			} else {
-				id = jQuery.expando;
-			}
-		}
-
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
-
-			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
-			// metadata on plain JS objects when the object is serialized using
-			// JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
-
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
-			} else {
-				cache[ id ] = jQuery.extend(cache[ id ], name);
-			}
-		}
-
-		thisCache = cache[ id ];
-
-		// Internal jQuery data is stored in a separate object inside the object's data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data
-		if ( pvt ) {
-			if ( !thisCache[ internalKey ] ) {
-				thisCache[ internalKey ] = {};
-			}
-
-			thisCache = thisCache[ internalKey ];
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
-
-		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
-		// not attempt to inspect the internal events object using jQuery.data, as this
-		// internal data object is undocumented and subject to change.
-		if ( name === "events" && !thisCache[name] ) {
-			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
-		}
-
-		return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache;
-	},
-
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var internalKey = jQuery.expando, isNode = elem.nodeType,
-
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
-
-			// See jQuery.data for more information
-			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
-
-			if ( thisCache ) {
-				delete thisCache[ name ];
-
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !isEmptyDataObject(thisCache) ) {
-					return;
-				}
-			}
-		}
-
-		// See jQuery.data for more information
-		if ( pvt ) {
-			delete cache[ id ][ internalKey ];
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject(cache[ id ]) ) {
-				return;
-			}
-		}
-
-		var internalCache = cache[ id ][ internalKey ];
-
-		// Browsers that fail expando deletion also refuse to delete expandos on
-		// the window, but it will allow it on all other JS objects; other browsers
-		// don't care
-		if ( jQuery.support.deleteExpando || cache != window ) {
-			delete cache[ id ];
-		} else {
-			cache[ id ] = null;
-		}
-
-		// We destroyed the entire user cache at once because it's faster than
-		// iterating through each key, but we need to continue to persist internal
-		// data if it existed
-		if ( internalCache ) {
-			cache[ id ] = {};
-			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
-			// metadata on plain JS objects when the object is serialized using
-			// JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-
-			cache[ id ][ internalKey ] = internalCache;
-
-		// Otherwise, we need to eliminate the expando on the node to avoid
-		// false lookups in the cache for entries that no longer exist
-		} else if ( isNode ) {
-			// IE does not allow us to delete expando properties from nodes,
-			// nor does it have a removeAttribute function on Document nodes;
-			// we must handle all of these cases
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-			} else {
-				elem[ jQuery.expando ] = null;
-			}
-		}
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		if ( elem.nodeName ) {
-			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-			if ( match ) {
-				return !(match === true || elem.getAttribute("classid") !== match);
-			}
-		}
-
-		return true;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var data = null;
-
-		if ( typeof key === "undefined" ) {
-			if ( this.length ) {
-				data = jQuery.data( this[0] );
-
-				if ( this[0].nodeType === 1 ) {
-			    var attr = this[0].attributes, name;
-					for ( var i = 0, l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
-
-						if ( name.indexOf( "data-" ) === 0 ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( this[0], name, data[ name ] );
-						}
-					}
-				}
-			}
-
-			return data;
-
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			// Try to fetch any internally stored data first
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-				data = dataAttr( this[0], key, data );
-			}
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-
-		} else {
-			return this.each(function() {
-				var $this = jQuery( this ),
-					args = [ parts[0], value ];
-
-				$this.triggerHandler( "setData" + parts[1] + "!", args );
-				jQuery.data( this, key, value );
-				$this.triggerHandler( "changeData" + parts[1] + "!", args );
-			});
-		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				!jQuery.isNaN( data ) ? parseFloat( data ) :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
-// property to be considered empty objects; this property always exists in
-// order to make sure JSON.stringify does not expose internal metadata
-function isEmptyDataObject( obj ) {
-	for ( var name in obj ) {
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-
-
-
-function handleQueueMarkDefer( elem, type, src ) {
-	var deferDataKey = type + "defer",
-		queueDataKey = type + "queue",
-		markDataKey = type + "mark",
-		defer = jQuery.data( elem, deferDataKey, undefined, true );
-	if ( defer &&
-		( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) &&
-		( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) {
-		// Give room for hard-coded callbacks to fire first
-		// and eventually mark/queue something else on the element
-		setTimeout( function() {
-			if ( !jQuery.data( elem, queueDataKey, undefined, true ) &&
-				!jQuery.data( elem, markDataKey, undefined, true ) ) {
-				jQuery.removeData( elem, deferDataKey, true );
-				defer.resolve();
-			}
-		}, 0 );
-	}
-}
-
-jQuery.extend({
-
-	_mark: function( elem, type ) {
-		if ( elem ) {
-			type = (type || "fx") + "mark";
-			jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true );
-		}
-	},
-
-	_unmark: function( force, elem, type ) {
-		if ( force !== true ) {
-			type = elem;
-			elem = force;
-			force = false;
-		}
-		if ( elem ) {
-			type = type || "fx";
-			var key = type + "mark",
-				count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 );
-			if ( count ) {
-				jQuery.data( elem, key, count, true );
-			} else {
-				jQuery.removeData( elem, key, true );
-				handleQueueMarkDefer( elem, type, "mark" );
-			}
-		}
-	},
-
-	queue: function( elem, type, data ) {
-		if ( elem ) {
-			type = (type || "fx") + "queue";
-			var q = jQuery.data( elem, type, undefined, true );
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !q || jQuery.isArray(data) ) {
-					q = jQuery.data( elem, type, jQuery.makeArray(data), true );
-				} else {
-					q.push( data );
-				}
-			}
-			return q || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			fn = queue.shift(),
-			defer;
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift("inprogress");
-			}
-
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
-		}
-
-		if ( !queue.length ) {
-			jQuery.removeData( elem, type + "queue", true );
-			handleQueueMarkDefer( elem, type, "queue" );
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
-
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function() {
-			var queue = jQuery.queue( this, type, data );
-
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, object ) {
-		if ( typeof type !== "string" ) {
-			object = type;
-			type = undefined;
-		}
-		type = type || "fx";
-		var defer = jQuery.Deferred(),
-			elements = this,
-			i = elements.length,
-			count = 1,
-			deferDataKey = type + "defer",
-			queueDataKey = type + "queue",
-			markDataKey = type + "mark",
-			tmp;
-		function resolve() {
-			if ( !( --count ) ) {
-				defer.resolveWith( elements, [ elements ] );
-			}
-		}
-		while( i-- ) {
-			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
-					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
-						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
-					jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) {
-				count++;
-				tmp.done( resolve );
-			}
-		}
-		resolve();
-		return defer.promise();
-	}
-});
-
-
-
-
-var rclass = /[\n\t\r]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea)?$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	rinvalidChar = /\:/,
-	formHook, boolHook;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.attr );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-	
-	prop: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.prop );
-	},
-	
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class") || "") );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ",
-							setClass = elem.className;
-
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret,
-			elem = this[0];
-		
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				return (elem.value || "").replace(rreturn, "");
-			}
-
-			return undefined;
-		}
-
-		var isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var self = jQuery(this), val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
-
-				// Loop through all the selected options
-				for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-					var option = options[ i ];
-
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-	
-	attrFix: {
-		// Always normalize to ensure hook usage
-		tabindex: "tabIndex"
-	},
-	
-	attr: function( elem, name, value, pass ) {
-		var nType = elem.nodeType;
-		
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return undefined;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( !("getAttribute" in elem) ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// Normalize the name if needed
-		name = notxml && jQuery.attrFix[ name ] || name;
-
-		hooks = jQuery.attrHooks[ name ];
-
-		if ( !hooks ) {
-			// Use boolHook for boolean attributes
-			if ( rboolean.test( name ) &&
-				(typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase()) ) {
-
-				hooks = boolHook;
-
-			// Use formHook for forms and if the name contains certain characters
-			} else if ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) {
-				hooks = formHook;
-			}
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return undefined;
-
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, "" + value );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && notxml ) {
-			return hooks.get( elem, name );
-
-		} else {
-
-			ret = elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, name ) {
-		var propName;
-		if ( elem.nodeType === 1 ) {
-			name = jQuery.attrFix[ name ] || name;
-		
-			if ( jQuery.support.getSetAttribute ) {
-				// Use removeAttribute in browsers that support it
-				elem.removeAttribute( name );
-			} else {
-				jQuery.attr( elem, name, "" );
-				elem.removeAttributeNode( elem.getAttributeNode( name ) );
-			}
-
-			// Set corresponding property to false for boolean attributes
-			if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) {
-				elem[ propName ] = false;
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		},
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabIndex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-	
-	prop: function( elem, name, value ) {
-		var nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return undefined;
-		}
-
-		var ret, hooks,
-			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.propFix[ name ] || name;
-		
-		hooks = jQuery.propHooks[ name ];
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return (elem[ name ] = value);
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-	
-	propHooks: {}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		return elem[ jQuery.propFix[ name ] || name ] ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = value;
-			}
-
-			elem.setAttribute( name, name.toLowerCase() );
-		}
-		return name;
-	}
-};
-
-// Use the value property for back compat
-// Use the formHook for button elements in IE6/7 (#1954)
-jQuery.attrHooks.value = {
-	get: function( elem, name ) {
-		if ( formHook && jQuery.nodeName( elem, "button" ) ) {
-			return formHook.get( elem, name );
-		}
-		return elem.value;
-	},
-	set: function( elem, value, name ) {
-		if ( formHook && jQuery.nodeName( elem, "button" ) ) {
-			return formHook.set( elem, value, name );
-		}
-		// Does not return so that setAttribute is also used
-		elem.value = value;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !jQuery.support.getSetAttribute ) {
-
-	// propFix is more comprehensive and contains all fixes
-	jQuery.attrFix = jQuery.propFix;
-	
-	// Use this for any attribute on a form in IE6/7
-	formHook = jQuery.attrHooks.name = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			// Return undefined if nodeValue is empty string
-			return ret && ret.nodeValue !== "" ?
-				ret.nodeValue :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Check form objects in IE (multiple bugs related)
-			// Only use nodeValue if the attribute node exists on the form
-			var ret = elem.getAttributeNode( name );
-			if ( ret ) {
-				ret.nodeValue = value;
-				return value;
-			}
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
-		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return (elem.style.cssText = "" + value);
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-	});
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0);
-			}
-		}
-	});
-});
-
-
-
-
-var hasOwn = Object.prototype.hasOwnProperty,
-	rnamespaces = /\.(.*)$/,
-	rformElems = /^(?:textarea|input|select)$/i,
-	rperiod = /\./g,
-	rspaces = / /g,
-	rescape = /[^\w\s.|`]/g,
-	fcleanup = function( nm ) {
-		return nm.replace(rescape, "\\$&");
-	};
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		} else if ( !handler ) {
-			// Fixes bug #7229. Fix recommended by jdalton
-			return;
-		}
-
-		var handleObjIn, handleObj;
-
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure
-		var elemData = jQuery._data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
-		}
-
-		var events = elemData.events,
-			eventHandle = elemData.handle;
-
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-		}
-
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
-
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
-
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
-
-			handleObj.type = type;
-			if ( !handleObj.guid ) {
-				handleObj.guid = handler.guid;
-			}
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
-
-			// Keep track of which events have been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		}
-
-		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
-			events = elemData && elemData.events;
-
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" +
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
-				}
-
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-
-			for ( j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
-
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
-					}
-
-					if ( pos != null ) {
-						break;
-					}
-				}
-			}
-
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				ret = null;
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem, undefined, true );
-			}
-		}
-	},
-	
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Event object or event type
-		var type = event.type || event,
-			namespaces = [],
-			exclusive;
-
-		if ( type.indexOf("!") >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
-
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
-
-		event.type = type;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
-		
-		// triggerHandler() and global events don't bubble or run the default action
-		if ( onlyHandlers || !elem ) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-
-		// Handle a global trigger
-		if ( !elem ) {
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			jQuery.each( jQuery.cache, function() {
-				// internalKey variable is just used to make it easier to find
-				// and potentially change this stuff later; currently it just
-				// points to jQuery.expando
-				var internalKey = jQuery.expando,
-					internalCache = this[ internalKey ];
-				if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
-					jQuery.event.trigger( event, data, internalCache.handle.elem );
-				}
-			});
-			return;
-		}
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		event.target = elem;
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
-
-		var cur = elem,
-			// IE doesn't like method names with a colon (#3533, #8272)
-			ontype = type.indexOf(":") < 0 ? "on" + type : "";
-
-		// Fire event on the current element, then bubble up the DOM tree
-		do {
-			var handle = jQuery._data( cur, "handle" );
-
-			event.currentTarget = cur;
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Trigger an inline bound script
-			if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) {
-				event.result = false;
-				event.preventDefault();
-			}
-
-			// Bubble up to document, then to window
-			cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window;
-		} while ( cur && !event.isPropagationStopped() );
-
-		// If nobody prevented the default action, do it now
-		if ( !event.isDefaultPrevented() ) {
-			var old,
-				special = jQuery.event.special[ type ] || {};
-
-			if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction)() check here because IE6/7 fails that test.
-				// IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch.
-				try {
-					if ( ontype && elem[ type ] ) {
-						// Don't re-trigger an onFOO event when we call its FOO() method
-						old = elem[ ontype ];
-
-						if ( old ) {
-							elem[ ontype ] = null;
-						}
-
-						jQuery.event.triggered = type;
-						elem[ type ]();
-					}
-				} catch ( ieError ) {}
-
-				if ( old ) {
-					elem[ ontype ] = old;
-				}
-
-				jQuery.event.triggered = undefined;
-			}
-		}
-		
-		return event.result;
-	},
-
-	handle: function( event ) {
-		event = jQuery.event.fix( event || window.event );
-		// Snapshot the handlers list since a called handler may add/remove events.
-		var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0),
-			run_all = !event.exclusive && !event.namespace,
-			args = Array.prototype.slice.call( arguments, 0 );
-
-		// Use the fix-ed Event rather than the (read-only) native event
-		args[0] = event;
-		event.currentTarget = this;
-
-		for ( var j = 0, l = handlers.length; j < l; j++ ) {
-			var handleObj = handlers[ j ];
-
-			// Triggered event must 1) be non-exclusive and have no namespace, or
-			// 2) have namespace(s) a subset or equal to those in the bound event.
-			if ( run_all || event.namespace_re.test( handleObj.namespace ) ) {
-				// Pass in a reference to the handler function itself
-				// So that we can later remove it
-				event.handler = handleObj.handler;
-				event.data = handleObj.data;
-				event.handleObj = handleObj;
-
-				var ret = handleObj.handler.apply( this, args );
-
-				if ( ret !== undefined ) {
-					event.result = ret;
-					if ( ret === false ) {
-						event.preventDefault();
-						event.stopPropagation();
-					}
-				}
-
-				if ( event.isImmediatePropagationStopped() ) {
-					break;
-				}
-			}
-		}
-		return event.result;
-	},
-
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
-
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary
-		if ( !event.target ) {
-			// Fixes #1925 where srcElement might not be defined either
-			event.target = event.srcElement || document;
-		}
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var eventDocument = event.target.ownerDocument || document,
-				doc = eventDocument.documentElement,
-				body = eventDocument.body;
-
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
-			event.which = event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
-	},
-
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
-
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this,
-					liveConvert( handleObj.origType, handleObj.selector ),
-					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
-			},
-
-			remove: function( handleObj ) {
-				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
-			}
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
-				}
-			},
-
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		if ( elem.detachEvent ) {
-			elem.detachEvent( "on" + type, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// set the correct event type
-	event.type = event.data;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-
-		// Chrome does something similar, the parentNode property
-		// can be accessed but is null.
-		if ( parent && parent !== document && !parent.parentNode ) {
-			return;
-		}
-
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
-		}
-	};
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( !jQuery.nodeName( this, "form" ) ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						trigger( "submit", this, arguments );
-					}
-				});
-
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
-				return false;
-			}
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
-		}
-	};
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
-	var changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( jQuery.nodeName( elem, "select" ) ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery._data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery._data( elem, "_change_data", val );
-		}
-
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			e.liveFired = undefined;
-			jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
-	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange,
-
-			beforedeactivate: testChange,
-
-			click: function( e ) {
-				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
-
-				if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) {
-					testChange.call( this, e );
-				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
-
-				if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery._data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
-
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return rformElems.test( this.nodeName );
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
-
-			return rformElems.test( this.nodeName );
-		}
-	};
-
-	changeFilters = jQuery.event.special.change.filters;
-
-	// Handle when the input is .focus()'d
-	changeFilters.focus = changeFilters.beforeactivate;
-}
-
-function trigger( type, elem, args ) {
-	// Piggyback on a donor event to simulate a different one.
-	// Fake originalEvent to avoid donor's stopPropagation, but if the
-	// simulated event prevents default then we do the same on the donor.
-	// Don't pass args or remember liveFired; they apply to the donor event.
-	var event = jQuery.extend( {}, args[ 0 ] );
-	event.type = type;
-	event.originalEvent = {};
-	event.liveFired = undefined;
-	jQuery.event.handle.call( elem, event );
-	if ( event.isDefaultPrevented() ) {
-		args[ 0 ].preventDefault();
-	}
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0;
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-
-		function handler( donor ) {
-			// Donor event is always a native one; fix it and switch its type.
-			// Let focusin/out handler cancel the donor focus/blur event.
-			var e = jQuery.event.fix( donor );
-			e.type = fix;
-			e.originalEvent = {};
-			jQuery.event.trigger( e, null, e.target );
-			if ( e.isDefaultPrevented() ) {
-				donor.preventDefault();
-			}
-		}
-	});
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		var handler;
-
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-
-		if ( arguments.length === 2 || data === false ) {
-			fn = data;
-			data = undefined;
-		}
-
-		if ( name === "one" ) {
-			handler = function( event ) {
-				jQuery( this ).unbind( event, handler );
-				return fn.apply( this, arguments );
-			};
-			handler.guid = fn.guid || jQuery.guid++;
-		} else {
-			handler = fn;
-		}
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
-			}
-		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
-		}
-
-		return this;
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
-	},
-
-	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-			return this.unbind( "live" );
-
-		} else {
-			return this.die( types, null, fn, selector );
-		}
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
-
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
-
-		if ( typeof types === "object" && !types.preventDefault ) {
-			for ( var key in types ) {
-				context[ name ]( key, data, types[key], selector );
-			}
-
-			return this;
-		}
-
-		if ( name === "die" && !types &&
-					origSelector && origSelector.charAt(0) === "." ) {
-
-			context.unbind( origSelector );
-
-			return this;
-		}
-
-		if ( data === false || jQuery.isFunction( data ) ) {
-			fn = data || returnFalse;
-			data = undefined;
-		}
-
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( liveMap[ type ] ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				for ( var j = 0, l = context.length; j < l; j++ ) {
-					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				}
-
-			} else {
-				// unbind live handler
-				context.unbind( "live." + liveConvert( type, selector ), fn );
-			}
-		}
-
-		return this;
-	};
-});
-
-function liveHandler( event ) {
-	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
-		elems = [],
-		selectors = [],
-		events = jQuery._data( this, "events" );
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
-	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
-		return;
-	}
-
-	if ( event.namespace ) {
-		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		close = match[i];
-
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
-				elem = close.elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					event.type = handleObj.preType;
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-
-					// Make sure not to accidentally match a child element with the same selector
-					if ( related && jQuery.contains( elem, related ) ) {
-						related = elem;
-					}
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-
-		if ( maxLevel && match.level > maxLevel ) {
-			break;
-		}
-
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		ret = match.handleObj.origHandler.apply( match.elem, arguments );
-
-		if ( ret === false || event.isPropagationStopped() ) {
-			maxLevel = match.level;
-
-			if ( ret === false ) {
-				stop = false;
-			}
-			if ( event.isImmediatePropagationStopped() ) {
-				break;
-			}
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.bind( name, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-
-
-/*!
- * Sizzle CSS Selector Engine
- *  Copyright 2011, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true,
-	rBackslash = /\\/g,
-	rNonWord = /\W/;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function() {
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
-
-	var origContext = context;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var m, set, checkSet, extra, ret, cur, pop, i,
-		prune = true,
-		contextXML = Sizzle.isXML( context ),
-		parts = [],
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	do {
-		chunker.exec( "" );
-		m = chunker.exec( soFar );
-
-		if ( m ) {
-			soFar = m[3];
-		
-			parts.push( m[1] );
-		
-			if ( m[2] ) {
-				extra = m[3];
-				break;
-			}
-		}
-	} while ( m );
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
-			ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set )[0] :
-				ret.set[0];
-		}
-
-		if ( context ) {
-			ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
-			set = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set ) :
-				ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray( set );
-
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				cur = parts.pop();
-				pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-
-		} else if ( context && context.nodeType === 1 ) {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-
-		} else {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort( sortOrder );
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[ i - 1 ] ) {
-					results.splice( i--, 1 );
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function( expr, set ) {
-	return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
-	return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
-	var set;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var match,
-			type = Expr.order[i];
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice( 1, 1 );
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace( rBackslash, "" );
-				set = Expr.find[ type ]( match, context, isXML );
-
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( "*" ) :
-			[];
-	}
-
-	return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
-	var match, anyFound,
-		old = expr,
-		result = [],
-		curLoop = set,
-		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var found, item,
-					filter = Expr.filter[ type ],
-					left = match[1];
-
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-
-								} else {
-									curLoop[i] = false;
-								}
-
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-
-	leftMatch: {},
-
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-
-	attrHandle: {
-		href: function( elem ) {
-			return elem.getAttribute( "href" );
-		},
-		type: function( elem ) {
-			return elem.getAttribute( "type" );
-		}
-	},
-
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !rNonWord.test( part ),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-
-		">": function( checkSet, part ) {
-			var elem,
-				isPartStr = typeof part === "string",
-				i = 0,
-				l = checkSet.length;
-
-			if ( isPartStr && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-
-			} else {
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-
-		"": function(checkSet, part, isXML){
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
-		},
-
-		"~": function( checkSet, part, isXML ) {
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
-		}
-	},
-
-	find: {
-		ID: function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		},
-
-		NAME: function( match, context ) {
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [],
-					results = context.getElementsByName( match[1] );
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-
-		TAG: function( match, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( match[1] );
-			}
-		}
-	},
-	preFilter: {
-		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
-			match = " " + match[1].replace( rBackslash, "" ) + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-
-		ID: function( match ) {
-			return match[1].replace( rBackslash, "" );
-		},
-
-		TAG: function( match, curLoop ) {
-			return match[1].replace( rBackslash, "" ).toLowerCase();
-		},
-
-		CHILD: function( match ) {
-			if ( match[1] === "nth" ) {
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
-
-				match[2] = match[2].replace(/^\+|\s*/g, '');
-
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-			else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-
-		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
-			var name = match[1] = match[1].replace( rBackslash, "" );
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			// Handle if an un-quoted value was used
-			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-
-		PSEUDO: function( match, curLoop, inplace, result, not ) {
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-
-					return false;
-				}
-
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
-
-		POS: function( match ) {
-			match.unshift( true );
-
-			return match;
-		}
-	},
-	
-	filters: {
-		enabled: function( elem ) {
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-
-		disabled: function( elem ) {
-			return elem.disabled === true;
-		},
-
-		checked: function( elem ) {
-			return elem.checked === true;
-		},
-		
-		selected: function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-			
-			return elem.selected === true;
-		},
-
-		parent: function( elem ) {
-			return !!elem.firstChild;
-		},
-
-		empty: function( elem ) {
-			return !elem.firstChild;
-		},
-
-		has: function( elem, i, match ) {
-			return !!Sizzle( match[3], elem ).length;
-		},
-
-		header: function( elem ) {
-			return (/h\d/i).test( elem.nodeName );
-		},
-
-		text: function( elem ) {
-			var attr = elem.getAttribute( "type" ), type = elem.type;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
-		},
-
-		radio: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
-		},
-
-		checkbox: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
-		},
-
-		file: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
-		},
-
-		password: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
-		},
-
-		submit: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "submit" === elem.type;
-		},
-
-		image: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
-		},
-
-		reset: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "reset" === elem.type;
-		},
-
-		button: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && "button" === elem.type || name === "button";
-		},
-
-		input: function( elem ) {
-			return (/input|select|textarea|button/i).test( elem.nodeName );
-		},
-
-		focus: function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		}
-	},
-	setFilters: {
-		first: function( elem, i ) {
-			return i === 0;
-		},
-
-		last: function( elem, i, match, array ) {
-			return i === array.length - 1;
-		},
-
-		even: function( elem, i ) {
-			return i % 2 === 0;
-		},
-
-		odd: function( elem, i ) {
-			return i % 2 === 1;
-		},
-
-		lt: function( elem, i, match ) {
-			return i < match[3] - 0;
-		},
-
-		gt: function( elem, i, match ) {
-			return i > match[3] - 0;
-		},
-
-		nth: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		},
-
-		eq: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function( elem, match, i, array ) {
-			var name = match[1],
-				filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var j = 0, l = not.length; j < l; j++ ) {
-					if ( not[j] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-
-			} else {
-				Sizzle.error( name );
-			}
-		},
-
-		CHILD: function( elem, match ) {
-			var type = match[1],
-				node = elem;
-
-			switch ( type ) {
-				case "only":
-				case "first":
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					if ( type === "first" ) { 
-						return true; 
-					}
-
-					node = elem;
-
-				case "last":
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					return true;
-
-				case "nth":
-					var first = match[2],
-						last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-
-					if ( first === 0 ) {
-						return diff === 0;
-
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-
-		ID: function( elem, match ) {
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-
-		TAG: function( elem, match ) {
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		
-		CLASS: function( elem, match ) {
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-
-		ATTR: function( elem, match ) {
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-
-		POS: function( elem, match, i, array ) {
-			var name = match[2],
-				filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS,
-	fescape = function(all, num){
-		return "\\" + (num - 0 + 1);
-	};
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-
-var makeArray = function( array, results ) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
-	makeArray = function( array, results ) {
-		var i = 0,
-			ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-
-			} else {
-				for ( ; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
-	};
-
-} else {
-	sortOrder = function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
-
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-	siblingCheck = function( a, b, ret ) {
-		if ( a === b ) {
-			return ret;
-		}
-
-		var cur = a.nextSibling;
-
-		while ( cur ) {
-			if ( cur === b ) {
-				return -1;
-			}
-
-			cur = cur.nextSibling;
-		}
-
-		return 1;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-Sizzle.getText = function( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += Sizzle.getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-};
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date()).getTime(),
-		root = document.documentElement;
-
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-
-				return m ?
-					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-
-		Expr.filter.ID = function( elem, match ) {
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-
-	// release memory in IE
-	root = form = null;
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function( match, context ) {
-			var results = context.getElementsByTagName( match[1] );
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-
-		Expr.attrHandle.href = function( elem ) {
-			return elem.getAttribute( "href", 2 );
-		};
-	}
-
-	// release memory in IE
-	div = null;
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle,
-			div = document.createElement("div"),
-			id = "__sizzle__";
-
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function( query, context, extra, seed ) {
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && !Sizzle.isXML(context) ) {
-				// See if we find a selector to speed up
-				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-				
-				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
-					// Speed-up: Sizzle("TAG")
-					if ( match[1] ) {
-						return makeArray( context.getElementsByTagName( query ), extra );
-					
-					// Speed-up: Sizzle(".CLASS")
-					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
-						return makeArray( context.getElementsByClassName( match[2] ), extra );
-					}
-				}
-				
-				if ( context.nodeType === 9 ) {
-					// Speed-up: Sizzle("body")
-					// The body element only exists once, optimize finding it
-					if ( query === "body" && context.body ) {
-						return makeArray( [ context.body ], extra );
-						
-					// Speed-up: Sizzle("#ID")
-					} else if ( match && match[3] ) {
-						var elem = context.getElementById( match[3] );
-
-						// Check parentNode to catch when Blackberry 4.6 returns
-						// nodes that are no longer in the document #6963
-						if ( elem && elem.parentNode ) {
-							// Handle the case where IE and Opera return items
-							// by name instead of ID
-							if ( elem.id === match[3] ) {
-								return makeArray( [ elem ], extra );
-							}
-							
-						} else {
-							return makeArray( [], extra );
-						}
-					}
-					
-					try {
-						return makeArray( context.querySelectorAll(query), extra );
-					} catch(qsaError) {}
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					var oldContext = context,
-						old = context.getAttribute( "id" ),
-						nid = old || id,
-						hasParent = context.parentNode,
-						relativeHierarchySelector = /^\s*[+~]/.test( query );
-
-					if ( !old ) {
-						context.setAttribute( "id", nid );
-					} else {
-						nid = nid.replace( /'/g, "\\$&" );
-					}
-					if ( relativeHierarchySelector && hasParent ) {
-						context = context.parentNode;
-					}
-
-					try {
-						if ( !relativeHierarchySelector || hasParent ) {
-							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
-						}
-
-					} catch(pseudoError) {
-					} finally {
-						if ( !old ) {
-							oldContext.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		// release memory in IE
-		div = null;
-	})();
-}
-
-(function(){
-	var html = document.documentElement,
-		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
-
-	if ( matches ) {
-		// Check to see if it's possible to do matchesSelector
-		// on a disconnected node (IE 9 fails this)
-		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
-			pseudoWorks = false;
-
-		try {
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( document.documentElement, "[test!='']:sizzle" );
-	
-		} catch( pseudoError ) {
-			pseudoWorks = true;
-		}
-
-		Sizzle.matchesSelector = function( node, expr ) {
-			// Make sure that attribute selectors are quoted
-			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			if ( !Sizzle.isXML( node ) ) {
-				try { 
-					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
-						var ret = matches.call( node, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || !disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9, so check for that
-								node.document && node.document.nodeType !== 11 ) {
-							return ret;
-						}
-					}
-				} catch(e) {}
-			}
-
-			return Sizzle(expr, null, null, [node]).length > 0;
-		};
-	}
-})();
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function( match, context, isXML ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	// release memory in IE
-	div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-			
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-if ( document.documentElement.contains ) {
-	Sizzle.contains = function( a, b ) {
-		return a !== b && (a.contains ? a.contains(b) : true);
-	};
-
-} else if ( document.documentElement.compareDocumentPosition ) {
-	Sizzle.contains = function( a, b ) {
-		return !!(a.compareDocumentPosition(b) & 16);
-	};
-
-} else {
-	Sizzle.contains = function() {
-		return false;
-	};
-}
-
-Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context ) {
-	var match,
-		tmpSet = [],
-		later = "",
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	slice = Array.prototype.slice,
-	POS = jQuery.expr.match.POS,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var self = this,
-			i, l;
-
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			});
-		}
-
-		var ret = this.pushStack( "", "find", selector ),
-			length, n, r;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-
-	is: function( selector ) {
-		return !!selector && ( typeof selector === "string" ?
-			jQuery.filter( selector, this ).length > 0 :
-			this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var ret = [], i, l, cur = this[0];
-		
-		// Array
-		if ( jQuery.isArray( selectors ) ) {
-			var match, selector,
-				matches = {},
-				level = 1;
-
-			if ( cur && selectors.length ) {
-				for ( i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
-
-					if ( !matches[ selector ] ) {
-						matches[ selector ] = POS.test( selector ) ?
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[ selector ];
-
-						if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) {
-							ret.push({ selector: selector, elem: cur, level: level });
-						}
-					}
-
-					cur = cur.parentNode;
-					level++;
-				}
-			}
-
-			return ret;
-		}
-
-		// String
-		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-
-				} else {
-					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
-						break;
-					}
-				}
-			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-		return this.pushStack( ret, "closest", selectors );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until ),
-			// The variable 'args' was introduced in
-			// https://github.com/jquery/jquery/commit/52a0238
-			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
-			// http://code.google.com/p/v8/issues/detail?id=1050
-			args = slice.call(arguments);
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, args.join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-}
-
-
-
-
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery( this );
-
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
-
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, "<$1></$2>");
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
-
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery( this );
-
-				self.html( value.call(this, i, self.html()) );
-			});
-
-		} else {
-			this.empty().append( value );
-		}
-
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.length ?
-				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-				this;
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, fragment, parent,
-			value = args[0],
-			scripts = [];
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = jQuery.buildFragment( args, this, scripts );
-			}
-
-			fragment = results.fragment;
-
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						// Make sure that we do not leak memory by inadvertently discarding
-						// the original fragment (which might have attached data) instead of
-						// using it; in addition, use the original fragment object for the last
-						// item instead of first because it can end up being emptied incorrectly
-						// in certain situations (Bug #8070).
-						// Fragments from the fragment cache must always be cloned and never used
-						// in place.
-						results.cacheable || (l > 1 && i < lastIndex) ?
-							jQuery.clone( fragment, true, true ) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
-			}
-		}
-
-		return this;
-	}
-});
-
-function root( elem, cur ) {
-	return jQuery.nodeName(elem, "table") ?
-		(elem.getElementsByTagName("tbody")[0] ||
-		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-		elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var internalKey = jQuery.expando,
-		oldData = jQuery.data( src ),
-		curData = jQuery.data( dest, oldData );
-
-	// Switch to use the internal data object, if it exists, for the next
-	// stage of data copying
-	if ( (oldData = oldData[ internalKey ]) ) {
-		var events = oldData.events;
-				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
-				}
-			}
-		}
-	}
-}
-
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
-
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 fail to clone children inside object elements that use
-	// the proprietary classid attribute value (rather than the type
-	// attribute) to identify the type of content to display
-	if ( nodeName === "object" ) {
-		dest.outerHTML = src.outerHTML;
-
-	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-		if ( src.checked ) {
-			dest.defaultChecked = dest.checked = src.checked;
-		}
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
-		cacheable = true;
-
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults && cacheresults !== 1 ) {
-			fragment = cacheresults;
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [],
-			insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
-			}
-
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-function getAll( elem ) {
-	if ( "getElementsByTagName" in elem ) {
-		return elem.getElementsByTagName( "*" );
-
-	} else if ( "querySelectorAll" in elem ) {
-		return elem.querySelectorAll( "*" );
-
-	} else {
-		return [];
-	}
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( elem.type === "checkbox" || elem.type === "radio" ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-// Finds all inputs and passes them to fixDefaultChecked
-function findInputs( elem ) {
-	if ( jQuery.nodeName( elem, "input" ) ) {
-		fixDefaultChecked( elem );
-	} else if ( elem.getElementsByTagName ) {
-		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var clone = elem.cloneNode(true),
-				srcElements,
-				destElements,
-				i;
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName
-			// instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				cloneFixAttributes( srcElements[i], destElements[i] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
-
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
-
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	clean: function( elems, context, fragment, scripts ) {
-		var checkScriptType;
-
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		var ret = [], j;
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Trim whitespace, otherwise indexOf won't work as expected
-					var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-						wrap = wrapMap[ tag ] || wrapMap._default,
-						depth = wrap[0],
-						div = context.createElement("div");
-
-					// Go to html and back, then peel off extra wrappers
-					div.innerHTML = wrap[1] + elem + wrap[2];
-
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						var hasBody = rtbody.test(elem),
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
-
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
-
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
-							}
-						}
-					}
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
-
-					elem = div.childNodes;
-				}
-			}
-
-			// Resets defaultChecked for any radios and checkboxes
-			// about to be appended to the DOM in IE 6/7 (#8060)
-			var len;
-			if ( !jQuery.support.appendChecked ) {
-				if ( elem[0] && typeof (len = elem.length) === "number" ) {
-					for ( j = 0; j < len; j++ ) {
-						findInputs( elem[j] );
-					}
-				} else {
-					findInputs( elem );
-				}
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			checkScriptType = function( elem ) {
-				return !elem.type || rscriptType.test( elem.type );
-			};
-			for ( i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
-
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-				continue;
-			}
-
-			id = elem[ jQuery.expando ];
-
-			if ( id ) {
-				data = cache[ id ] && cache[ id ][ internalKey ];
-
-				if ( data && data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						// This is a shortcut to avoid jQuery.event.remove's overhead
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
-						}
-					}
-
-					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
-					if ( data.handle ) {
-						data.handle.elem = null;
-					}
-				}
-
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-
-				delete cache[ id ];
-			}
-		}
-	}
-});
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
-	}
-
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	rdashAlpha = /-([a-z])/ig,
-	// fixed for IE9, see #8346
-	rupper = /([A-Z]|^ms)/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-	rrelNum = /^[+\-]=/,
-	rrelNumFilter = /[^+\-\.\de]+/g,
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-	curCSS,
-
-	getComputedStyle,
-	currentStyle,
-
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	// Setting 'undefined' is a no-op
-	if ( arguments.length === 2 && value === undefined ) {
-		return this;
-	}
-
-	return jQuery.access( this, name, value, true, function( elem, name, value ) {
-		return value !== undefined ?
-			jQuery.style( elem, name, value ) :
-			jQuery.css( elem, name );
-	});
-};
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity", "opacity" );
-					return ret === "" ? "1" : ret;
-
-				} else {
-					return elem.style.opacity;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"zIndex": true,
-		"fontWeight": true,
-		"opacity": true,
-		"zoom": true,
-		"lineHeight": true,
-		"widows": true,
-		"orphans": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, origName = jQuery.camelCase( name ),
-			style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( type === "number" && isNaN( value ) || value == null ) {
-				return;
-			}
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && rrelNum.test( value ) ) {
-				value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) );
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra ) {
-		var ret, hooks;
-
-		// Make sure that we're working with the right name
-		name = jQuery.camelCase( name );
-		hooks = jQuery.cssHooks[ name ];
-		name = jQuery.cssProps[ name ] || name;
-
-		// cssFloat needs a special treatment
-		if ( name === "cssFloat" ) {
-			name = "float";
-		}
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
-			return ret;
-
-		// Otherwise, if a way to get the computed value exists, use that
-		} else if ( curCSS ) {
-			return curCSS( elem, name );
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-	},
-
-	camelCase: function( string ) {
-		return string.replace( rdashAlpha, fcamelCase );
-	}
-});
-
-// DEPRECATED, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-jQuery.each(["height", "width"], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			var val;
-
-			if ( computed ) {
-				if ( elem.offsetWidth !== 0 ) {
-					val = getWH( elem, name, extra );
-
-				} else {
-					jQuery.swap( elem, cssShow, function() {
-						val = getWH( elem, name, extra );
-					});
-				}
-
-				if ( val <= 0 ) {
-					val = curCSS( elem, name, name );
-
-					if ( val === "0px" && currentStyle ) {
-						val = currentStyle( elem, name, name );
-					}
-
-					if ( val != null ) {
-						// Should return "auto" instead of 0, use 0 for
-						// temporary backwards-compat
-						return val === "" || val === "auto" ? "0px" : val;
-					}
-				}
-
-				if ( val < 0 || val == null ) {
-					val = elem.style[ name ];
-
-					// Should return "auto" instead of 0, use 0 for
-					// temporary backwards-compat
-					return val === "" || val === "auto" ? "0px" : val;
-				}
-
-				return typeof val === "string" ? val : val + "px";
-			}
-		},
-
-		set: function( elem, value ) {
-			if ( rnumpx.test( value ) ) {
-				// ignore negative width and height values #1599
-				value = parseFloat(value);
-
-				if ( value >= 0 ) {
-					return value + "px";
-				}
-
-			} else {
-				return value;
-			}
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( parseFloat( RegExp.$1 ) / 100 ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle;
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// Set the alpha filter to set the opacity
-			var opacity = jQuery.isNaN( value ) ?
-				"" :
-				"alpha(opacity=" + value * 100 + ")",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery(function() {
-	// This hook cannot be added until DOM ready because the support test
-	// for it is not run until after DOM ready
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				var ret;
-				jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						ret = curCSS( elem, "margin-right", "marginRight" );
-					} else {
-						ret = elem.style.marginRight;
-					}
-				});
-				return ret;
-			}
-		};
-	}
-});
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, name ) {
-		var ret, defaultView, computedStyle;
-
-		name = name.replace( rupper, "-$1" ).toLowerCase();
-
-		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
-			return undefined;
-		}
-
-		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-			ret = computedStyle.getPropertyValue( name );
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-		}
-
-		return ret;
-	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
-		var left,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
-			style = elem.style;
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-			// Remember the original values
-			left = style.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : (ret || 0);
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWH( elem, name, extra ) {
-	var which = name === "width" ? cssWidth : cssHeight,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-	if ( extra === "border" ) {
-		return val;
-	}
-
-	jQuery.each( which, function() {
-		if ( !extra ) {
-			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
-		}
-
-		if ( extra === "margin" ) {
-			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
-
-		} else {
-			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
-		}
-	});
-
-	return val;
-}
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth,
-			height = elem.offsetHeight;
-
-		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rspacesAjax = /\s+/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Document location
-	ajaxLocation,
-
-	// Document location segments
-	ajaxLocParts;
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		if ( jQuery.isFunction( func ) ) {
-			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
-				i = 0,
-				length = dataTypes.length,
-				dataType,
-				list,
-				placeBefore;
-
-			// For each dataType in the dataTypeExpression
-			for(; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters ),
-		selection;
-
-	for(; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
-			}
-		}
-	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" && _load ) {
-			return _load.apply( this, arguments );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf( " " );
-		if ( off >= 0 ) {
-			var selector = url.slice( off, url.length );
-			url = url.slice( 0, off );
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = undefined;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			// Complete callback (responseText is used internally)
-			complete: function( jqXHR, status, responseText ) {
-				// Store the response as specified by the jqXHR object
-				responseText = jqXHR.responseText;
-				// If successful, inject the HTML into all the matched elements
-				if ( jqXHR.isResolved() ) {
-					// #4825: Get the actual response in case
-					// a dataFilter is present in ajaxSettings
-					jqXHR.done(function( r ) {
-						responseText = r;
-					});
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [ responseText, status, jqXHR ] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-
-	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.bind( o, f );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			type: method,
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	};
-});
-
-jQuery.extend({
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function ( target, settings ) {
-		if ( !settings ) {
-			// Only one parameter, we extend ajaxSettings
-			settings = target;
-			target = jQuery.extend( true, jQuery.ajaxSettings, settings );
-		} else {
-			// target was provided, we extend into it
-			jQuery.extend( true, target, jQuery.ajaxSettings, settings );
-		}
-		// Flatten fields we don't want deep extended
-		for( var field in { context: 1, url: 1 } ) {
-			if ( field in settings ) {
-				target[ field ] = settings[ field ];
-			} else if( field in jQuery.ajaxSettings ) {
-				target[ field ] = jQuery.ajaxSettings[ field ];
-			}
-		}
-		return target;
-	},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": "*/*"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		}
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery._Deferred(),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// ifModified key
-			ifModifiedKey,
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// The jqXHR state
-			state = 0,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Fake xhr
-			jqXHR = {
-
-				readyState: 0,
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || "abort";
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
-				}
-			};
-
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, statusText, responses, headers ) {
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status ? 4 : 0;
-
-			var isSuccess,
-				success,
-				error,
-				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
-				lastModified,
-				etag;
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-
-					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
-						jQuery.lastModified[ ifModifiedKey ] = lastModified;
-					}
-					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
-						jQuery.etag[ ifModifiedKey ] = etag;
-					}
-				}
-
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
-
-				// If we have data
-				} else {
-
-					try {
-						success = ajaxConvert( s, response );
-						statusText = "success";
-						isSuccess = true;
-					} catch(e) {
-						// We have a parsererror
-						statusText = "parsererror";
-						error = e;
-					}
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = statusText;
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.done;
-
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.then( tmp, tmp );
-				}
-			}
-			return this;
-		};
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
-
-		// Determine if a cross-domain request is in order
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefiler, stop there
-		if ( state === 2 ) {
-			return false;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-			}
-
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
-
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-				// Abort if not done already
-				jqXHR.abort();
-				return false;
-
-		}
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( status < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					jQuery.error( e );
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [],
-			add = function( key, value ) {
-				// If value is a function, invoke it and return its value
-				value = jQuery.isFunction( value ) ? value() : value;
-				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-			};
-
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[ prefix ], traditional, add );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join( "&" ).replace( r20, "+" );
-	}
-});
-
-function buildParams( prefix, obj, traditional, add ) {
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && obj != null && typeof obj === "object" ) {
-		// Serialize object item.
-		for ( var name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields,
-		ct,
-		type,
-		finalDataType,
-		firstDataType;
-
-	// Fill responseXXX fields
-	for( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	var dataTypes = s.dataTypes,
-		converters = {},
-		i,
-		key,
-		length = dataTypes.length,
-		tmp,
-		// Current and previous dataTypes
-		current = dataTypes[ 0 ],
-		prev,
-		// Conversion expression
-		conversion,
-		// Conversion function
-		conv,
-		// Conversion functions (transitive conversion)
-		conv1,
-		conv2;
-
-	// For each dataType in the chain
-	for( i = 1; i < length; i++ ) {
-
-		// Create converters map
-		// with lowercased keys
-		if ( i === 1 ) {
-			for( key in s.converters ) {
-				if( typeof key === "string" ) {
-					converters[ key.toLowerCase() ] = s.converters[ key ];
-				}
-			}
-		}
-
-		// Get the dataTypes
-		prev = current;
-		current = dataTypes[ i ];
-
-		// If current is auto dataType, update it to prev
-		if( current === "*" ) {
-			current = prev;
-		// If no auto and dataTypes are actually different
-		} else if ( prev !== "*" && prev !== current ) {
-
-			// Get the converter
-			conversion = prev + " " + current;
-			conv = converters[ conversion ] || converters[ "* " + current ];
-
-			// If there is no direct converter, search transitively
-			if ( !conv ) {
-				conv2 = undefined;
-				for( conv1 in converters ) {
-					tmp = conv1.split( " " );
-					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
-						conv2 = converters[ tmp[1] + " " + current ];
-						if ( conv2 ) {
-							conv1 = converters[ conv1 ];
-							if ( conv1 === true ) {
-								conv = conv2;
-							} else if ( conv2 === true ) {
-								conv = conv1;
-							}
-							break;
-						}
-					}
-				}
-			}
-			// If we found no converter, dispatch an error
-			if ( !( conv || conv2 ) ) {
-				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
-			}
-			// If found converter is not an equivalence
-			if ( conv !== true ) {
-				// Convert with 1 or 2 converters accordingly
-				response = conv ? conv( response ) : conv2( conv1(response) );
-			}
-		}
-	}
-	return response;
-}
-
-
-
-
-var jsc = jQuery.now(),
-	jsre = /(\=)\?(&|$)|\?\?/i;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		return jQuery.expando + "_" + ( jsc++ );
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
-		( typeof s.data === "string" );
-
-	if ( s.dataTypes[ 0 ] === "jsonp" ||
-		s.jsonp !== false && ( jsre.test( s.url ) ||
-				inspectData && jsre.test( s.data ) ) ) {
-
-		var responseContainer,
-			jsonpCallback = s.jsonpCallback =
-				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-			previous = window[ jsonpCallback ],
-			url = s.url,
-			data = s.data,
-			replace = "$1" + jsonpCallback + "$2";
-
-		if ( s.jsonp !== false ) {
-			url = url.replace( jsre, replace );
-			if ( s.url === url ) {
-				if ( inspectData ) {
-					data = data.replace( jsre, replace );
-				}
-				if ( s.data === data ) {
-					// Add callback manually
-					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
-				}
-			}
-		}
-
-		s.url = url;
-		s.data = data;
-
-		// Install callback
-		window[ jsonpCallback ] = function( response ) {
-			responseContainer = [ response ];
-		};
-
-		// Clean-up function
-		jqXHR.always(function() {
-			// Set callback back to previous value
-			window[ jsonpCallback ] = previous;
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( previous ) ) {
-				window[ jsonpCallback ]( responseContainer[ 0 ] );
-			}
-		});
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( jsonpCallback + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = "async";
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-
-						// Dereference the script
-						script = undefined;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0,
-	xhrCallbacks;
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var xhr = s.xhr(),
-						handle,
-						i;
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( _ ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-									responses.text = xhr.responseText;
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					// if we're in sync mode or it's in cache
-					// and has been retrieved directly (IE6 & IE7)
-					// we need to manually fire the callback
-					if ( !s.async || xhr.readyState === 4 ) {
-						callback();
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
-					}
-				}
-			};
-		}
-	});
-}
-
-
-
-
-var elemdisplay = {},
-	iframe, iframeDoc,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	],
-	fxNow,
-	requestAnimationFrame = window.webkitRequestAnimationFrame ||
-	    window.mozRequestAnimationFrame ||
-	    window.oRequestAnimationFrame;
-
-jQuery.fn.extend({
-	show: function( speed, easing, callback ) {
-		var elem, display;
-
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("show", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				elem = this[i];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					// Reset the inline display of this element to learn if it is
-					// being hidden by cascaded rules or not
-					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
-						display = elem.style.display = "";
-					}
-
-					// Set elements which have been overridden with display: none
-					// in a stylesheet to whatever the default browser style is
-					// for such an element
-					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
-						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
-					}
-				}
-			}
-
-			// Set the display of most of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				elem = this[i];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					if ( display === "" || display === "none" ) {
-						elem.style.display = jQuery._data(elem, "olddisplay") || "";
-					}
-				}
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, easing, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				if ( this[i].style ) {
-					var display = jQuery.css( this[i], "display" );
-
-					if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
-						jQuery._data( this[i], "olddisplay", display );
-					}
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				if ( this[i].style ) {
-					this[i].style.display = "none";
-				}
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2, callback ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2, callback);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, easing, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, easing, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete, [ false ] );
-		}
-
-		// Do not change referenced properties as per-property easing will be lost
-		prop = jQuery.extend( {}, prop );
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			// XXX 'this' does not always have a nodeName when running the
-			// test suite
-
-			if ( optall.queue === false ) {
-				jQuery._mark( this );
-			}
-
-			var opt = jQuery.extend( {}, optall ),
-				isElement = this.nodeType === 1,
-				hidden = isElement && jQuery(this).is(":hidden"),
-				name, val, p,
-				display, e,
-				parts, start, end, unit;
-
-			// will store per property easing and be used to determine when an animation is complete
-			opt.animatedProperties = {};
-
-			for ( p in prop ) {
-
-				// property name normalization
-				name = jQuery.camelCase( p );
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-				}
-
-				val = prop[ name ];
-
-				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
-				if ( jQuery.isArray( val ) ) {
-					opt.animatedProperties[ name ] = val[ 1 ];
-					val = prop[ name ] = val[ 0 ];
-				} else {
-					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
-				}
-
-				if ( val === "hide" && hidden || val === "show" && !hidden ) {
-					return opt.complete.call( this );
-				}
-
-				if ( isElement && ( name === "height" || name === "width" ) ) {
-					// Make sure that nothing sneaks out
-					// Record all 3 overflow attributes because IE does not
-					// change the overflow attribute when overflowX and
-					// overflowY are set to the same value
-					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
-					// Set display property to inline-block for height/width
-					// animations on inline elements that are having width/height
-					// animated
-					if ( jQuery.css( this, "display" ) === "inline" &&
-							jQuery.css( this, "float" ) === "none" ) {
-						if ( !jQuery.support.inlineBlockNeedsLayout ) {
-							this.style.display = "inline-block";
-
-						} else {
-							display = defaultDisplay( this.nodeName );
-
-							// inline-level elements accept inline-block;
-							// block-level elements need to be inline with layout
-							if ( display === "inline" ) {
-								this.style.display = "inline-block";
-
-							} else {
-								this.style.display = "inline";
-								this.style.zoom = 1;
-							}
-						}
-					}
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			for ( p in prop ) {
-				e = new jQuery.fx( this, opt, p );
-				val = prop[ p ];
-
-				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]();
-
-				} else {
-					parts = rfxnum.exec( val );
-					start = e.cur();
-
-					if ( parts ) {
-						end = parseFloat( parts[2] );
-						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							jQuery.style( this, p, (end || 1) + unit);
-							start = ((end || 1) / e.cur()) * start;
-							jQuery.style( this, p, start + unit);
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			}
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			var timers = jQuery.timers,
-				i = timers.length;
-			// clear marker counters if we know they won't be
-			if ( !gotoEnd ) {
-				jQuery._unmark( true, this );
-			}
-			while ( i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
-	}
-
-});
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout( clearFxNow, 0 );
-	return ( fxNow = jQuery.now() );
-}
-
-function clearFxNow() {
-	fxNow = undefined;
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function( noUnmark ) {
-			if ( opt.queue !== false ) {
-				jQuery.dequeue( this );
-			} else if ( noUnmark !== false ) {
-				jQuery._unmark( this );
-			}
-
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
-			}
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		options.orig = options.orig || {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-	},
-
-	// Get the current size
-	cur: function() {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var parsed,
-			r = jQuery.css( this.elem, this.prop );
-		// Empty strings, null, undefined and "auto" are converted to 0,
-		// complex values such as "rotate(1rad)" are returned as is,
-		// simple values such as "10px" are parsed to Float.
-		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		var self = this,
-			fx = jQuery.fx,
-			raf;
-
-		this.startTime = fxNow || createFxNow();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			// Use requestAnimationFrame instead of setInterval if available
-			if ( requestAnimationFrame ) {
-				timerId = 1;
-				raf = function() {
-					// When timerId gets set to null at any point, this stops
-					if ( timerId ) {
-						requestAnimationFrame( raf );
-						fx.tick();
-					}
-				};
-				requestAnimationFrame( raf );
-			} else {
-				timerId = setInterval( fx.tick, fx.interval );
-			}
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = fxNow || createFxNow(),
-			done = true,
-			elem = this.elem,
-			options = this.options,
-			i, n;
-
-		if ( gotoEnd || t >= options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			options.animatedProperties[ this.prop ] = true;
-
-			for ( i in options.animatedProperties ) {
-				if ( options.animatedProperties[i] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				// Reset the overflow
-				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-
-					jQuery.each( [ "", "X", "Y" ], function (index, value) {
-						elem.style[ "overflow" + value ] = options.overflow[index];
-					});
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( options.hide ) {
-					jQuery(elem).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( options.hide || options.show ) {
-					for ( var p in options.animatedProperties ) {
-						jQuery.style( elem, p, options.orig[p] );
-					}
-				}
-
-				// Execute the complete function
-				options.complete.call( elem );
-			}
-
-			return false;
-
-		} else {
-			// classical easing cannot be used with an Infinity duration
-			if ( options.duration == Infinity ) {
-				this.now = t;
-			} else {
-				n = t - this.startTime;
-				this.state = n / options.duration;
-
-				// Perform the easing function, defaults to swing
-				this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
-				this.now = this.start + ((this.end - this.start) * this.pos);
-			}
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-};
-
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-
-	interval: 13,
-
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-
-	speeds: {
-		slow: 600,
-		fast: 200,
-		// Default speed
-		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style( fx.elem, "opacity", fx.now );
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-// Try to restore the default display value of an element
-function defaultDisplay( nodeName ) {
-
-	if ( !elemdisplay[ nodeName ] ) {
-
-		var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ),
-			display = elem.css( "display" );
-
-		elem.remove();
-
-		// If the simple way fails,
-		// get element's real default display by attaching it to a temp iframe
-		if ( display === "none" || display === "" ) {
-			// No iframe to use yet, so create it
-			if ( !iframe ) {
-				iframe = document.createElement( "iframe" );
-				iframe.frameBorder = iframe.width = iframe.height = 0;
-			}
-
-			document.body.appendChild( iframe );
-
-			// Create a cacheable copy of the iframe document on first call.
-			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake html
-			// document to it, Webkit & Firefox won't allow reusing the iframe document
-			if ( !iframeDoc || !iframe.createElement ) {
-				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-				iframeDoc.write( "<!doctype><html><body></body></html>" );
-			}
-
-			elem = iframeDoc.createElement( nodeName );
-
-			iframeDoc.body.appendChild( elem );
-
-			display = jQuery.css( elem, "display" );
-
-			document.body.removeChild( iframe );
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return elemdisplay[ nodeName ];
-}
-
-
-
-
-var rtable = /^t(?:able|d|h)$/i,
-	rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0], box;
-
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		try {
-			box = elem.getBoundingClientRect();
-		} catch(e) {}
-
-		var doc = elem.ownerDocument,
-			docElem = doc.documentElement;
-
-		// Make sure we're not dealing with a disconnected DOM node
-		if ( !box || !jQuery.contains( docElem, elem ) ) {
-			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
-		}
-
-		var body = doc.body,
-			win = getWindow(doc),
-			clientTop  = docElem.clientTop  || body.clientTop  || 0,
-			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
-			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
-			top  = box.top  + scrollTop  - clientTop,
-			left = box.left + scrollLeft - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var computedStyle,
-			offsetParent = elem.offsetParent,
-			prevOffsetParent = elem,
-			doc = elem.ownerDocument,
-			docElem = doc.documentElement,
-			body = doc.body,
-			defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop,
-			left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent;
-				offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed";
-		checkDiv.style.top = "20px";
-
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden";
-		innerDiv.style.position = "relative";
-
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if (options.top != null) {
-			props.top = (options.top - curOffset.top) + curTop;
-		}
-		if (options.left != null) {
-			props.left = (options.left - curOffset.left) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function( val ) {
-		var elem, win;
-
-		if ( val === undefined ) {
-			elem = this[ 0 ];
-
-			if ( !elem ) {
-				return null;
-			}
-
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
-
-		// Set the scroll offset
-		return this.each(function() {
-			win = getWindow( this );
-
-			if ( win ) {
-				win.scrollTo(
-					!i ? val : jQuery( win ).scrollLeft(),
-					 i ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				this[ method ] = val;
-			}
-		});
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-
-
-
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
-
-		if ( jQuery.isWindow( elem ) ) {
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
-			var docElemProp = elem.document.documentElement[ "client" + name ];
-			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
-				elem.document.body[ "client" + name ] || docElemProp;
-
-		// Get document width or height
-		} else if ( elem.nodeType === 9 ) {
-			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-			return Math.max(
-				elem.documentElement["client" + name],
-				elem.body["scroll" + name], elem.documentElement["scroll" + name],
-				elem.body["offset" + name], elem.documentElement["offset" + name]
-			);
-
-		// Get or set width or height on the element
-		} else if ( size === undefined ) {
-			var orig = jQuery.css( elem, type ),
-				ret = parseFloat( orig );
-
-			return jQuery.isNaN( ret ) ? orig : ret;
-
-		// Set the width or height on the element (default to pixels if value is unitless)
-		} else {
-			return this.css( type, typeof size === "string" ? size : size + "px" );
-		}
-	};
-
-});
-
-
-window.jQuery = window.$ = jQuery;
-})(window);
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/nohtml/jquery-nohtml.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/nohtml/jquery-nohtml.js
deleted file mode 100644
index fda0b1ca7..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/src/vendor/nohtml/jquery-nohtml.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-(function($, document) {
-
-	var create = $.create = (function() {
-
-		function addAttrs( el, obj, context ) {
-			for( var attr in obj ){
-				switch( attr ) {
-				case 'tag' :
-					break;
-				case 'html' :
-					el.innerHTML = obj[ attr ];
-					break;
-				case 'css' :
-					for( var style in obj.css ) {
-						$.attr( el.style, style, obj.css[ style ] );
-					}
-					break;
-				case 'text' : case 'child' : case 'children' :
-					createNode( obj[attr], el, context );
-					break;
-				case 'cls' :
-					el.className = obj[attr];
-					break;
-				case 'data' :
-					for( var data in obj.data ) {
-						$.data( el, data, obj.data[data] );
-					}
-					break;
-				default :
-					if( attr.indexOf("on") === 0 && $.isFunction(obj[attr]) ) {
-						$.event.add( el, attr.substr(2).replace(/^[A-Z]/, function(a) { return a.toLowerCase(); }), obj[attr] );
-					} else {
-						$.attr( el, attr, obj[attr] );
-					}
-				}
-			}
-		}
-
-		function createNode(obj, parent, context) {
-			if(obj && ($.isArray(obj) || obj instanceof $)) {
-				for(var ret = [], i = 0; i < obj.length; i++) {
-					var newNode = createNode(obj[i], parent, context);
-					if(newNode) {
-						ret.push(newNode);
-					}
-				}
-				return ret;
-			}
-			var el;
-			if(typeof(obj) === 'string') {
-				el = context.createTextNode( obj );
-			} else if(!obj) {
-				return undefined;
-			} else if(obj.nodeType === 1) {
-				el = obj;
-			} else if( obj instanceof app.ui.AbstractWidget ) {
-				el = obj.el[0];
-			} else {
-				el = context.createElement( obj.tag || 'DIV' );
-				addAttrs(el, obj, context);
-			}
-			if(parent){ parent.appendChild(el); }
-			return el;
-		}
-
-		return function(elementDef, parentNode) {
-			return createNode(elementDef, parentNode, (parentNode && parentNode.ownerDocument) || document);
-		};
-		
-	})();
-	
-
-	// inject create into jquery internals so object definitions are treated as first class constructors (overrides non-public methods)
-	var clean = $.clean,
-		init = $.fn.init;
-
-	$.clean = function( elems, context, fragment, scripts ) {
-		for(var i = 0; i < elems.length; i++) {
-			if( elems[i].tag || elems[i] instanceof app.ui.AbstractWidget ) {
-				elems[i] = create( elems[i], null, context );
-			}
-		}
-		return clean( elems, context, fragment, scripts );
-	};
-
-	$.fn.init = function( selector, context, rootjQuery ) {
-		if ( selector && ( selector.tag || selector instanceof app.ui.AbstractWidget )) {
-			selector = create( selector, null, context );
-		}
-		return init.call( this, selector, context, rootjQuery );
-	};
-
-	$.fn.init.prototype = $.fn;
-
-})(jQuery, window.document);
-
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/demo.html b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/demo.html
deleted file mode 100644
index 333a92047..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/demo.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>Elasticsearch UI Demo</title>
-		<link rel="stylesheet" href="../_site/base/reset.css">
-		<link rel="stylesheet" href="../_site/app.css">
-		<script src="../_site/i18n.js" data-baseDir="../_site/lang" data-langs="en,fr"></script>
-		<script src="../_site/vendor.js"></script>
-		<script src="../_site/app.js"></script>
-		<script>
-			$( function() {
-				var args = location.search.substring(1).split("&").reduce(function(r, p) {
-					r[decodeURIComponent(p.split("=")[0])] = decodeURIComponent(p.split("=")[1]); return r;
-				}, {});
-				var script0 = document.getElementsByTagName('script')[0];
-				var s = document.createElement("script");
-				s.src = '../src/' + args['demo'];
-				s.onload = function() {
-					$("body").append(
-						{ tag: "DIV", children: [
-							window.builder()
-						] }
-					);
-				}
-				script0.parentNode.insertBefore(s, script0);
-				document.title = args['demo'].match(/([^\/]+)(\.js)$/)[1]
-			} );
-		</script>
-		<link rel="icon" href="../_site/app/favicon.png" type="image/png">
-	</head>
-	<body></body>
-</html>
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/conflictingField.sh b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/conflictingField.sh
deleted file mode 100755
index 917d896ca..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/conflictingField.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-curl -XDELETE 'http://localhost:9200/conflicting_field_type'
-echo
-curl -XPUT 'http://localhost:9200/conflicting_field_type'
-echo
-curl -XPUT 'http://localhost:9200/conflicting_field_type/map1/_mapping' -d '{
-  "map1": {
-    "date_formats": ["date_time", "yyyyMMddHHmmss", "yyyyMMddHHmmssSSS"],
-    "_all": {
-      "enabled": true,
-      "store": "yes"
-    },
-    "properties": {
-      "field1": {
-        "type": "date",
-        "store": "yes",
-        "format": "yyyyMMddHHmmssSSS",
-        "include_in_all": false
-      }
-    }
-  }
-}'
-echo
-curl -XPUT 'http://localhost:9200/conflicting_field_type/map2/_mapping' -d '{
-  "map2": {
-    "date_formats": ["date_time", "yyyyMMddHHmmss", "yyyyMMddHHmmssSSS"],
-    "_all": {
-      "enabled": true,
-      "store": "yes"
-    },
-    "properties": {
-      "field1": {
-        "type": "string",
-        "store": "yes",
-        "term_vector": "yes",
-        "include_in_all": false
-      }
-    }
-  }
-}'
-echo
-curl -XPUT 'http://localhost:9200/conflicting_field_type/map1/1' -d '{
-    "field1" : "20110214172449000"
-}'
-echo
-curl -XPUT 'http://localhost:9200/conflicting_field_type/map2/2' -d '{
-    "field1" : "Test map2 with string type field"
-}'
-echo
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/delete_all_indices.sh b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/delete_all_indices.sh
deleted file mode 100644
index 878964c54..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/delete_all_indices.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-curl -XDELETE 'http://localhost:9200/conflicting_field_type'
-echo
-curl -XDELETE 'http://localhost:9200/twitter'
-echo
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/multi_type.sh b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/multi_type.sh
deleted file mode 100755
index 562346275..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/multi_type.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-curl -XDELETE 'http://localhost:9200/multi_field_type'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type/map1/_mapping' -d '{
-	"map1": {
-		"properties": {
-			"field1": {
-				"type": "string",
-				"store": "yes"
-			},
-			"field2": {
-				"type": "multi_field",
-				"path": "full",
-				"fields": {
-					"field2": { "type": "string" },
-					"alt_name": { "type": "string" },
-					"alt_name2": { "type": "string" }
-				}
-			},
-			"field3": {
-				"type": "multi_field",
-				"path": "just_name",
-				"fields": {
-					"field3": { "type": "string" },
-					"foobar": { "type": "string" }
-				}
-			},
-			"field4": {
-				"type": "multi_field",
-				"path": "just_name",
-				"fields": {
-					"field4": { "type": "string" },
-					"foobar": { "type": "string" }
-				}
-			},
-			"field5": {
-				"type": "string"
-			}
-		}
-	}
-}'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type/map1/1' -d '{
-	"field1": "Whats the dogs name",
-	"field2": "Max",
-	"field3": "Hey Janelle, whats wrong with Wolfie? I can hear him barking",
-	"field4": "Wolfies fine, honey, Wolfies just fine. Where are you",
-	"field5": "Your foster parents are dead"
-}'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type/map1/2' -d '{
-	"field1": "Nice night for a walk, eh",
-	"field2": "Nice night for a walk",
-	"field3": "Wash day tomorrow? Nothing clean, right?",
-	"field4": "Nothing clean. Right",
-	"field5": "Hey, I think this guys a couple cans short of a six-pack"
-}'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type/map1/3' -d '{
-	"field1": "The 600 series had rubber skin. We spotted them easy, but these are new. They look human... sweat, bad breath, everything. Very hard to spot. I had to wait till he moved on you before I could zero him",
-	"field2": "Look... I am not stupid, you know. They cannot make things like that yet.",
-	"field3": "Not yet. Not for about 40 years",
-	"field4": "Are you saying its from the future?",
-	"field5": "One possible future. From your point of view... I dont know tech stuff"
-}'
-echo
-curl -XPUT 'http://localhost:9200/multi_field_type/map1/4' -d '{
-	"field1": "Did you see this war?",
-	"field2": "No. I grew up after. In the ruins... starving... hiding from H-Ks",
-	"field3": "H-Ks?",
-	"field4": "Hunter-Killers. Patrol machines built in automated factories. Most of us were rounded up, put in camps for orderly disposal",
-	"field5": "This is burned in by laser scan. Some of us were kept alive... to work... loading bodies. The disposal units ran night and day. We were that close to going out forever. But there was one man who taught us to fight, to storm the wire of the camps, to smash those metal motherfuckers into junk. He turned it around. He brought us back from the brink. His name is Connor. John Connor. Your son, Sarah, your unborn son"
-}'
-echo
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_feed.sh b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_feed.sh
deleted file mode 100755
index 165246aab..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_feed.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-curl -XDELETE 'http://localhost:9200/twitter'
-echo
-curl -XPUT 'http://localhost:9200/twitter'
-echo
-curl -XPUT 'http://localhost:9200/twitter/_mapping' -d '{
-	"tweet": {
-		"date_formats": ["date_time", "yyyyMMddHHmmss", "yyyyMMddHHmmssSSS"],
-		"properties" : {
-			"user" : { "type" : "string", "index" : "not_analyzed" },
-			"message" : { "type" : "string" },
-			"postDate" : { "type" : "date" },
-			"srcAddr" : { "type" : "ip" },
-			"priority" : { "type" : "integer", null_value: 1 },
-			"rank" : { "type" : "float", null_value: 1.0 },
-			"loc" : { "type": "geo_point" }
-		}
-	}
-}'
-echo
-curl -XPUT 'http://localhost:9200/twitter/tweet/1' -d '{
-	"user" : "mobz",
-	"message" : "developing a tool to search with",
-	"postDate" : "20110220100330",
-	"srcAddr" : "203.19.74.11",
-	"loc" : "-37.86,144.90"
-}'
-echo
-curl -XPUT 'http://localhost:9200/twitter/tweet/2' -d '{
-	"user" : "mobz",
-	"message" : "you know, for elastic search",
-	"postDate" : "20110220095900",
-	"srcAddr" : "203.19.74.11",
-	"loc" : "-37.86,144.90"
-}'
-echo
-curl -XPUT 'http://localhost:9200/twitter/tweet/3' -d '{
-	"user" : "mobz",
-	"message" : "lets take some matilda bay",
-	"postDate" : "20110221171330",
-	"srcAddr" : "203.19.74.11",
-	"loc" : "-37.86,144.90"
-}'
-echo
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_river.sh b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_river.sh
deleted file mode 100755
index e55c66537..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/generators/twitter_river.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-curl -XDELETE 'http://localhost:9200/twitter_river'
-echo
-curl -XDELETE 'http://localhost:9200/_river/twitter_river'
-echo
-curl -XPUT 'http://localhost:9200/twitter_river'
-echo
-read -p "consumer key: " consumer_key
-read -p "consumer secret: " consumer_secret
-read -p "access token: " access_token
-read -p "access token secret: " access_token_secret
-curl -XPUT 'localhost:9200/_river/twitter_river/_meta' -d '
-{
-	"type" : "twitter",
-	"twitter" : {
-		"oauth": {
-			"consumer_key": "'${consumer_key}'",
-			"consumer_secret": "'${consumer_secret}'",
-			"access_token": "'${access_token}'",
-			"access_token_secret": "'${access_token_secret}'"
-		}
-	},
-	"index": {
-		"index": "twitter_river",
-		"type": "status",
-		"buk_size": 100
-	}
-}'
-echo
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/perf.html b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/perf.html
deleted file mode 100644
index eecfc0a6a..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/perf.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>Elasticsearch UI Performance Testing Harness</title>
-		<link rel="stylesheet" href="../_site/base/reset.css">
-		<link rel="stylesheet" href="../_site/app.css">
-		<script src="../_site/i18n.js" data-baseDir="../_site/lang" data-langs="en,fr"></script>
-		<script src="../_site/vendor.js"></script>
-		<script src="../_site/app.js"></script>
-		<script>
-			$( function() {
-				var widget;
-				var container = document.getElementById("demo");
-				function build() {
-					widget = window.builder();
-					widget.attach( demo );
-				}
-				function remove() {
-					widget.remove();
-					widget = null;
-				}
-				var args = location.search.substring(1).split("&").reduce(function(r, p) {
-					r[decodeURIComponent(p.split("=")[0])] = decodeURIComponent(p.split("=")[1]); return r;
-				}, {});
-				var script0 = document.getElementsByTagName('script')[0];
-				var s = document.createElement("script");
-				s.src = '../src/' + args['demo'];
-				script0.parentNode.insertBefore(s, script0);
-				document.title = args['demo'].match(/([^\/]+)(\.js)$/)[1];
-				document.getElementsByName("build")[0].addEventListener("click", build );
-				document.getElementsByName("remove")[0].addEventListener("click", remove );
-				document.getElementsByName("repeat")[0].addEventListener("click", function() {
-					console.time("build x 1000 in");
-					for( var i = 0; i < 1000; i++ ) {
-						build();
-						remove();
-					}
-					console.timeEnd("build x 1000 in");
-				});
-			} );
-		</script>
-		<link rel="icon" href="../_site/app/favicon.png" type="image/png">
-	</head>
-	<body>
-		<div class="header">
-			<button type="button" name="build">Build</button>
-			<button type="button" name="remove">Remove</button>
-			<button type="button" name="repeat">Build and Remove x 1000</button>
-		</div>
-		<div id="demo"></div>
-	</body>
-</html>
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/spec/specHelper.js b/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/spec/specHelper.js
deleted file mode 100644
index d6f2083a4..000000000
--- a/sdnr/wt/devicemanager/provider/src/main/resources/elasticsearch/plugins/head/test/spec/specHelper.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2010-2013 Ben Birch
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- */
-// find *Spec.js files in the src directory next to the corresponding source file
-
-var test = window.test = {};
-
-test.cb = (function( jasmine ) {
-	var callbacks = [];
-
-	return {
-		use: function() {
-			callbacks = [];
-		},
-		createSpy: function( name, arg, data, context ) {
-			return jasmine.createSpy( name ).and.callFake( function() {
-				callbacks.push( { cb: arguments[ arg || 0 ], data: data, context: context } );
-			});
-		},
-		execOne: function() {
-			var exec = callbacks.shift();
-			exec.cb.apply( exec.context, exec.data );
-		},
-		execAll: function() {
-			while( callbacks.length ) {
-				this.execOne();
-			}
-		}
-	};
-})( this.jasmine );
-
-
-test.clock = ( function() {
-	var id = 0, timers, saved;
-	var names = [ "setTimeout", "setInterval", "clearTimeout", "clearInterval" ];
-	var byNext = function( a, b ) { return a.next - b.next; };
-	var mocks = {
-		setTimeout: function( fn, t ) {
-			timers.push( { id: id, fn: fn, next: t, t: t, type: "t" } );
-			return id++;
-		},
-		clearTimeout: function( id ) {
-			timers = timers.filter( function( timer ) { return timer.id !== id; } );
-		},
-		setInterval: function( fn, t ) {
-			timers.push( { id: id, fn: fn, next: t, t: t, type: "i" } );
-			return id++;
-		},
-		clearInterval: function( id ) {
-			timers = timers.filter( function( timer ) { return timer.id !== id; } );
-		}
-	};
-
-	return {
-		steal: function() {
-			timers = [];
-			saved = {};
-			names.forEach( function( n ) {
-				saved[n] = window[n];
-				window[n] = mocks[n];
-			});
-		},
-		restore: function() {
-			names.forEach( function( n ) {
-				window[n] = saved[n];
-			});
-			timers = null;
-			saved = null;
-		},
-		tick: function() {
-			if( timers.length ) {
-				timers.sort( byNext );
-				var t0 = timers[0];
-				if( t0.type === "t" ) {
-					timers.shift();
-				} else {
-					t0.next += t0.t;
-				}
-				t0.fn();
-			}
-		}
-	};
-
-})();
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index b946e1035..1bb505afa 100644
--- a/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/devicemanager/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -23,30 +23,53 @@ limitations under the License.
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
 
-  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-    odl:type="default" />
+  <reference id="dataBroker"
+               interface="org.opendaylight.mdsal.binding.api.DataBroker"
+             odl:type="default" />
 
   <reference id="notificationPublishService"
-             interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
              odl:type="default" />
 
   <reference id="mountPointService"
-             interface="org.opendaylight.controller.md.sal.binding.api.MountPointService"
+             interface="org.opendaylight.mdsal.binding.api.MountPointService"
+             odl:type="default" />
+
+  <reference id="rpcProviderRegistry"
+             interface="org.opendaylight.mdsal.binding.api.RpcProviderService"
              odl:type="default" />
 
-  <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
-    odl:type="default" />
-    
   <reference id="clusterSingletonService"
-    interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+             interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+
+  <reference id="netconfNodeStateService"
+             availability="mandatory" activation="eager"
+               interface="org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService"  />
 
- <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl" init-method="init" destroy-method="close">
-    <property name="dataBroker" ref="dataBroker"/>
+  <reference id="websocketmanagerService"
+             availability="mandatory" activation="eager"
+             interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketmanagerService"  />
+
+  <reference id="iEntityDataProvider"
+             availability="mandatory" activation="eager"
+             interface="org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider"  />
+
+  <bean id="provider"
+        class="org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl"
+        init-method="init" destroy-method="close">
+      <property name="dataBroker" ref="dataBroker"/>
     <property name="rpcProviderRegistry" ref="rpcProviderRegistry" />
     <property name="notificationPublishService" ref="notificationPublishService" />
     <property name="mountPointService" ref="mountPointService" />
     <property name="clusterSingletonService" ref="clusterSingletonService" />
+    <property name="netconfNodeStateService" ref="netconfNodeStateService" />
+    <property name="websocketmanagerService" ref="websocketmanagerService" />
+    <property name="entityDataProvider" ref="iEntityDataProvider" />
+
   </bean>
 
+  <service
+    interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.NetconfNetworkElementService"
+    ref="provider" />
 
 </blueprint>
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/bbf-tr-196-2-0-3-full@2018-04-08.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/bbf-tr-196-2-0-3-full@2018-04-08.yang
new file mode 100644
index 000000000..d10c58bd5
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/bbf-tr-196-2-0-3-full@2018-04-08.yang
@@ -0,0 +1,17194 @@
+module bbf-tr-196-2-0-3-full {
+  namespace "urn:onf:otcc:wireless:yang:radio-access";
+  prefix ran;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  organization
+    "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Project";
+  contact
+    "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+     WG List:  <mailto:wireless-transport@login.opennetworking.org>
+     WG Chair: Lyndon Ong         <mailto:lyong@ciena.com>
+     WG Chair: Giorgio Cazzaniga  <mailto:giorgio.cazzaniga@sm-optics.com>
+     Editors:  Ramakrishnan, Shanthakumar (Shanth) <Shanthakumar.Ramakrishnan@commscope.com>                    Martin Skorupski   <mailto:martin.skorupski@highstreet-technologies.com>";
+  description
+    "This module contains a collection of YANG definitions for managing radio access network (RAN) devices.";
+
+  revision 2018-04-08 {
+    description
+      "Initial version, used only for ONAP PoC 2018-06-25";
+    reference
+      "ONF TR ???: A YANG Data Model for Radio Access Networks.
+       BBF TR-196 2.0.3 full";
+  }
+
+  list fap-service {
+    key "alias";
+    uses fap-service-g;
+    container capabilities {
+      uses capabilities-g;
+      description
+        "Container for object class FAPService.{i}.Capabilities.";
+      container capabilities-umts {
+        uses capabilities-umts-g;
+        description
+          "Container for object class FAPService.{i}.Capabilities.UMTS.";
+        container capabilities-umts-self-config {
+          uses capabilities-umts-self-config-g;
+          description
+            "Container for object class FAPService.{i}.Capabilities.UMTS.SelfConfig.";
+        }
+      }
+      container capabilities-lte {
+        uses capabilities-lte-g;
+        description
+          "Container for object class FAPService.{i}.Capabilities.LTE.";
+      }
+      container capabilities-cdma2000 {
+        uses capabilities-cdma2000-g;
+        description
+          "Container for object class FAPService.{i}.Capabilities.CDMA2000.";
+        container capabilities-cdma2000-one-x {
+          uses capabilities-cdma2000-one-x-g;
+          description
+            "Container for object class FAPService.{i}.Capabilities.CDMA2000.OneX.";
+          container capabilities-cdma2000-one-x-self-config {
+            uses capabilities-cdma2000-one-x-self-config-g;
+            description
+              "Container for object class FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.";
+          }
+        }
+        container capabilities-cdma2000-hrpd {
+          uses capabilities-cdma2000-hrpd-g;
+          description
+            "Container for object class FAPService.{i}.Capabilities.CDMA2000.HRPD.";
+          container capabilities-cdma2000-hrpd-self-config {
+            uses capabilities-cdma2000-hrpd-self-config-g;
+            description
+              "Container for object class FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.";
+          }
+        }
+      }
+    }
+    container fap-control {
+      uses fap-control-g;
+      description
+        "Container for object class FAPService.{i}.FAPControl.";
+      container fap-control-umts {
+        uses fap-control-umts-g;
+        description
+          "Container for object class FAPService.{i}.FAPControl.UMTS.";
+        container fap-control-umts-self-config {
+          uses fap-control-umts-self-config-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.UMTS.SelfConfig.";
+        }
+        container fap-control-umts-gateway {
+          uses fap-control-umts-gateway-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.UMTS.Gateway.";
+        }
+      }
+      container fap-control-lte {
+        uses fap-control-lte-g;
+        description
+          "Container for object class FAPService.{i}.FAPControl.LTE.";
+        container fap-control-lte-gateway {
+          uses fap-control-lte-gateway-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.LTE.Gateway.";
+        }
+      }
+      container fap-control-cdma2000 {
+        uses fap-control-cdma2000-g;
+        description
+          "Container for object class FAPService.{i}.FAPControl.CDMA2000.";
+        container fap-control-cdma2000-time {
+          uses fap-control-cdma2000-time-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.CDMA2000.Time.";
+        }
+        container fap-control-cdma2000-one-x {
+          uses fap-control-cdma2000-one-x-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.CDMA2000.OneX.";
+          container fap-control-cdma2000-one-x-active-handin-measurement {
+            uses fap-control-cdma2000-one-x-active-handin-measurement-g;
+            description
+              "Container for object class FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinMeasurement.";
+          }
+          container fap-control-cdma2000-one-x-self-config {
+            uses fap-control-cdma2000-one-x-self-config-g;
+            description
+              "Container for object class FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.";
+          }
+        }
+        container fap-control-cdma2000-gateway {
+          uses fap-control-cdma2000-gateway-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.CDMA2000.Gateway.";
+        }
+        container fap-control-cdma2000-hrpd {
+          uses fap-control-cdma2000-hrpd-g;
+          description
+            "Container for object class FAPService.{i}.FAPControl.CDMA2000.HRPD.";
+          container fap-control-cdma2000-hrpd-self-config {
+            uses fap-control-cdma2000-hrpd-self-config-g;
+            description
+              "Container for object class FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.";
+          }
+          container fap-control-cdma2000-hrpd-a13 {
+            uses fap-control-cdma2000-hrpd-a13-g;
+            description
+              "Container for object class FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.";
+            list fap-control-cdma2000-hrpd-a13-color-code-to-uati104 {
+              key "color-code uati104";
+              uses fap-control-cdma2000-hrpd-a13-color-code-to-uati104-g;
+              description
+                "List of object class FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.";
+            }
+            list fap-control-cdma2000-hrpd-a13-hrpd-subnet-to-ip {
+              key "a13-ip-address";
+              uses fap-control-cdma2000-hrpd-a13-hrpd-subnet-to-ip-g;
+              description
+                "List of object class FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.";
+            }
+          }
+        }
+      }
+    }
+    container access-mgmt {
+      uses access-mgmt-g;
+      description
+        "Container for object class FAPService.{i}.AccessMgmt.";
+      container access-mgmt-umts {
+        uses access-mgmt-umts-g;
+        description
+          "Container for object class FAPService.{i}.AccessMgmt.UMTS.";
+        list access-mgmt-umts-member-detail {
+          key "imsi";
+          uses access-mgmt-umts-member-detail-g;
+          description
+            "List of object class FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.";
+        }
+        container access-mgmt-umts-local-ip-access {
+          uses access-mgmt-umts-local-ip-access-g;
+          description
+            "Container for object class FAPService.{i}.AccessMgmt.UMTS.LocalIPAccess.";
+        }
+      }
+      container access-mgmt-lte {
+        uses access-mgmt-lte-g;
+        description
+          "Container for object class FAPService.{i}.AccessMgmt.LTE.";
+        container access-mgmt-lte-local-ip-access {
+          uses access-mgmt-lte-local-ip-access-g;
+          description
+            "Container for object class FAPService.{i}.AccessMgmt.LTE.LocalIPAccess.";
+        }
+      }
+      container access-mgmt-cdma2000 {
+        uses access-mgmt-cdma2000-g;
+        description
+          "Container for object class FAPService.{i}.AccessMgmt.CDMA2000.";
+        list access-mgmt-cdma2000-member-detail {
+          key "imsi";
+          uses access-mgmt-cdma2000-member-detail-g;
+          description
+            "List of object class FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.";
+        }
+        container access-mgmt-cdma2000-local-ip-access {
+          uses access-mgmt-cdma2000-local-ip-access-g;
+          description
+            "Container for object class FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.";
+          container access-mgmt-cdma2000-local-ip-access-hrpd {
+            uses access-mgmt-cdma2000-local-ip-access-hrpd-g;
+            description
+              "Container for object class FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.";
+            list access-mgmt-cdma2000-local-ip-access-hrpd-egress-filter {
+              key "subnet subnet-mask";
+              uses access-mgmt-cdma2000-local-ip-access-hrpd-egress-filter-g;
+              description
+                "List of object class FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.";
+            }
+          }
+        }
+      }
+      container access-mgmt-legacy {
+        uses access-mgmt-legacy-g;
+        description
+          "Container for object class FAPService.{i}.AccessMgmt.Legacy.";
+        container access-mgmt-legacy-local-ip-access {
+          uses access-mgmt-legacy-local-ip-access-g;
+          description
+            "Container for object class FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.";
+          list access-mgmt-legacy-local-ip-access-rule {
+            key "dest-ip-address dest-subnet-mask protocol";
+            uses access-mgmt-legacy-local-ip-access-rule-g;
+            description
+              "List of object class FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.";
+          }
+        }
+      }
+    }
+    container cell-config {
+      uses cell-config-g;
+      description
+        "Container for object class FAPService.{i}.CellConfig.";
+      container umts {
+        uses umts-g;
+        description
+          "Container for object class FAPService.{i}.CellConfig.UMTS.";
+        container umts-cn {
+          uses umts-cn-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.UMTS.CN.";
+          container umts-cn-cs-domain {
+            uses umts-cn-cs-domain-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.CN.CSDomain.";
+          }
+          container umts-cn-ps-domain {
+            uses umts-cn-ps-domain-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.CN.PSDomain.";
+          }
+        }
+        container umts-ran {
+          uses umts-ran-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.";
+          container umts-ran-csg {
+            uses umts-ran-csg-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.CSG.";
+            container umts-ran-csg-csgpsc-split-info {
+              uses umts-ran-csg-csgpsc-split-info-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.";
+            }
+          }
+          container umts-ran-cell-selection {
+            uses umts-ran-cell-selection-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.";
+          }
+          container umts-ran-rrc-timers {
+            uses umts-ran-rrc-timers-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.";
+          }
+          container umts-ran-drx {
+            uses umts-ran-drx-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.DRX.";
+          }
+          container umts-ran-power-control {
+            uses umts-ran-power-control-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.";
+          }
+          container umts-ran-cell-restriction {
+            uses umts-ran-cell-restriction-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.";
+          }
+          container umts-ran-intra-freq-meas {
+            uses umts-ran-intra-freq-meas-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.";
+            list umts-ran-intra-freq-meas-instance {
+              key "intra-frequency-event-identity";
+              uses umts-ran-intra-freq-meas-instance-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.";
+            }
+          }
+          container umts-ran-inter-freq-meas {
+            uses umts-ran-inter-freq-meas-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.";
+            list umts-ran-inter-freq-meas-instance {
+              key "intra-frequency-event-identity";
+              uses umts-ran-inter-freq-meas-instance-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.";
+            }
+          }
+          container umts-ran-inter-rat-meas {
+            uses umts-ran-inter-rat-meas-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.";
+            list umts-ran-inter-rat-meas-instance {
+              key "inter-rat-event-identity";
+              uses umts-ran-inter-rat-meas-instance-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.";
+            }
+          }
+          container umts-ran-ue-internal-meas {
+            uses umts-ran-ue-internal-meas-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.";
+          }
+          container umts-ran-rf {
+            uses umts-ran-rf-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.RF.";
+          }
+          container umts-ran-neighbor-list {
+            uses umts-ran-neighbor-list-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.";
+            list umts-ran-neighbor-list-intra-freq-cell {
+              key "pcpich-scrambling-code";
+              uses umts-ran-neighbor-list-intra-freq-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.";
+            }
+            list umts-ran-neighbor-list-inter-freq-cell {
+              key "pcpich-scrambling-code uarfcndl";
+              uses umts-ran-neighbor-list-inter-freq-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.";
+            }
+            container umts-ran-neighbor-list-inter-rat-cell {
+              uses umts-ran-neighbor-list-inter-rat-cell-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.";
+              list umts-ran-neighbor-list-inter-rat-cell-gsm {
+                key "bccharfcn";
+                uses umts-ran-neighbor-list-inter-rat-cell-gsm-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.";
+              }
+            }
+          }
+          container umts-ran-neighbor-list-in-use {
+            uses umts-ran-neighbor-list-in-use-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.";
+            list umts-ran-neighbor-list-in-use-intra-freq-cell {
+              key "pcpich-scrambling-code";
+              uses umts-ran-neighbor-list-in-use-intra-freq-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.";
+            }
+            list umts-ran-neighbor-list-in-use-inter-freq-cell {
+              key "pcpich-scrambling-code uarfcndl";
+              uses umts-ran-neighbor-list-in-use-inter-freq-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.";
+            }
+            container umts-ran-neighbor-list-in-use-inter-rat-cell {
+              uses umts-ran-neighbor-list-in-use-inter-rat-cell-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.";
+              list umts-ran-neighbor-list-in-use-inter-rat-cell-gsm {
+                key "bccharfcn";
+                uses umts-ran-neighbor-list-in-use-inter-rat-cell-gsm-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.";
+              }
+            }
+          }
+        }
+        container umts-rab {
+          uses umts-rab-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.UMTS.RAB.";
+        }
+      }
+      container lte {
+        uses lte-g;
+        description
+          "Container for object class FAPService.{i}.CellConfig.LTE.";
+        list lte-tunnel {
+          key "tunnel-ref";
+          uses lte-tunnel-g;
+          description
+            "List of object class FAPService.{i}.CellConfig.LTE.Tunnel.{i}.";
+        }
+        container lte-epc {
+          uses lte-epc-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.LTE.EPC.";
+          list lte-epc-plmn-list {
+            key "plmnid";
+            uses lte-epc-plmn-list-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.";
+          }
+          list lte-epc-qo-s {
+            key "qci";
+            uses lte-epc-qo-s-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.";
+          }
+        }
+        container lte-ran {
+          uses lte-ran-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.LTE.RAN.";
+          container lte-ran-common {
+            uses lte-ran-common-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Common.";
+          }
+          container lte-ran-s1-ap {
+            uses lte-ran-s1-ap-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.S1AP.";
+          }
+          container lte-ran-s1-u {
+            uses lte-ran-s1-u-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.S1U.";
+          }
+          container lte-ran-rf {
+            uses lte-ran-rf-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.RF.";
+          }
+          container lte-ran-phy {
+            uses lte-ran-phy-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.";
+            container lte-ran-phy-antenna-info {
+              uses lte-ran-phy-antenna-info-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.AntennaInfo.";
+            }
+            container lte-ran-phy-pdsch {
+              uses lte-ran-phy-pdsch-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PDSCH.";
+            }
+            container lte-ran-phy-srs {
+              uses lte-ran-phy-srs-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.";
+            }
+            container lte-ran-phy-prach {
+              uses lte-ran-phy-prach-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.";
+            }
+            container lte-ran-phy-pucch {
+              uses lte-ran-phy-pucch-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.";
+            }
+            container lte-ran-phy-pusch {
+              uses lte-ran-phy-pusch-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.";
+              container lte-ran-phy-pusch-ulrs {
+                uses lte-ran-phy-pusch-ulrs-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.";
+              }
+            }
+            container lte-ran-phy-ul-power-control {
+              uses lte-ran-phy-ul-power-control-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.";
+            }
+            container lte-ran-phy-mbsfn {
+              uses lte-ran-phy-mbsfn-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.";
+              list lte-ran-phy-mbsfn-sf-config-list {
+                key "radio-frame-allocation-period radioframe-allocation-offset radio-frame-allocation-size";
+                uses lte-ran-phy-mbsfn-sf-config-list-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.";
+              }
+            }
+            container lte-ran-phy-prs {
+              uses lte-ran-phy-prs-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.PRS.";
+            }
+            container lte-ran-phy-tdd-frame {
+              uses lte-ran-phy-tdd-frame-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.PHY.TDDFrame.";
+            }
+          }
+          container lte-ran-mac {
+            uses lte-ran-mac-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.MAC.";
+            container lte-ran-mac-rach {
+              uses lte-ran-mac-rach-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.";
+            }
+            container lte-ran-mac-drx {
+              uses lte-ran-mac-drx-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.";
+            }
+            container lte-ran-mac-ulsch {
+              uses lte-ran-mac-ulsch-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.";
+            }
+          }
+          container lte-ran-rlc {
+            uses lte-ran-rlc-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.RLC.";
+            container lte-ran-rlc-srb1 {
+              uses lte-ran-rlc-srb1-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.";
+            }
+            container lte-ran-rlc-srb2 {
+              uses lte-ran-rlc-srb2-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.";
+            }
+          }
+          container lte-ran-rrc-timers {
+            uses lte-ran-rrc-timers-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.";
+          }
+          container lte-ran-cell-restriction {
+            uses lte-ran-cell-restriction-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.CellRestriction.";
+          }
+          container lte-ran-mobility {
+            uses lte-ran-mobility-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.";
+            container lte-ran-mobility-idle-mode {
+              uses lte-ran-mobility-idle-mode-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.";
+              container lte-ran-mobility-idle-mode-common {
+                uses lte-ran-mobility-idle-mode-common-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.";
+              }
+              container lte-ran-mobility-idle-mode-intra-freq {
+                uses lte-ran-mobility-idle-mode-intra-freq-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.";
+              }
+              container lte-ran-mobility-idle-mode-inter-freq {
+                uses lte-ran-mobility-idle-mode-inter-freq-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.";
+                list lte-ran-mobility-idle-mode-inter-freq-carrier {
+                  key "eutra-carrier-arfcn";
+                  uses lte-ran-mobility-idle-mode-inter-freq-carrier-g;
+                  description
+                    "List of object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.";
+                }
+              }
+              container lte-ran-mobility-idle-mode-irat {
+                uses lte-ran-mobility-idle-mode-irat-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.";
+                container lte-ran-mobility-idle-mode-irat-utra {
+                  uses lte-ran-mobility-idle-mode-irat-utra-g;
+                  description
+                    "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.";
+                  list lte-ran-mobility-idle-mode-irat-utra-utranfdd-freq {
+                    key "utra-carrier-arfcn";
+                    uses lte-ran-mobility-idle-mode-irat-utra-utranfdd-freq-g;
+                    description
+                      "List of object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.";
+                  }
+                }
+                container lte-ran-mobility-idle-mode-irat-geran {
+                  uses lte-ran-mobility-idle-mode-irat-geran-g;
+                  description
+                    "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.";
+                  list lte-ran-mobility-idle-mode-irat-geran-geran-freq-group {
+                    key "bccharfcn";
+                    uses lte-ran-mobility-idle-mode-irat-geran-geran-freq-group-g;
+                    description
+                      "List of object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.";
+                  }
+                }
+                container lte-ran-mobility-idle-mode-irat-cdma2000 {
+                  uses lte-ran-mobility-idle-mode-irat-cdma2000-g;
+                  description
+                    "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.";
+                  list lte-ran-mobility-idle-mode-irat-cdma2000-cdma2000-band {
+                    key "band-class";
+                    uses lte-ran-mobility-idle-mode-irat-cdma2000-cdma2000-band-g;
+                    description
+                      "List of object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.";
+                  }
+                }
+              }
+            }
+            container lte-ran-mobility-conn-mode {
+              uses lte-ran-mobility-conn-mode-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.";
+              container lte-ran-mobility-conn-mode-eutra {
+                uses lte-ran-mobility-conn-mode-eutra-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.";
+              }
+              container lte-ran-mobility-conn-mode-irat {
+                uses lte-ran-mobility-conn-mode-irat-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.";
+              }
+            }
+          }
+          container lte-ran-neighbor-list {
+            uses lte-ran-neighbor-list-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.";
+            list lte-ran-neighbor-list-lte-cell {
+              key "plmnid cid";
+              uses lte-ran-neighbor-list-lte-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.";
+            }
+            container lte-ran-neighbor-list-inter-rat-cell {
+              uses lte-ran-neighbor-list-inter-rat-cell-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.";
+              list lte-ran-neighbor-list-inter-rat-cell-umts {
+                key "plmnid cid";
+                uses lte-ran-neighbor-list-inter-rat-cell-umts-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.";
+              }
+              list lte-ran-neighbor-list-inter-rat-cell-gsm {
+                key "plmnid lac ci";
+                uses lte-ran-neighbor-list-inter-rat-cell-gsm-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.";
+              }
+              list lte-ran-neighbor-list-inter-rat-cell-cdma2000 {
+                key "cid";
+                uses lte-ran-neighbor-list-inter-rat-cell-cdma2000-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.";
+              }
+            }
+          }
+          container lte-ran-neighbor-list-in-use {
+            uses lte-ran-neighbor-list-in-use-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.";
+            list lte-ran-neighbor-list-in-use-lte-cell {
+              key "plmnid cid";
+              uses lte-ran-neighbor-list-in-use-lte-cell-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.";
+            }
+            container lte-ran-neighbor-list-in-use-inter-rat-cell {
+              uses lte-ran-neighbor-list-in-use-inter-rat-cell-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.";
+              list lte-ran-neighbor-list-in-use-inter-rat-cell-umts {
+                key "plmnid cid";
+                uses lte-ran-neighbor-list-in-use-inter-rat-cell-umts-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.";
+              }
+              list lte-ran-neighbor-list-in-use-inter-rat-cell-gsm {
+                key "plmnid lac ci";
+                uses lte-ran-neighbor-list-in-use-inter-rat-cell-gsm-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.";
+              }
+              list lte-ran-neighbor-list-in-use-inter-rat-cell-cdma2000 {
+                key "cid";
+                uses lte-ran-neighbor-list-in-use-inter-rat-cell-cdma2000-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.";
+              }
+            }
+          }
+        }
+      }
+      container cdma2000 {
+        uses cdma2000-g;
+        description
+          "Container for object class FAPService.{i}.CellConfig.CDMA2000.";
+        container cdma2000-one-x {
+          uses cdma2000-one-x-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.";
+          container cdma2000-one-x-ran {
+            uses cdma2000-one-x-ran-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.";
+            container cdma2000-one-x-ran-rf {
+              uses cdma2000-one-x-ran-rf-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.";
+            }
+            container cdma2000-one-x-ran-network-listen-mode-config {
+              uses cdma2000-one-x-ran-network-listen-mode-config-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.";
+            }
+            container cdma2000-one-x-ran-access-parameters {
+              uses cdma2000-one-x-ran-access-parameters-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.";
+            }
+            container cdma2000-one-x-ran-system-parameters {
+              uses cdma2000-one-x-ran-system-parameters-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.";
+            }
+            container cdma2000-one-x-ran-extended-system-parameters {
+              uses cdma2000-one-x-ran-extended-system-parameters-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.";
+            }
+            container cdma2000-one-x-ran-forward-pwr-ctr {
+              uses cdma2000-one-x-ran-forward-pwr-ctr-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.";
+            }
+            container cdma2000-one-x-ran-hard-handoff {
+              uses cdma2000-one-x-ran-hard-handoff-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.";
+              container cdma2000-one-x-ran-hard-handoff-stats {
+                uses cdma2000-one-x-ran-hard-handoff-stats-g;
+                description
+                  "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.";
+              }
+            }
+            container cdma2000-one-x-ran-power-control {
+              uses cdma2000-one-x-ran-power-control-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.";
+            }
+            list cdma2000-one-x-ran-neighbor-list {
+              key "one-x-neighbor-index neighbor-pn";
+              uses cdma2000-one-x-ran-neighbor-list-g;
+              description
+                "List of object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.";
+            }
+            container cdma2000-one-x-ran-apidm {
+              uses cdma2000-one-x-ran-apidm-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.";
+            }
+            container cdma2000-one-x-ran-apidtm {
+              uses cdma2000-one-x-ran-apidtm-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDTM.";
+            }
+            container cdma2000-one-x-ran-appim {
+              uses cdma2000-one-x-ran-appim-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.";
+              list cdma2000-one-x-ran-appim-appirec {
+                key "apsid apnid apband apfreq appnrectype appnreclen appnrec";
+                uses cdma2000-one-x-ran-appim-appirec-g;
+                description
+                  "List of object class FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.";
+              }
+            }
+          }
+          container cdma2000-one-x-pcf-config {
+            uses cdma2000-one-x-pcf-config-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.";
+            container cdma2000-one-x-pcf-config-pcf-performance-stats {
+              uses cdma2000-one-x-pcf-config-pcf-performance-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.";
+            }
+          }
+          list cdma2000-one-x-batch-pcfpdsn {
+            key "batch-table-number";
+            uses cdma2000-one-x-batch-pcfpdsn-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.";
+          }
+          list cdma2000-one-x-pcfpdsn {
+            key "pdsn-number security-parameter-index security-key";
+            uses cdma2000-one-x-pcfpdsn-g;
+            container cdma2000-one-x-pcfpdsn-a11-reg-update-stats {
+              uses cdma2000-one-x-pcfpdsn-a11-reg-update-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.";
+            }
+            container cdma2000-one-x-pcfpdsn-pcfpdsn-stats {
+              uses cdma2000-one-x-pcfpdsn-pcfpdsn-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.";
+            }
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.";
+          }
+          container cdma2000-one-x-stats {
+            uses cdma2000-one-x-stats-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.";
+          }
+          container cdma2000-one-x-redirect {
+            uses cdma2000-one-x-redirect-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.OneX.Redirect.";
+          }
+        }
+        container cdma2000-hrpd {
+          uses cdma2000-hrpd-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.";
+          container cdma2000-hrpd-ran {
+            uses cdma2000-hrpd-ran-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.";
+            container cdma2000-hrpd-ran-rf {
+              uses cdma2000-hrpd-ran-rf-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.";
+            }
+          }
+          container cdma2000-hrpd-pcf-config {
+            uses cdma2000-hrpd-pcf-config-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.";
+            container cdma2000-hrpd-pcf-config-pcf-performance-stats {
+              uses cdma2000-hrpd-pcf-config-pcf-performance-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.";
+            }
+          }
+          list cdma2000-hrpd-batch-pcfpdsn {
+            key "batch-table-number batch-table-security-parameter-index batch-table-secret-key";
+            uses cdma2000-hrpd-batch-pcfpdsn-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.";
+          }
+          list cdma2000-hrpd-pcfpdsn {
+            key "pdsn-number security-parameter-index security-key";
+            uses cdma2000-hrpd-pcfpdsn-g;
+            container cdma2000-hrpd-pcfpdsn-a11-session-update-stats {
+              uses cdma2000-hrpd-pcfpdsn-a11-session-update-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.";
+            }
+            container cdma2000-hrpd-pcfpdsn-a11-reg-update-stats {
+              uses cdma2000-hrpd-pcfpdsn-a11-reg-update-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.";
+            }
+            container cdma2000-hrpd-pcfpdsn-aux-a10-stats {
+              uses cdma2000-hrpd-pcfpdsn-aux-a10-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.";
+            }
+            container cdma2000-hrpd-pcfpdsn-pcfpdsn-stats {
+              uses cdma2000-hrpd-pcfpdsn-pcfpdsn-stats-g;
+              description
+                "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.";
+            }
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.";
+          }
+          container cdma2000-hrpd-redirect {
+            uses cdma2000-hrpd-redirect-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.Redirect.";
+          }
+          container cdma2000-hrpd-call-control-stats {
+            uses cdma2000-hrpd-call-control-stats-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.";
+          }
+          container cdma2000-hrpd-qo-s-stats {
+            uses cdma2000-hrpd-qo-s-stats-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.";
+          }
+          container cdma2000-hrpd-rnc-sig-apps-stats {
+            uses cdma2000-hrpd-rnc-sig-apps-stats-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.";
+          }
+          container cdma2000-hrpd-access-auth-config {
+            uses cdma2000-hrpd-access-auth-config-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthConfig.";
+          }
+          container cdma2000-hrpd-access-auth-stats {
+            uses cdma2000-hrpd-access-auth-stats-g;
+            description
+              "Container for object class FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.";
+          }
+        }
+        container cdma2000-beacon {
+          uses cdma2000-beacon-g;
+          description
+            "Container for object class FAPService.{i}.CellConfig.CDMA2000.Beacon.";
+          list cdma2000-beacon-beacon-list {
+            key "beacon-index";
+            uses cdma2000-beacon-beacon-list-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.";
+          }
+          list cdma2000-beacon-hrpd-beacon-list {
+            key "beacon-index";
+            uses cdma2000-beacon-hrpd-beacon-list-g;
+            description
+              "List of object class FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.";
+          }
+        }
+      }
+    }
+    container rem {
+      uses rem-g;
+      description
+        "Container for object class FAPService.{i}.REM.";
+      container rem-umts {
+        uses rem-umts-g;
+        description
+          "Container for object class FAPService.{i}.REM.UMTS.";
+        container rem-umts-wcdma {
+          uses rem-umts-wcdma-g;
+          description
+            "Container for object class FAPService.{i}.REM.UMTS.WCDMA.";
+          list rem-umts-wcdma-cell {
+            key "rem-umts-wcdma-cell-key";
+            uses rem-umts-wcdma-cell-g;
+            container rem-umts-wcdma-cell-rf {
+              uses rem-umts-wcdma-cell-rf-g;
+              description
+                "Container for object class FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.";
+            }
+            container rem-umts-wcdma-cell-bcch {
+              uses rem-umts-wcdma-cell-bcch-g;
+              description
+                "Container for object class FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.";
+              container rem-umts-wcdma-cell-bcch-csgpsc-split-info {
+                uses rem-umts-wcdma-cell-bcch-csgpsc-split-info-g;
+                description
+                  "Container for object class FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.";
+              }
+              container rem-umts-wcdma-cell-bcch-reference-position {
+                uses rem-umts-wcdma-cell-bcch-reference-position-g;
+                description
+                  "Container for object class FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.";
+              }
+            }
+            description
+              "List of object class FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.";
+          }
+        }
+        container rem-umts-gsm {
+          uses rem-umts-gsm-g;
+          description
+            "Container for object class FAPService.{i}.REM.UMTS.GSM.";
+          list rem-umts-gsm-cell {
+            key "arfcn bsic";
+            uses rem-umts-gsm-cell-g;
+            description
+              "List of object class FAPService.{i}.REM.UMTS.GSM.Cell.{i}.";
+          }
+        }
+      }
+      container rem-lte {
+        uses rem-lte-g;
+        description
+          "Container for object class FAPService.{i}.REM.LTE.";
+        list rem-lte-cell {
+          key "rem-lte-cell-key";
+          uses rem-lte-cell-g;
+          container rem-lte-cell-rf {
+            uses rem-lte-cell-rf-g;
+            description
+              "Container for object class FAPService.{i}.REM.LTE.Cell.{i}.RF.";
+          }
+          container rem-lte-cell-bcch {
+            uses rem-lte-cell-bcch-g;
+            description
+              "Container for object class FAPService.{i}.REM.LTE.Cell.{i}.BCCH.";
+            list rem-lte-cell-bcch-plmn-list {
+              key "plmnid";
+              uses rem-lte-cell-bcch-plmn-list-g;
+              description
+                "List of object class FAPService.{i}.REM.LTE.Cell.{i}.BCCH.PLMNList.{i}.";
+            }
+          }
+          description
+            "List of object class FAPService.{i}.REM.LTE.Cell.{i}.";
+        }
+        list rem-lte-carrier-meas {
+          key "carrier-arfcndl carrier-ch-width";
+          uses rem-lte-carrier-meas-g;
+          description
+            "List of object class FAPService.{i}.REM.LTE.CarrierMeas.{i}.";
+        }
+      }
+      container rem-cdma2000 {
+        uses rem-cdma2000-g;
+        description
+          "Container for object class FAPService.{i}.REM.CDMA2000.";
+        container rem-cdma2000-one-x {
+          uses rem-cdma2000-one-x-g;
+          description
+            "Container for object class FAPService.{i}.REM.CDMA2000.OneX.";
+          list rem-cdma2000-one-x-channel {
+            key "sniffing-band-class sniffing-channel-number";
+            uses rem-cdma2000-one-x-channel-g;
+            description
+              "List of object class FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.";
+          }
+          list rem-cdma2000-one-x-cell {
+            key "rem-cdma2000-one-x-cell-key";
+            uses rem-cdma2000-one-x-cell-g;
+            container rem-cdma2000-one-x-cell-rf {
+              uses rem-cdma2000-one-x-cell-rf-g;
+              description
+                "Container for object class FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.";
+            }
+            container rem-cdma2000-one-x-cell-control-channel {
+              uses rem-cdma2000-one-x-cell-control-channel-g;
+              description
+                "Container for object class FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.";
+            }
+            description
+              "List of object class FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.";
+          }
+        }
+        container rem-cdma2000-hrpd {
+          uses rem-cdma2000-hrpd-g;
+          description
+            "Container for object class FAPService.{i}.REM.CDMA2000.HRPD.";
+          list rem-cdma2000-hrpd-channel {
+            key "sniffing-band-class sniffing-channel-number";
+            uses rem-cdma2000-hrpd-channel-g;
+            description
+              "List of object class FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.";
+          }
+          list rem-cdma2000-hrpd-cell {
+            key "rem-cdma2000-hrpd-cell-key";
+            uses rem-cdma2000-hrpd-cell-g;
+            container rem-cdma2000-hrpd-cell-rf {
+              uses rem-cdma2000-hrpd-cell-rf-g;
+              description
+                "Container for object class FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.";
+            }
+            container rem-cdma2000-hrpd-cell-control-channel {
+              uses rem-cdma2000-hrpd-cell-control-channel-g;
+              description
+                "Container for object class FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.";
+            }
+            description
+              "List of object class FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.";
+          }
+        }
+        container rem-cdma2000-macro-timing {
+          uses rem-cdma2000-macro-timing-g;
+          description
+            "Container for object class FAPService.{i}.REM.CDMA2000.MacroTiming.";
+          list rem-cdma2000-macro-timing-channel {
+            key "band-class channel-number";
+            uses rem-cdma2000-macro-timing-channel-g;
+            description
+              "List of object class FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.";
+          }
+        }
+      }
+    }
+    container transport {
+      uses transport-g;
+      description
+        "Container for object class FAPService.{i}.Transport.";
+      container transport-sip {
+        uses transport-sip-g;
+        description
+          "Container for object class FAPService.{i}.Transport.SIP.";
+        container transport-sip-fcs {
+          uses transport-sip-fcs-g;
+          description
+            "Container for object class FAPService.{i}.Transport.SIP.FCS.";
+        }
+      }
+      container transport-sctp {
+        uses transport-sctp-g;
+        description
+          "Container for object class FAPService.{i}.Transport.SCTP.";
+        list transport-sctp-assoc {
+          key "primary-peer-address local-port";
+          uses transport-sctp-assoc-g;
+          description
+            "List of object class FAPService.{i}.Transport.SCTP.Assoc.{i}.";
+        }
+      }
+      container transport-real-time {
+        uses transport-real-time-g;
+        description
+          "Container for object class FAPService.{i}.Transport.RealTime.";
+        container transport-real-time-perf {
+          uses transport-real-time-perf-g;
+          description
+            "Container for object class FAPService.{i}.Transport.RealTime.Perf.";
+        }
+      }
+      container transport-packet {
+        uses transport-packet-g;
+        description
+          "Container for object class FAPService.{i}.Transport.Packet.";
+      }
+      container transport-security {
+        uses transport-security-g;
+        description
+          "Container for object class FAPService.{i}.Transport.Security.";
+        list transport-security-secret {
+          key "uicc-card-id";
+          uses transport-security-secret-g;
+          description
+            "List of object class FAPService.{i}.Transport.Security.Secret.{i}.";
+        }
+      }
+    }
+    description
+      "List of object class FAPService.{i}.";
+  }
+
+  grouping fap-service-g {
+    description
+      "The Femto Access Point (FAP) Service Object.";
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Alias";
+    }
+    leaf device-type {
+      type enumeration {
+        enum "standalone" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.DeviceType - Standalone";
+        }
+        enum "integrated" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.DeviceType - Integrated";
+        }
+      }
+      description
+        "The type of FAP device.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.DeviceType";
+    }
+    leaf dn-prefix {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The Distinguished Name prefix (DNPrefix) is an operator-configurable prefix string that is pre-pended to object distinguished names in the {{bibref|TR-157a5}} alarm object. See {{bibref|3GPP-TS.32.300}} for the formal definition and examples of DNPrefix as applied to 3GPP alarm objects";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.DNPrefix";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.";
+  }
+
+  grouping capabilities-g {
+    description
+      "This object contains parameters relating to the hardware capabilities of the FAP device.";
+    leaf gps-equipped {
+      type boolean;
+      description
+        "Indicates whether the FAP is equipped with a GPS receiver or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.GPSEquipped";
+    }
+    leaf max-tx-power {
+      type uint64;
+      units "dBm";
+      description
+        "Indicates the maximum possible transmit power in {{units}} that the FAP hardware can support.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.MaxTxPower";
+    }
+    leaf-list supported-systems {
+      type enumeration {
+        enum "umts" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.SupportedSystems - UMTS";
+        }
+        enum "lte" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.SupportedSystems - LTE";
+        }
+        enum "cdma1x" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.SupportedSystems - CDMA1x";
+        }
+        enum "cdmahrpd" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.SupportedSystems - CDMAHRPD";
+        }
+      }
+      description
+        "{{list}} Each entry is a type of system that the FAP supports. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.SupportedSystems";
+    }
+    leaf beacon {
+      type boolean;
+      description
+        "Indicates whether FAP can support beacon transmission.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.Beacon";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.";
+  }
+
+  grouping capabilities-umts-g {
+    description
+      "This object contains parameters relating to the system and RF aspect of the FAP device that supports the UMTS system.";
+    leaf duplex-mode {
+      type enumeration {
+        enum "fdd-mode" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.DuplexMode - FDDMode";
+        }
+      }
+      description
+        "Indicates the mode supported by the FAP. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.DuplexMode";
+    }
+    leaf gsm-rx-supported {
+      type boolean;
+      description
+        "Indicates whether the FAP hardware supports the receiving function of GSM or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxSupported";
+    }
+    leaf hsdpa-supported {
+      type boolean;
+      description
+        "Indicates whether the FAP hardware supports the HSDPA capability or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.HSDPASupported";
+    }
+    leaf max-hsdpa-data-rate-supported {
+      type uint64;
+      units "Kbps";
+      description
+        "If the FAP hardware supports HSDPA ({{param|HSDPASupported}} is {{true}}), this parameter indicates the maximum HSDPA data rate in {{units}} that the device supports.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.MaxHSDPADataRateSupported";
+    }
+    leaf hsupa-supported {
+      type boolean;
+      description
+        "Indicates whether the FAP hardware supports the HSUPA capability or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.HSUPASupported";
+    }
+    leaf max-hsupa-data-rate-supported {
+      type uint64;
+      units "Kbps";
+      description
+        "If the FAP hardware supports HSUPA ({{param|HSUPASupported}} is {{true}}), this parameter indicates the maximum HSUPA data rate in {{units}} that the device supports.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.MaxHSUPADataRateSupported";
+    }
+    leaf max-hspdsc-hs-supported {
+      type uint8 {
+        range "0..15";
+      }
+      description
+        "If the FAP hardware supports HSPA family (either {{param|HSDPASupported}} is {{true}} or {{param|HSUPASupported}} is {{true}}), this parameter indicates the available number of codes at the defined spreading factor (SF=16), within the complete code tree. See {{bibref|3GPP-TS.32.642|Section 6.3.9}} for more details.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.MaxHSPDSCHsSupported";
+    }
+    leaf max-hsscc-hs-supported {
+      type uint64;
+      description
+        "If the FAP hardware supports HSPA family (either {{param|HSDPASupported}} is {{true}} or {{param|HSUPASupported}} is {{true}}), this parameter indicates the available number of HS-SCCHs for one cell. See {{bibref|3GPP-TS.32.642|Section 6.3.9}} for more details.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.MaxHSSCCHsSupported";
+    }
+    leaf-list fdd-bands-supported {
+      type string;
+      min-elements 1;
+      max-elements "16";
+      description
+        "{{list}} Indicates the UMTS bands that the FAP supports {{bibref|3GPP-TS.25.104}}, Release 8. At least one band MUST be supported and multiple bands MAY be supported. {{bibref|3GPP-TS.25.104}} Version 8.3.0 defines 14 UMTS bands (I through XIV). Each individual band is identified by its upper case Roman numeral. The order of the band indicators in the string has no significance. In case a new band is defined in the 3GPP standard in a future release of {{bibref|3GPP-TS.25.104}}, the corresponding new upper case Roman numeral will be included in the valid band indicators. The followings are examples of valid values: :\"I\" (specifies only band-I is supported) :\"I,II,V\" (specifies 3 bands are supported) :\"II,VII,I\" (specifies 3 bands are supported)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.FDDBandsSupported";
+    }
+    leaf-list gsm-rx-bands-supported {
+      type enumeration {
+        enum "t-gsm380" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - T-GSM380";
+        }
+        enum "t-gsm410" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - T-GSM410";
+        }
+        enum "gsm450" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - GSM450";
+        }
+        enum "gsm480" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - GSM480";
+        }
+        enum "gsm710" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - GSM710";
+        }
+        enum "gsm750" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - GSM750";
+        }
+        enum "t-gsm810" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - T-GSM810";
+        }
+        enum "gsm850" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - GSM850";
+        }
+        enum "p-gsm900" {
+          value 9;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - P-GSM900";
+        }
+        enum "e-gsm900" {
+          value 10;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - E-GSM900";
+        }
+        enum "r-gsm900" {
+          value 11;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - R-GSM900";
+        }
+        enum "t-gsm900" {
+          value 12;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - T-GSM900";
+        }
+        enum "dcs1800" {
+          value 13;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - DCS1800";
+        }
+        enum "pcs1900" {
+          value 14;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported - PCS1900";
+        }
+      }
+      description
+        "{{list}} Indicates the GSM receive bands that the FAP supports {{bibref|3GPP-TS.45.005}}. At least one band MUST be supported and multiple bands MAY be supported. {{bibref|3GPP-TS.45.005}} defines 14 GSM bands. {{enum}} The order of the band indicators in the string has no significance. The following is an example of a valid value. :\"GSM850,PCS1900\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.GSMRxBandsSupported";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.";
+  }
+
+  grouping capabilities-umts-self-config-g {
+    description
+      "This object contains parameters relating to the self-configuration capabilities of the FAP. Self-configuration is enabled in {{object|.FAPControl.UMTS.SelfConfig.}}";
+    leaf uarfcn-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the UTRA Absolute Radio Frequency Channel Number (UARFCN). If {{true}} multiple values MAY be provided in {{param|.CellConfig.UMTS.RAN.RF.UARFCNDL}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.RAN.RF.UARFCNDL}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.UARFCNConfig";
+    }
+    leaf primary-scrambling-code-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Primary Scrambling Code (PSC). If {{true}} multiple values or a range of values MAY be provided in {{param|.CellConfig.UMTS.RAN.RF.PrimaryScramblingCode}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.RAN.RF.PrimaryScramblingCode}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.PrimaryScramblingCodeConfig";
+    }
+    leaf maxfap-tx-power-expanded-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum FAP Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.UMTS.RAN.RF.MaxFAPTxPowerExpanded}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.RAN.RF.MaxFAPTxPowerExpanded}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.MaxFAPTxPowerExpandedConfig";
+    }
+    leaf pcpich-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the P-CPICH power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.UMTS.RAN.RF.PCPICHPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.RAN.RF.PCPICHPower}} as an upper bound.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.PCPICHPowerConfig";
+    }
+    leaf max-ul-tx-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum UL Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.UMTS.RAN.RF.MaxULTxPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.RAN.RF.MaxULTxPower}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.MaxULTxPowerConfig";
+    }
+    leaf lacracura-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the LAC, RAC, and URA. If {{true}} multiple values MAY be provided in {{param|.CellConfig.UMTS.CN.LACRAC}} and {{param|.CellConfig.UMTS.RAN.URAList}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.UMTS.CN.LACRAC}} and {{param|.CellConfig.UMTS.RAN.URAList}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.LACRACURAConfig";
+    }
+    leaf neighbor-list-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the neighbor list. If {{true}} the ACS uses the {{object|.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborList.InterRATCell.}} tables to explicitly include or exclude entries and the FAP uses that information to determine the final configuration found in the {{object|.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.}} tables. If {{false}} the ACS uses the {{object|.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.}}, {{object|.CellConfig.UMTS.RAN.NeighborList.InterRATCell.}} tables to only specify the included entries and the FAP uses that list.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.NeighborListConfig";
+    }
+    leaf cell-re-selection-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine cell-reselection values. If {{true}} {{object|.CellConfig.UMTS.RAN.CellSelection.}} can be self-configured. If {{false}} {{object|.CellConfig.UMTS.RAN.CellSelection.}} is provided by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.CellReSelectionConfig";
+    }
+    leaf intra-freq-meas-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine intra-frequency measurement values. If {{true}} {{object|.CellConfig.UMTS.RAN.IntraFreqMeas.}} can be self-configured. If {{false}} {{object|.CellConfig.UMTS.RAN.IntraFreqMeas.}} is provided by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.IntraFreqMeasConfig";
+    }
+    leaf inter-freq-meas-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine inter-frequency measurement values. If {{true}} {{object|.CellConfig.UMTS.RAN.InterFreqMeas.}} can be self-configured. If {{false}} {{object|.CellConfig.UMTS.RAN.InterFreqMeas.}} is provided by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.InterFreqMeasConfig";
+    }
+    leaf inter-rat-meas-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine inter-RAT measurement values. If {{true}} {{object|.CellConfig.UMTS.RAN.InterRATMeas.}} can be self-configured. If {{false}} {{object|.CellConfig.UMTS.RAN.InterRATMeas.}} is provided by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.InterRATMeasConfig";
+    }
+    leaf ue-internal-meas-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine UE internal measurement values. If {{true}} {{object|.CellConfig.UMTS.RAN.UEInternalMeas.}} can be self-configured. If {{false}} {{object|.CellConfig.UMTS.RAN.UEInternalMeas.}} is provided by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.UEInternalMeasConfig";
+    }
+    leaf noise-rise-limit-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the selfconfiguration capability to determine the Noise Rise Limit. If {{true}} {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitLowerValue}} and {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitUpperValue}}. MAY provide a range of values to select from. If {{false}} {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitUpperValue}} provides only a single value to be used. The value of {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitLowerValue}} is ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.NoiseRiseLimitConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.UMTS.SelfConfig.";
+  }
+
+  grouping capabilities-lte-g {
+    description
+      "This object contains parameters relating to the system and RF aspect of the FAP device that supports the LTE system.";
+    leaf duplex-mode {
+      type enumeration {
+        enum "fdd-mode" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.DuplexMode - FDDMode";
+        }
+        enum "tdd-mode" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.DuplexMode - TDDMode";
+        }
+      }
+      description
+        "Indicates the mode supported by the LTE FAP. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.DuplexMode";
+    }
+    leaf-list bands-supported {
+      type uint8 {
+        range "1..21 | 33..40";
+      }
+      min-elements 1;
+      max-elements "16";
+      description
+        "{{list}} Indicates the LTE bands that the LTE FAP supports {{bibref|3GPP-TS.36.101|Section 5.5}}. At least one band MUST be supported and multiple bands MAY be supported. Each individual band is identified by arabic number (1, 2,...). The order of the band indicators in the string has no significance. In case a new band is defined in the 3GPP standard in a future release of {{bibref|3GPP-TS.36.101}}, the corresponding new band number will be included in the valid band indicators. The followings are examples of valid values: :\"1\" (specifies only band-1 is supported) :\"1,2,11\" (specifies 3 bands are supported) :\"2,11,1\" (specifies 3 bands are supported)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.BandsSupported";
+    }
+    leaf nnsf-supported {
+      type boolean;
+      description
+        "Indicates whether LTE FAP supports the NAS Node Selection Function (NNSF) or not. NNSF is described in {{bibref|3GPP-TS.36.300|Section 19.2.1.7 and Section 4.6.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.NNSFSupported";
+    }
+    leaf umts-rx-supported {
+      type boolean;
+      description
+        "Indicates whether the LTE FAP hardware supports the receiving function of UMTS or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.UMTSRxSupported";
+    }
+    leaf-list umts-rx-bands-supported {
+      type string;
+      max-elements "16";
+      description
+        "{{list}} Indicates the UMTS receive bands that the LTE FAP supports {{bibref|3GPP-TS.25.104}}, Release 8. If {{param|UMTSRxSupported}} is {{true}}, then at least one band MUST be supported and multiple bands MAY be supported. Each individual band is identified by its upper case Roman numeral. The order of the band indicators in the string has no significance. In case a new band is defined in the 3GPP standard in a future release of {{bibref|3GPP-TS.25.104}}, the corresponding new upper case Roman numeral will be included in the valid band indicators. The followings are examples of valid values: :\"I\" (specifies only band-I is supported) :\"I,II,V\" (specifies 3 bands are supported) :\"II,VII,I\" (specifies 3 bands are supported)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.UMTSRxBandsSupported";
+    }
+    leaf gsm-rx-supported {
+      type boolean;
+      description
+        "Indicates whether the LTE FAP hardware supports the receiving function of GSM or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxSupported";
+    }
+    leaf-list gsm-rx-bands-supported {
+      type enumeration {
+        enum "t-gsm380" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - T-GSM380";
+        }
+        enum "t-gsm410" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - T-GSM410";
+        }
+        enum "gsm450" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - GSM450";
+        }
+        enum "gsm480" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - GSM480";
+        }
+        enum "gsm710" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - GSM710";
+        }
+        enum "gsm750" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - GSM750";
+        }
+        enum "t-gsm810" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - T-GSM810";
+        }
+        enum "gsm850" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - GSM850";
+        }
+        enum "p-gsm900" {
+          value 9;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - P-GSM900";
+        }
+        enum "e-gsm900" {
+          value 10;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - E-GSM900";
+        }
+        enum "r-gsm900" {
+          value 11;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - R-GSM900";
+        }
+        enum "t-gsm900" {
+          value 12;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - T-GSM900";
+        }
+        enum "dcs1800" {
+          value 13;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - DCS1800";
+        }
+        enum "pcs1900" {
+          value 14;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported - PCS1900";
+        }
+      }
+      description
+        "{{list}} Indicates the GSM receive bands that the LTE FAP supports {{bibref|3GPP-TS.45.005}}. If {{param|GSMRxSupported}} is {{true}}, then at least one band MUST be supported and multiple bands MAY be supported. {{bibref|3GPP-TS.45.005}} defines 14 GSM bands. {{enum}} The order of the band indicators in the string has no significance. The following is an example of a valid value. :\"GSM850,PCS1900\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.GSMRxBandsSupported";
+    }
+    leaf cdma2000-rx-supported {
+      type boolean;
+      description
+        "Indicates whether the LTE FAP hardware supports the receiving function of CDMA2000 or not.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.CDMA2000RxSupported";
+    }
+    leaf-list cdma2000-rx-bands-supported {
+      type string;
+      max-elements "16";
+      description
+        "{{list}} Indicates the CDMA2000 receive bands that the LTE FAP supports. If {{param|CDMA2000RxSupported}} is {{true}}, then at least one band MUST be supported and multiple bands MAY be supported. The order of the band indicators in the string has no significance. Bandclass is a 1 or 2-digit number as defined in {{bibref|3GPP2-C.S0057-B}}. The following are example values: :\"0\" (specifies US Cellular) :\"1,3,14\" (specifies US PCS, Japan Cellular and US PCS 1.9Ghz) specifies 3 bands are supported)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.CDMA2000RxBandsSupported";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.LTE.";
+  }
+
+  grouping capabilities-cdma2000-g {
+    description
+      "This object contains parameters relating to the capability attributes for CDMA2000 FAP.";
+    leaf remote-ip-access-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP is capable of providing remote IP access service as defined in {{bibref|3GPP2-X.S0059}}. If {{true}}, the FAP is capable of remote IP access service. If {{false}}, the FAP is not capable of remote IP access service.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.RemoteIPAccessCapable";
+    }
+    leaf-list band-class-supportedfap-beacon {
+      type string;
+      max-elements "32";
+      description
+        "{{list}} Indicates the band classes that the FAP supports for beacon transmission. One or multiple bands MAY be supported. Bandclass is a 1 or 2-digit number as defined in {{bibref|3GPP2-C.S0057}}. List is empty if FAP can not support beacon transmissions.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.BandClassSupportedFAPBeacon";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.";
+  }
+
+  grouping capabilities-cdma2000-one-x-g {
+    description
+      "This object contains parameters relating to the capability attributes for the CDMA2000 1x radio technology portions of a CDMA2000 FAP.";
+    leaf band-class-supportedfap {
+      type string {
+        length "0..32";
+      }
+      description
+        "{{list}} Indicates the CDMA bands that the FAP supports. At least one band MUST be supported and multiple bands MAY be supported. Bandclass is a 1 or 2-digit number as defined in {{bibref|3GPP2-C.S0057}}. The following are example values: \"0\" (specifies US Cellular) \"1,3,14\" (specifies US PCS, Japan Cellular and US PCS 1.9Ghz)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.BandClassSupportedFAP";
+    }
+    leaf active-handin-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP is capable of accepting hand-in of active 1x call from another base station. If {{true}}, the FAP is capable of accepting hand-in. If {{false}}, the FAP is not capable of accepting hand-in.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.ActiveHandinCapable";
+    }
+    leaf femto-overhead-messages-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP supports Access Point Identification, Access Point Pilot Information, and Access Point Identification Text messages specified in {{bibref|3GPP2-C.S0005}}. If {{true}}, the FAP supports these messages. If {{false}}, the FAP does not supports these messages.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.FemtoOverheadMessagesCapable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.";
+  }
+
+  grouping capabilities-cdma2000-one-x-self-config-g {
+    description
+      "This object contains parameters relating to the self-configuration capabilities of the FAP. Self-configuration is enabled in {{object|.FAPControl.CDMA2000.OneX.SelfConfig.}}.";
+    leaf rfcnfl-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Radio Frequency Channel Number. If {{true}} multiple values MAY be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFL}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFL}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.RFCNFLConfig";
+    }
+    leaf pilot-pn-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the pilot PN offset. If {{true}} multiple values or a range of values MAY be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.PilotPN}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.PilotPN}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.PilotPNConfig";
+    }
+    leaf maxfap-tx-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum FAP Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.MaxFAPTxPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.OneX.RAN.RF.MaxFAPTxPower}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerConfig";
+    }
+    leaf maxfap-beacon-tx-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum FAP Beacon Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.OneX.SelfConfig.";
+  }
+
+  grouping capabilities-cdma2000-hrpd-g {
+    description
+      "This object contains parameters relating to the capability attributes for the CDMA2000 HRPD radio technology portions of a CDMA2000 FAP.";
+    leaf a13-session-transfer-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP is capable of supporting A13 session transfer. See {{bibref|3GPP2-C.S0024-B}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.A13SessionTransferCapable";
+    }
+    leaf a16-session-transfer-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP is capable of supporting A16 session transfer. See {{bibref|3GPP2-C.S0024-B}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.A16SessionTransferCapable";
+    }
+    leaf local-ip-access-capable {
+      type boolean;
+      description
+        "Indicates whether the FAP is capable of supporting Local IP access. See {{bibref|3GPP2-C.S0024-B}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.LocalIPAccessCapable";
+    }
+    leaf dedicated-hrpd-beacon {
+      type boolean;
+      description
+        "Indicated whether the FAP supports a dedicated transmission of HRPD beacon independent of the generalized beacon.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.DedicatedHRPDBeacon";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.";
+  }
+
+  grouping capabilities-cdma2000-hrpd-self-config-g {
+    description
+      "This object contains parameters relating to the self-configuration capability attributes for the CDMA2000 HRPD radio technology portions of a CDMA2000 FAP.";
+    leaf rfcnfl-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Radio Frequency Channel Number. If {{true}} multiple values MAY be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.RFCNFL}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.RFCNFL}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.RFCNFLConfig";
+    }
+    leaf pilot-pn-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the pilot PN offset. If {{true}} multiple values or a range of values MAY be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.PilotPN}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.PilotPN}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.PilotPNConfig";
+    }
+    leaf maxfap-tx-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum FAP Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.MaxFAPTxPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.MaxFAPTxPower}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerConfig";
+    }
+    leaf maxfap-beacon-tx-power-config {
+      type boolean;
+      description
+        "Indicates whether the FAP supports the self-configuration capability to determine the Maximum FAP Beacon Transmit Power. If {{true}} a range of values MAY be provided in {{param|.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower}} for the FAP to select from. If {{false}} only a single value SHOULD be provided in {{param|.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.MaxFAPBeaconTxPowerConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Capabilities.CDMA2000.HRPD.SelfConfig.";
+  }
+
+  grouping fap-control-g {
+    description
+      "This object contains parameters relating to state management and provisioning aspects of the FAP.";
+    leaf-list self-config-events {
+      type enumeration {
+        enum "initial-rem" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.SelfConfigEvents - InitialREM";
+        }
+      }
+      config false;
+      description
+        "{{list}} Each item is an event that causes the FAP to perform self configuration as defined by {{object|.FAPControl.UMTS.SelfConfig.}}, {{object|.FAPControl.CDMA2000.OneX.SelfConfig.}}, or {{object|.FAPControl.CDMA2000.HRPD.SelfConfig.}}. Vendors can extend the enumerated values with vendor-specific extensions, in which case the rules outlined in {{bibref|TR-106a2|Section3.3}} MUST be adhered to.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.SelfConfigEvents";
+    }
+    leaf enclosure-tampering-detected {
+      type boolean;
+      config false;
+      description
+        "This parameter indicates whether or not physical tampering of the device enclosure occurred, such as illegal opening of the box. If {{true}} device tampering is detected. If {{false}} no sign of device tampering is detected. Tampering state MUST be persisted across reboots and the device MUST never reset it back from {{true}} to {{false}} even after a factory reset.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.EnclosureTamperingDetected";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.";
+  }
+
+  grouping fap-control-umts-g {
+    description
+      "This object contains parameters relating to the UMTS system specific information.";
+    leaf op-state {
+      type boolean;
+      description
+        "Current operational state of the UMTS FAP as defined in {{bibref|ITU-X.731}}. If {{true}} the UMTS FAP is currently enabled. If {{false}} the UMTS FAP is currently disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.OpState";
+    }
+    leaf admin-state {
+      type boolean;
+      config false;
+      description
+        "Lock or unlock the UMTS FAP. This controls the administrative state of the UMTS FAP as defined in {{bibref|ITU-X.731}}. If {{true}} Unlocked with permission to serve traffic (and enable RF transmitter(s)). If {{false}} Locked. Transition UMTS FAP to state where it is NOT permitted to serve traffic. RF transmitter is disabled. Given that this command controls the UMTS FAP's RF transmitter, the underlying expectation is that the unlock is done when all necessary conditions are met to allow the transmitter to key on and provide service, including aspects such as: # location verification (including meeting the governing regulatory requirements) # verifying the UMTS FAP configuration # if physical tampering is supported and no physical tampering is detected. The default value after power-on is {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.AdminState";
+    }
+    leaf rf-tx-status {
+      type boolean;
+      description
+        "Current status of this UMTS FAP RF transmitter. {{true}} indicates that the UMTS FAP Tx transmitter is on. {{false}} indicates that the UMTS FAP Tx transmitter is off. This state is tied to the Administrative state which is controlled by the ACS. :When the ACS sets {{param|AdminState}} to {{true}}, then the UMTS FAP has permission to turn on the RF transmitter. :When the ACS sets {{param|AdminState}} to {{false}}, then the UMTS FAP is not allowed to provide service and MUST turn off the RF transmitter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.RFTxStatus";
+    }
+    leaf pm-config {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The value MUST be the path name of a row in the optional ''FAP.PerfMgmt.Config.'' table (see {{bibref|TR-262}}). This is the performance management related configuration for the UMTS FAP. In case of a multiple-radio-technology FAP product, each radio technology can have its own PM configuration or share a common PM configuration. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number. If the referenced object is deleted, the parameter value MUST be set to an empty string.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.PMConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.";
+  }
+
+  grouping fap-control-umts-self-config-g {
+    description
+      "This object contains parameters relating to the controlling of self-configuration capabilities in the FAP.";
+    leaf uarfcn-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the values of {{param|.CellConfig.UMTS.RAN.CSG.UARFCNDLList}}. If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.UARFCNSelfConfigEnable";
+    }
+    leaf primary-scrambling-code-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.UMTS.RAN.RF.PrimaryScramblingCode}}. If {{true}} the FAP self-configures the value. If {{false}} the ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.PrimaryScramblingCodeSelfConfigEnable";
+    }
+    leaf maxfap-tx-power-expanded-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.UMTS.RAN.RF.MaxFAPTxPowerExpanded}}. If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.MaxFAPTxPowerExpandedSelfConfigEnable";
+    }
+    leaf pcpich-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.UMTS.RAN.RF.PCPICHPower}}. If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.PCPICHPowerSelfConfigEnable";
+    }
+    leaf max-ul-tx-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.UMTS.RAN.RF.MaxULTxPower}}. If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.MaxULTxPowerSelfConfigEnable";
+    }
+    leaf lacracura-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the values of {{param|.CellConfig.UMTS.CN.LACRAC}} and {{param|.CellConfig.UMTS.RAN.URAList}}. If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.LACRACURASelfConfigEnable";
+    }
+    leaf neighbor-list-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the values in the object {{object|.CellConfig.UMTS.RAN.NeighborList.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.NeighborListSelfConfigEnable";
+    }
+    leaf cell-re-selection-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine Cell Selection/Reselection-related parameters in {{object|.CellConfig.UMTS.RAN.CellSelection.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.CellReSelectionSelfConfigEnable";
+    }
+    leaf intra-freq-meas-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine intra-frequency measurement -related parameters in {{object|.CellConfig.UMTS.RAN.IntraFreqMeas.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.IntraFreqMeasSelfConfigEnable";
+    }
+    leaf inter-freq-meas-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine inter-frequency measurement -related parameters in {{object|.CellConfig.UMTS.RAN.InterFreqMeas.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.InterFreqMeasSelfConfigEnable";
+    }
+    leaf inter-rat-meas-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine inter-RAT measurement -related parameters in {{object|.CellConfig.UMTS.RAN.InterRATMeas.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.InterRATMeasSelfConfigEnable";
+    }
+    leaf ue-internal-meas-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine UE internal measurement-related parameters in {{object|.CellConfig.UMTS.RAN.UEInternalMeas.}} If {{true}} The FAP self-configures the value. If {{false}} The ACS MUST provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.UEInternalMeasConfigEnable";
+    }
+    leaf noise-rise-limit-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitInUse}}. If {{true}} the FAP self-configures the value, based on the limits specified in {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitLowerValue}} and {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitUpperValue}}. If {{false}} the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.NoiseRiseLimitConfigEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.SelfConfig.";
+  }
+
+  grouping fap-control-umts-gateway-g {
+    description
+      "This object contains parameters relating to the Gateways that FAP is connected to.";
+    leaf sec-gw-server1 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "First SecGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.SecGWServer1";
+    }
+    leaf sec-gw-server2 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Second SecGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.SecGWServer2";
+    }
+    leaf sec-gw-server3 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Third SecGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.SecGWServer3";
+    }
+    leaf fap-gw-server1 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "First FAPGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.FAPGWServer1";
+    }
+    leaf fap-gw-server2 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Second FAPGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.FAPGWServer2";
+    }
+    leaf fap-gw-server3 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Third FAPGW the FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.FAPGWServer3";
+    }
+    leaf fap-gw-port {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Port number of FAPGW used for initial Iuh SCTP contact. This value is specified as 29169 according to IANA definition per {{bibref|IANA-portnumbers}}, registered on 2009-09-08. Use of IANA-defined value is recommended.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.FAPGWPort";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.UMTS.Gateway.";
+  }
+
+  grouping fap-control-lte-g {
+    description
+      "This object contains parameters relating to the LTE system specific information.";
+    leaf op-state {
+      type boolean;
+      description
+        "Current operational state of the LTE FAP as defined in {{bibref|ITU-X.731}}. If {{true}} the LTE FAP is currently enabled. If {{false}} the LTE FAP is currently disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.OpState";
+    }
+    leaf admin-state {
+      type boolean;
+      config false;
+      description
+        "Lock or unlock the LTE FAP. This controls the administrative state of the LTE FAP as defined in {{bibref|ITU-X.731}}. If {{true}} Unlocked with permission to serve traffic (and enable RF transmitter(s)). If {{false}} Locked. Transition LTE FAP to state where it is NOT permitted to serve traffic. RF transmitter is disabled. Given that this command controls the LTE FAP's RF transmitter, the underlying expectation is that the unlock is done when all necessary conditions are met to allow the transmitter to key on and provide service, including aspects such as: # location verification (including meeting the governing regulatory requirements) # verifying the LTE FAP configuration # if physical tampering is supported and no physical tampering is detected. The default value after power-on is {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.AdminState";
+    }
+    leaf rf-tx-status {
+      type boolean;
+      description
+        "Current status of this LTE FAP RF transmitter. {{true}} indicates that the LTE FAP Tx transmitter is on. {{false}} indicates that the LTE FAP Tx transmitter is off. This state is tied to the Administrative state which is controlled by the ACS. :When the ACS sets {{param|AdminState}} to {{true}}, then the LTE FAP has permission to turn on the RF transmitter. :When the ACS sets {{param|AdminState}} to {{false}}, then the LTE FAP is not allowed to provide service and MUST turn off the RF transmitter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.RFTxStatus";
+    }
+    leaf pm-config {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The value MUST be the path name of a row in optional the ''.FAP.PerfMgmt.Config.'' table (see {{bibref|TR-262}}). This is the performance management related configuration for the LTE FAP. In case of a multiple-radio-technology FAP product, each radio technology can have its own PM configuration or share a common PM configuration. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number. If the referenced object is deleted, the parameter value MUST be set to an empty string.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.PMConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.";
+  }
+
+  grouping fap-control-lte-gateway-g {
+    description
+      "This object contains parameters relating to the Gateways that the LTE FAP is connected to.";
+    leaf sec-gw-server1 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "First SecGW the LTE FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.SecGWServer1";
+    }
+    leaf sec-gw-server2 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Second SecGW the LTE FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.SecGWServer2";
+    }
+    leaf sec-gw-server3 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Third SecGW the LTE FAP attempts to establish connection with. Either hostname or IPaddress.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.SecGWServer3";
+    }
+    leaf-list s1-sig-link-server-list {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a S1 signaling connection end point (-GW or MME) the LTE FAP attempts to establish connection with. It is in the form of either hostname or IPaddress. LTE FAP's behavior in terms of the number of S1 connection to established with is determined by {{param|S1ConnectionMode}} parameter. If {{param|S1ConnectionMode}} has the value of {{enum|One|S1ConnectionMode}}, then LTE FAP attempts to establish S1 connection with only one address following the ordering of the list. If {{param|S1ConnectionMode}} has the value of {{enum|All|S1ConnectionMode}}, then LTE FAP attempts to establish connection with all addresses in the list.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.S1SigLinkServerList";
+    }
+    leaf s1-connection-mode {
+      type enumeration {
+        enum "one" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.S1ConnectionMode - One";
+        }
+        enum "all" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.S1ConnectionMode - All";
+        }
+      }
+      config false;
+      description
+        "Indicates how many of the configured far-end S1 link address(es),as defined in {{param|S1SigLinkServerList}}, LTE FAP SHOULD attempt to establish connection with simultaneously. If {{param}} parameter is not explicitly configured, then LTE FAP shall assume the value to be {{enum|One|S1ConnectionMode}} as default.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.S1ConnectionMode";
+    }
+    leaf s1-sig-link-port {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Port number of S1AP signaling connection end point (-GW or MME) used for initial S1 SCTP contact. This value is specified as 36412 according to IANA definition per {{bibref|IANA-portnumbers}}, registered on 2009-09-01. Use of IANA-defined value is recommended.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.S1SigLinkPort";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.LTE.Gateway.";
+  }
+
+  grouping fap-control-cdma2000-g {
+    description
+      "This object contains parameters relating to the configuration for the control portions of a CDMA2000 FAP.";
+    leaf home-domain {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "A string containing one of operator's home domains in URI format. FAP is preconfigured with a default home domain, which can be overwritten later by ACS. See {{bibref|3GPP2-X.S0059}}. If the''.ManagementServer.URL'' is null, then the FAP shall use the value of this attribute to construct the ''.ManagementServer.URL'' attribute. If {{param|.FAPControl.CDMA2000.Gateway.SecGWServer1}} is null, then the FAP shall use the value of this attribute to construct the {{param|.FAPControl.CDMA2000.Gateway.SecGWServer1}} attribute. If the FAP is unable to connect to the management server indicated by the value of the ''.ManagementServer.URL'' attribute and this attribute is not null, the FAP may use the value of this attribute to construct the ''.ManagementServer.URL'' attribute. If the FAP is unable to connect to any security gateway indicated by the value of the {{param|.FAPControl.CDMA2000.Gateway.SecGWServer1}}, {{param|.FAPControl.CDMA2000.Gateway.SecGWServer2}}, and {{param|.FAPControl.CDMA2000.Gateway.SecGWServer3}} attributes and this attribute is not null, the FAP may use the value of this attribute to construct the {{param|.FAPControl.CDMA2000.Gateway.SecGWServer1}} attribute.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HomeDomain";
+    }
+    leaf remote-ip-access-enable {
+      type boolean;
+      config false;
+      description
+        "Enable or disable remote IP access service as defined in {{bibref|3GPP2-X.S0059}}. If {{true}} remote IP access is enabled. If {{false}} remove IP access is disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.RemoteIPAccessEnable";
+    }
+    leaf pm-config {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The value MUST be the path name of a row in the ''.FAP.PerfMgmt.Config.'' table. This is the performance management related configuration for the CDMA2000 FAP. In case of a multiple-radio-technology FAP product, each radio technology can have its own PM configuration or share a common PM configuration. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number. If the referenced object is deleted, the parameter value MUST be set to an empty string.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.PMConfig";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.";
+  }
+
+  grouping fap-control-cdma2000-time-g {
+    description
+      "This object contains parameters related to time syncronization with CDMA2000 System Time (see {{bibref|3GPP2-C.S0005}}).";
+    leaf local-time-zone {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The local time zone for CDMA2000 operational purposes. E.g., \"+HH:MM JST\" for Japan. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Time.LocalTimeZone";
+    }
+    leaf current-local-time {
+      type string {
+        length "0..64";
+      }
+      description
+        "The current CDMA System Time (see {{bibref|3GPP2-C.S0005}}), expressed as date and time in the CPE's local time zone. The format of this field is \"YYYY-MM-DDThh:mm:ss.sTZD\" (e.g., 1997-07-16T19:20:30.45+01:00), where: YYYY = four-digit year MM = two-digit month (01=January, etc.) DD = two-digit day of month (01 through 31) hh = two digits of hour (00 through 23) (am/pm NOT allowed) mm = two digits of minute (00 through 59) ss = two digits of second (00 through 59) s = one or more digits representing a decimal fraction of a second TZD = time zone designator (Z or +hh:mm or -hh:mm)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Time.CurrentLocalTime";
+    }
+    leaf leap-seconds {
+      type int64;
+      units "seconds";
+      config false;
+      description
+        "Number of leap seconds (in {{units}} to be applied between CurrentLocalTime and CDMA System Time. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Time.LeapSeconds";
+    }
+    leaf daylight-savings-used {
+      type boolean;
+      config false;
+      description
+        "Whether or not daylight savings time is in use in the FAP's local time zone with respect to CDMA2000 System Time (see {{bibref|3GPP2-C.S0005}}). {true}} if daylight savings time is being used; otherwise {{false}}. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Time.DaylightSavingsUsed";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Time.";
+  }
+
+  grouping fap-control-cdma2000-one-x-g {
+    description
+      "This object contains all global attributes of the 1xFemto application.";
+    leaf admin-state {
+      type enumeration {
+        enum "lock" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.AdminState - Lock";
+        }
+        enum "unlock" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.AdminState - Unlock";
+        }
+      }
+      config false;
+      description
+        "Administrative state for 1x";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.AdminState";
+    }
+    leaf op-state {
+      type enumeration {
+        enum "enabled" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.OpState - Enabled";
+        }
+        enum "disabled" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.OpState - Disabled";
+        }
+      }
+      description
+        "Operational state of the 1x";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.OpState";
+    }
+    leaf rf-tx-status {
+      type boolean;
+      description
+        "Current status of this RF transmitter. {{true}} indicates that the 3G Tx transmitter is on. {{false}} indicates that the 3G Tx transmitter is off. This state is tied to the Administrative state which is controlled by the ACS. When the ACS sets AdminState to {{true}}, then the FAP has permission to turn on the RF transmitter. When the ACS sets AdminState to {{false}}, then the FAP is not allowed to provide service and MUST turn off the RF transmitter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.RFTxStatus";
+    }
+    leaf daylight {
+      type int64;
+      config false;
+      description
+        "If Daylight Savings Time is being used with respect to CDMA2000 1x overhead parameters (see {{bibref|3GPP2-C.S0005}}), then {{param}} should be set to {{true}}. Otherwise, {{param}} should be set to {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.Daylight";
+    }
+    leaf max-p-rev {
+      type int64;
+      config false;
+      description
+        "Protocol revision supported by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.MaxPRev";
+    }
+    leaf reregister {
+      type uint64;
+      config false;
+      description
+        "{{param}} triggers a re-registration of all mobiles. The FAP triggers re-registration of all registered mobiles everytime this number changes";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.Reregister";
+    }
+    leaf emergency-session-period {
+      type uint16 {
+        range "15..1800";
+      }
+      units "seconds";
+      config false;
+      description
+        "The period (in {{units}}) the session of an unauthorized user is kept alive after an emergency call.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.EmergencySessionPeriod";
+    }
+    leaf location-area-code {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "This is the location area code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.LocationAreaCode";
+    }
+    leaf msc-id {
+      type uint64;
+      config false;
+      description
+        "This is the FAP's MSCID. This ID is used in PANI header.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.MSCId";
+    }
+    leaf active-handin-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP performs active hand-in from another base station. If {{true}} active hand-in is enabled; if {{false}} active hand-in is disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.";
+  }
+
+  grouping fap-control-cdma2000-one-x-active-handin-measurement-g {
+    description
+      "CDMA2000 1x active handin operational parameters.";
+    leaf active-handin-measurement-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP performs active hand-in measurement if a request is received. If {{true}} active hand-in measurement is enabled; if {{false}} active hand-in measurement is disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinMeasurement.ActiveHandinMeasurementEnable";
+    }
+    leaf active-hand-in-measurement-duration {
+      type uint16 {
+        range "0..65535";
+      }
+      units "1.25 ms slots";
+      config false;
+      description
+        "The minimum duration in {{units}} for which FAP should take a mobile's RL pilot strength measurements for active hand-in purpose when directed by the network. Instead of continuous measurement for this entire duration, a FAP can make multiple measurements by sampling over shorter durations. In such a case, this value specifies the minimum time separation required between the first and last measurement samples.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinMeasurement.ActiveHandInMeasurementDuration";
+    }
+    leaf measurement-report-threshold {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "The threshold (in {{units}}) for the FAP to report an active hand-in measurement. If the metric to be reported is below the threshold, the FAP may not send any report.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinMeasurement.MeasurementReportThreshold";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.ActiveHandinMeasurement.";
+  }
+
+  grouping fap-control-cdma2000-one-x-self-config-g {
+    description
+      "This object contains parameters relating to the controlling of self-configuration capabilities in the FAP.";
+    leaf rfcnfl-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the values of {{param|.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFL}}. If {{true}}, the FAP self-configures the value. If {{false}}, the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.RFCNFLSelfConfigEnable";
+    }
+    leaf pilot-pn-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.OneX.RAN.RF.PilotPN}}. If {{true}} the FAP self-configures the value. If {{false}} the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.PilotPNSelfConfigEnable";
+    }
+    leaf maxfap-tx-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.OneX.RAN.RF.MaxFAPTxPower}}. If {{true}} the FAP self-configures the value. If {{false}} the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerSelfConfigEnable";
+    }
+    leaf maxfap-beacon-tx-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower}}. If {{true}}, the FAP self-configures the value. If {{false}}, the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerSelfConfigEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.OneX.SelfConfig.";
+  }
+
+  grouping fap-control-cdma2000-gateway-g {
+    description
+      "CDMA2000 FAP Security Gateway operational parameters.";
+    leaf sec-gw-server1 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "First SecGW the FAP attempts to contact. Either FQDN or IP address";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Gateway.SecGWServer1";
+    }
+    leaf sec-gw-server2 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Second SecGW the FAP attempts to contact. Either FQDN or IP address";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Gateway.SecGWServer2";
+    }
+    leaf sec-gw-server3 {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Third SecGW that the FAP attempts to contact. Can contain either FQDN or IP address";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Gateway.SecGWServer3";
+    }
+    leaf sec-gw-switchover-count {
+      type uint64;
+      description
+        "Counter indicating how many times FAP has switched between SecGW";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Gateway.SecGWSwitchoverCount";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.Gateway.";
+  }
+
+  grouping fap-control-cdma2000-hrpd-g {
+    description
+      "Operational parameters for the HRPD portion of a CDMA2000 FAP.";
+    leaf op-state {
+      type boolean;
+      description
+        "Current operational state of the FAP as defined in ITU-X.731 [32]. If {{true}} the FAP is currently enabled. If {{false}} the FAP is currently disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.OpState";
+    }
+    leaf admin-state {
+      type boolean;
+      config false;
+      description
+        "Lock or unlock the FAP. This controls the administrative state of the FAP as defined in ITU-X.731 [32]. If {{true}} Unlocked with permission to serve traffic (and enable RF transmitter(s)). If {{false}} Locked. Transition FAP to state where it is NOT permitted to serve traffic. RF transmitter is disabled. Given that this command controls the FAP's RF transmitter, the underlying expectation is that the unlock is done when all necessary conditions are met to allow the transmitter to key on and provide service, including aspects such as: location verification (including meeting the governing regulatory requirements) verifying the FAP configuration if physical tampering is supported and no physical tampering is detected. The default value after power-on is {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.AdminState";
+    }
+    leaf rf-tx-status {
+      type boolean;
+      description
+        "Current status of this RF transmitter. {{true}} indicates that the 3G Tx transmitter is on. {{false}} indicates that the 3G Tx transmitter is off. This state is tied to the Administrative state which is controlled by the ACS. When the ACS sets AdminState to {{true}}, then the FAP has permission to turn on the RF transmitter. When the ACS sets AdminState to {{false}}, then the FAP is not allowed to provide service and MUST turn off the RF transmitter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.RFTxStatus";
+    }
+    leaf a13-session-transfer-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP performs A13 session transfer. If {{true}} A13 session transfer is enabled; if {{false}} A13 session transfer is disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13SessionTransferEnable";
+    }
+    leaf local-ip-access-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP can assign local IP address to capable ATs. If {{true}} local IP address is assigned.; if {{false}} local IP address is not assigned.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.LocalIPAccessEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.";
+  }
+
+  grouping fap-control-cdma2000-hrpd-self-config-g {
+    description
+      "This object contains parameters relating to the controlling of self-configuration capabilities in the FAP.";
+    leaf rfcnfl-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the values of {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.RFCNFL}}. If {{true}}, the FAP self-configures the value. If {{false}}, the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.RFCNFLSelfConfigEnable";
+    }
+    leaf pilot-pn-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.PilotPN}}. If {{true}}, the FAP self-configures the value. If {{false}}, the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.PilotPNSelfConfigEnable";
+    }
+    leaf maxfap-tx-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.HRPD.RAN.RF.MaxFAPTxPower}} . If {{true}}, the FAP self-configures the value. If {{false}}, the ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerSelfConfigEnable";
+    }
+    leaf max-hrpd-beacon-tx-power-self-config-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the self-configuration capability in the FAP is used or not to determine the value of {{param|.CellConfig.CDMA2000.Beacon.MaxHRPDBeaconTxPower}}. If {{true}} the FAP self-configures the value. If {{false}} The ACS must provide the specific value to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.MaxHRPDBeaconTxPowerSelfConfigEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.SelfConfig.";
+  }
+
+  grouping fap-control-cdma2000-hrpd-a13-g {
+    description
+      "This object contains attributes related to A13 Session Transfer";
+    leaf color-code-to-uati104-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104NumberOfEntries";
+    }
+    leaf hrpd-subnet-to-ip-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIPNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.";
+  }
+
+  grouping fap-control-cdma2000-hrpd-a13-color-code-to-uati104-g {
+    description
+      "HRPD ColorCode to UATI Mapping Table number of entries.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.Alias";
+    }
+    leaf color-code {
+      type uint16 {
+        range "0..256";
+      }
+      description
+        "Color Code mapped to UATI104 in the following field";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.ColorCode";
+    }
+    leaf uati104 {
+      type binary {
+        length "0..13";
+      }
+      description
+        "The UATI104 of the AT that accesses with the ColorCode field";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.UATI104";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.ColorCodeToUATI104.{i}.";
+  }
+
+  grouping fap-control-cdma2000-hrpd-a13-hrpd-subnet-to-ip-g {
+    description
+      "This object contains attributes related to A13 Session Transfer";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.Alias";
+    }
+    leaf hrpd-subnet-length {
+      type uint8 {
+        range "1..104";
+      }
+      units "bits";
+      config false;
+      description
+        "The number of MSBs (in {{units}}) in the following field that is part of HRPDSubnet";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.HRPDSubnetLength";
+    }
+    leaf hrpd-subnet {
+      type binary {
+        length "0..13";
+      }
+      config false;
+      description
+        "The {{param|HRPDSubnetLength}} MSBs of this field contain the HRPD subnet that maps to the IP address in the following field";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.HRPDSubnet";
+    }
+    leaf a13-ip-address {
+      type inet:ip-address;
+      description
+        "This field contains the IP address of A13 endpoint that corresponds to the HRPD subnet";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.A13IPAddress";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.FAPControl.CDMA2000.HRPD.A13.HRPDSubnetToIP.{i}.";
+  }
+
+  grouping access-mgmt-g {
+    description
+      "This object contains parameters relating to Access Management for the different radio technologies.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.";
+  }
+
+  grouping access-mgmt-umts-g {
+    description
+      "This object contains parameters relating to Access Management for UMTS FAP (ACL, CSG, LIPA). Closed Subscriber Group (CSG) service behavior is specified in {{bibref|3GPP-TS.22.011}}. Note: Cell barring and 3GPP access class parameters are contained in {{object|.CellConfig.UMTS.RAN.CellRestriction.}} (UMTS FAP).";
+    leaf access-mode {
+      type enumeration {
+        enum "open access" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.AccessMode - Open Access";
+        }
+        enum "closed access" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.AccessMode - Closed Access";
+        }
+        enum "hybrid access" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.AccessMode - Hybrid Access";
+        }
+      }
+      default "open access";
+      config false;
+      description
+        "Indicates the type of access mode the FAP operates in. {{enum}} When the value is not {{enum|Open Access}} non-CSG-capable UE are handled according to {{param|NonCSGUEAccessDecision}}. Note: This parameter controls the setting of the CSGindicator bit, specified in MIB in {{bibref|3GPP-TS.25.331}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.AccessMode";
+    }
+    leaf non-csgue-access-decision {
+      type enumeration {
+        enum "local" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.NonCSGUEAccessDecision - Local";
+        }
+        enum "query fap-gw" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.NonCSGUEAccessDecision - Query FAPGW";
+        }
+        enum "by core" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.NonCSGUEAccessDecision - By Core";
+        }
+      }
+      default "local";
+      config false;
+      description
+        "Indicates how the access decision is made for non-CSG-capable UE. Parameter is ignored when {{param|AccessMode}} is {{enum|Open Access|AccessMode}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.NonCSGUEAccessDecision";
+    }
+    leaf csg-membership-determined-locally {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Indicates how the access decision is made for CSG-capable UE. Parameter is ignored when {{param|AccessMode}} is {{enum|Open Access|AccessMode}}. If {{true}} access decision is determined the same way as for {{param|NonCSGUEAccessDecision}}. (E.g. if core network doesn't (yet) support full CSG functionality.) If {{false}} FAP always allows access for CSG-capable UE. CSG enforcement is performed by MSC/SGSN (with support from HSS), or by FGW. {{bibref|3GPP-TS.22.011}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.CSGMembershipDeterminedLocally";
+    }
+    leaf max-u-es-served {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurrent UEs allowed at a cell. Valid for any {{param|AccessMode}}. A value of -1 allows an unlimited number of concurrent UEs up to the limit of FAP capacity. The setting does not affect emergency calls.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MaxUEsServed";
+    }
+    leaf max-csg-members {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurrent CSG member UEs allowed at a hybrid or closed cell. A value of -1 allows an unlimited number of CSG members up to the limit of FAP capacity. The setting cannot be larger than the value of {{param|MaxUEsServed}}. The setting does not affect emergency calls. {{bibref|3GPP-TS.22.011}}, {{bibref|3GPP-TS.22.220}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MaxCSGMembers";
+    }
+    leaf max-non-csg-members {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurerent non-CSG member UEs allowed at a hybrid cell. Valid only if {{param|AccessMode}} is {{enum|Hybrid Access|AccessMode}}. The setting cannot be larger than the value of {{param|MaxUEsServed}}. The setting does not affect emergency calls.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MaxNonCSGMembers";
+    }
+    leaf max-resource-non-csg-members {
+      type uint8 {
+        range "0..100";
+      }
+      config false;
+      description
+        "Maximum percentage of physical resource that can be assigned to non-CSG members aggregately at one time. In UMTS FAP, this applies to RB resource.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MaxResourceNonCSGMembers";
+    }
+    leaf hnb-name {
+      type string {
+        length "0..48";
+      }
+      config false;
+      description
+        "Home NodeB name. An operator-defined string that is broadcast by a CSG cell or a hybrid cell and displayed on the UE for the purpose of manual cell selection or indication that the UE is camped on the cell as specified in {{bibref|3GPP-TS.22.220|Section 5.4.2}}. Corresponds to parameter 'hnb-Name' specified in SIB20 in {{bibref|3GPP-TS.25.331|Section 10.2.48.8.23}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.HNBName";
+    }
+    leaf csgid {
+      type uint32 {
+        range "0..134217727";
+      }
+      config false;
+      description
+        "Defines the Closed Subscriber Group of the Access Control List. The UMTS FAP broadcasts this CSG ID in SIB3 depending on the AccessMode. The LTE FAP broadcasts this in SIB1, and corresponds to parameter csg-Identity in SIB1 in {{bibref|3GPP-TS.36.331}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.CSGID";
+    }
+    leaf-list access-control-list {
+      type string {
+        length "0..15";
+      }
+      config false;
+      max-elements "1024";
+      description
+        "{{list}} Each entry is an IMSI.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.AccessControlList";
+    }
+    leaf max-member-detail-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.AccessMgmt.UMTS.MemberDetail.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MaxMemberDetailEntries";
+    }
+    leaf member-detail-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetailNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.";
+  }
+
+  grouping access-mgmt-umts-member-detail-g {
+    description
+      "Details for CSG and Non-CSG members.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the MemberDetail entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.Alias";
+    }
+    leaf imsi {
+      type string {
+        length "0..15";
+      }
+      description
+        "International Mobile Subscriber Identity of the UE.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.IMSI";
+    }
+    leaf msisdn {
+      type string {
+        length "0..15";
+      }
+      config false;
+      description
+        "Mobile Station International Subscriber Identity Number. Set to {{empty}} if unknown.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.MSISDN";
+    }
+    leaf membership-expires {
+      type yang:date-and-time;
+      config false;
+      description
+        "Time when the ACL membership expires. An Unknown Time value, as defined in {{bibref|TR-106a2|Section 3.2}}, indicates that the membership doesn't expire. Upon expiry the FAP MUST remove the IMSI from the {{param|.AccessMgmt.UMTS.AccessControlList}}, but the entry in {{object|.AccessMgmt.UMTS.MemberDetail.{i}.}} remains. {{bibref|3GPP-TS.22.011}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.MembershipExpires";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.MemberDetail.{i}.";
+  }
+
+  grouping access-mgmt-umts-local-ip-access-g {
+    description
+      "Local IP access for UMTS FAP.";
+    leaf enable {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enables/disables the Local IP Access (LIPA) functionality.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.LocalIPAccess.Enable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.UMTS.LocalIPAccess.";
+  }
+
+  grouping access-mgmt-lte-g {
+    description
+      "This object contains parameters relating to Access Management, as defined in {{bibref|3GPP-TS.32.592}}/ Closed Subscriber Group (CSG) service behavior is specified in {{bibref|3GPP-TS.22.011}}. Note: Cell barring and 3GPP access class parameters are contained in SIB1 in {{bibref|3GPP-TS.36.331}}.";
+    leaf access-mode {
+      type enumeration {
+        enum "open access" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.AccessMode - Open Access";
+        }
+        enum "closed access" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.AccessMode - Closed Access";
+        }
+        enum "hybrid access" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.AccessMode - Hybrid Access";
+        }
+      }
+      default "open access";
+      config false;
+      description
+        "Indicates the type of access mode the FAP operates in. {{enum}} Note: This parameter controls the setting of the CSGindicator bit, specified in SIB1 in {{bibref|3GPP-TS.36.331}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.AccessMode";
+    }
+    leaf max-u-es-served {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurrent UEs allowed at a cell. Valid for any {{param|AccessMode}}. A value of -1 allows an unlimited number of concurrent UEs up to the limit of FAP capacity. The setting does not affect emergency calls.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.MaxUEsServed";
+    }
+    leaf max-csg-members {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurrent CSG member UEs allowed at a hybrid or closed cell. A value of -1 allows an unlimited number of CSG members up to the limit of FAP capacity. The setting cannot be larger than the value of {{param|MaxUEsServed}}. The setting does not affect emergency calls. {{bibref|3GPP-TS.22.011}}, {{bibref|3GPP-TS.22.220}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.MaxCSGMembers";
+    }
+    leaf max-non-csg-members {
+      type int64;
+      default "-1";
+      config false;
+      description
+        "Maximum number of concurerent non-CSG member UEs allowed at a hybrid cell. Valid only if {{param|AccessMode}} is {{enum|Hybrid Access|AccessMode}}. The setting cannot be larger than the value of {{param|MaxUEsServed}}. The setting does not affect emergency calls.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.MaxNonCSGMembers";
+    }
+    leaf max-resource-non-csg-members {
+      type uint8 {
+        range "0..100";
+      }
+      config false;
+      description
+        "Maximum percentage of physical resource that can be assigned to non-CSG members aggregately at one time. This applies to PDSCH physical resource blocks.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.MaxResourceNonCSGMembers";
+    }
+    leaf csgid {
+      type uint32 {
+        range "0..134217727";
+      }
+      config false;
+      description
+        "Defines the Closed Subscriber Group of the Access Control List. The LTE FAP broadcasts this in SIB1, and corresponds to parameter csg-Identity in SIB1 in {{bibref|3GPP-TS.36.331}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.CSGID";
+    }
+    leaf hnb-name {
+      type string {
+        length "0..48";
+      }
+      config false;
+      description
+        "Home NodeB name. An operator-defined string that is broadcast by a CSG cell or a hybrid cell and displayed on the UE for the purpose of manual cell selection or indication that the UE is camped on the cell as specified in {{bibref|3GPP-TS.22.220|Section 5.4.2}}. Corresponds to parameter 'hnb-Name' specified in SIB9 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.HNBName";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.";
+  }
+
+  grouping access-mgmt-lte-local-ip-access-g {
+    description
+      "Local IP access for LTE FAP.";
+    leaf enable {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enables/disables the Local IP Access (LIPA) functionality.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.LocalIPAccess.Enable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.LTE.LocalIPAccess.";
+  }
+
+  grouping access-mgmt-cdma2000-g {
+    description
+      "This object contains configurable and observable attributes related to CDMA2000 Access and Admission Control of the FAP.";
+    leaf access-mode {
+      type uint8 {
+        range "0 | 1 | 3";
+      }
+      config false;
+      description
+        "Defines the access control mode of FAP. Allowed modes are Open, Closed, and Signaling Association (refer to {{bibref|3GPP2-A.S0024}}). AccessMode 2 (Hybrid) is not applicable to CDMA2000 FAPs. 0- Open,1-Closed, 2-Reserved, 3-Signaling Association.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.AccessMode";
+    }
+    leaf max-total-active-calls-allowed {
+      type uint16 {
+        range "1..1024";
+      }
+      config false;
+      description
+        "Total number of active calls allowed.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MaxTotalActiveCallsAllowed";
+    }
+    leaf access-control-list {
+      type string {
+        length "0..1024";
+      }
+      config false;
+      description
+        "{{list}} (maximum item length 15). Each entry is an IMSI.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.AccessControlList";
+    }
+    leaf max-member-detail-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.AccessMgmt.CDMA2000.MemberDetail.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MaxMemberDetailEntries";
+    }
+    leaf member-detail-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetailNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.";
+  }
+
+  grouping access-mgmt-cdma2000-member-detail-g {
+    description
+      "At most one enabled entry in this table can exist with a given value for IMSI and HRPDIdentifierValue. The IMSI field may be empty.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.Alias";
+    }
+    leaf imsi {
+      type string {
+        length "0..15";
+      }
+      description
+        "International Mobile Subscriber Identity of the UE.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.IMSI";
+    }
+    leaf hrpd-identifier-type {
+      type int64;
+      config false;
+      description
+        "Type of identifier used for the HRPD AT. 0-invalid 1-ESN 2-MEID 3-A12NAI. If IMSI in this record is valid, then this attribute is set to 0.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.HRPDIdentifierType";
+    }
+    leaf hrpd-identifier-value {
+      type string {
+        length "0..128";
+      }
+      config false;
+      description
+        "The value of this attribute depends on {{param|HRPDIdentifierType}}. ESN and MEID shall be defined as Hex.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.HRPDIdentifierValue";
+    }
+    leaf membership-expires {
+      type yang:date-and-time;
+      config false;
+      description
+        "The time that the current ACL membership expires.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.MembershipExpires";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.MemberDetail.{i}.";
+  }
+
+  grouping access-mgmt-cdma2000-local-ip-access-g {
+    description
+      "Local IP access support as defined in 3GPP2";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.";
+  }
+
+  grouping access-mgmt-cdma2000-local-ip-access-hrpd-g {
+    description
+      "Local IP access support as defined in 3GPP2";
+    leaf filter-type {
+      type uint8 {
+        range "0..3";
+      }
+      config false;
+      description
+        "Value of '0' indicates that the FAP shall allow only IP packets with destination address matching the local IP subnet on Local IP access interface. Value of '1' indicates that the FAP shall allow any IP packets with destination address matching either the local IP subnet or the subnets listed in Local IP egress filter parameter on Local IP access interface. Value of '2' indicates that the FAP shall allow any IP packets with destination addresses that do not match the Local IP egress filter parameter on Local IP access interface.Value of '3' indicates that the FAP shall allow any IP packets on the local IP address interface.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.FilterType";
+    }
+    leaf filter-in-use {
+      type string {
+        length "0..256";
+      }
+      description
+        "This parameter is set to the IPCP Vendor Specific Option which the FAP uses to send Local IP access packet filter on AN-PPP interface.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.FilterInUse";
+    }
+    leaf egress-filter-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilterNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.";
+  }
+
+  grouping access-mgmt-cdma2000-local-ip-access-hrpd-egress-filter-g {
+    description
+      "HRPD LIPA Egress Filter Table entries.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.Alias";
+    }
+    leaf subnet {
+      type inet:ipv4-address;
+      description
+        "The IP subnet of the egress filter to be installed to the AT. The meaning of this field depends on the {{param|.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.FilterType}} field.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.Subnet";
+    }
+    leaf subnet-mask {
+      type uint8 {
+        range "0..32";
+      }
+      description
+        "The length of the IP subnetmask associated with the IP subnet in the previous field.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.SubnetMask";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.CDMA2000.LocalIPAccess.HRPD.EgressFilter.{i}.";
+  }
+
+  grouping access-mgmt-legacy-g {
+    description
+      "This object contains configurable and observable attributes related to Access and Admission Control of the FAP, which are not not covered by 3GPP and 3GPP2 specifications.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.";
+  }
+
+  grouping access-mgmt-legacy-local-ip-access-g {
+    description
+      "Old Local IP access object, included on special request.";
+    leaf enable {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enables/disables the Local IP Access (LIPA) functionality.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Enable";
+    }
+    leaf max-rules-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.MaxRulesEntries";
+    }
+    leaf rule-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.RuleNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.";
+  }
+
+  grouping access-mgmt-legacy-local-ip-access-rule-g {
+    description
+      "Policy for selecting traffic for local IP access. Originated traffic will be NAT'ed. The rule is bi-directional, i.e. return traffic is allowed. Rules do NOT affect traffic to/from the FAP itself (such as TR-069 or control). The rules are applied to the mobile station data traffic (PS-domain) via deep packet inspection or similar method.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the forwarding entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Alias";
+    }
+    leaf dest-ip-address {
+      type inet:ip-address;
+      description
+        "Destination IP Address. {{empty}} indicates no destination address is specified. An entry for which {{param}} and {{param|DestSubnetMask}} are both {{empty}} is a default route.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.DestIPAddress";
+    }
+    leaf dest-subnet-mask {
+      type inet:ip-address;
+      description
+        "Destination subnet mask (IPv4) or prefix (IPv6). {{empty}} indicates no destination subnet mask or prefix is specified. If a destination subnet mask or prefix is specified, {{param}} is ANDed with the destination address before comparing with {{param|DestIPAddress}}. Otherwise, the full destination address is used as-is. An entry for which {{param|DestIPAddress}} and {{param}} are both {{empty}} is a default route.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.DestSubnetMask";
+    }
+    leaf protocol {
+      type int64;
+      description
+        "IP Protocol Identifier. -1 matches any protocol.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Protocol";
+    }
+    leaf action {
+      type enumeration {
+        enum "tunnel" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Action - Tunnel";
+        }
+        enum "napt" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Action - NAPT";
+        }
+      }
+      config false;
+      description
+        "Action to be taken for traffic matching this rule.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Action";
+    }
+    leaf interface {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "Specifies the egress interface when {{param|Action}} is set to {{enum|NAPT|Action}}. {{reference}} layer-3 connection object. Example: InternetGatewayDevice.LANDevice.{i}.LANEthernetInterfaceConfig.{i}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.Interface";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.AccessMgmt.Legacy.LocalIPAccess.Rule.{i}.";
+  }
+
+  grouping cell-config-g {
+    description
+      "This object contains parameters relating to configuring the FAP.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.";
+  }
+
+  grouping umts-g {
+    description
+      "This object contains parameters relating to configuring UMTS system specific information.";
+    leaf tunnel-instance {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "This is the reference to the IPsec tunnel instance used by the UMTS FAP. For all root data models, which use the tunnel definition provided in {{bibref|TR-262}} (InternetGatewayDevice:1 {{bibref|TR-098}} and Device:1 {{bibref|TR-181i1}}) the {{param}} MUST point to a row in the 'FAP.Tunnel.IKESA.{i}.' table, defined in {{bibref|TR-262}}. If the root data model used is Device:2 {{bibref|TR-181i2}} than the {{param}} MUST point to IPsec tunnel instance defined in {{bibref|TR-181i2}}. If the referenced object is deleted, the parameter value MUST be set to an empty string. In case of a multiple-radio-technology FAP product, each radio technology can have its own tunnels or share common tunnels. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.TunnelInstance";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.";
+  }
+
+  grouping umts-cn-g {
+    description
+      "This object contains parameters relating to configuring UMTS CN.";
+    leaf plmn-type {
+      type enumeration {
+        enum "gsm-map" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PLMNType - GSM-MAP";
+        }
+        enum "ansi-41" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PLMNType - ANSI-41";
+        }
+      }
+      config false;
+      description
+        "Type of Public Land Mobile Network (PLMN).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PLMNType";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      config false;
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PLMNID";
+    }
+    leaf-list equiv-plmnid {
+      type string {
+        length "0..6";
+      }
+      config false;
+      max-elements "64";
+      description
+        "{{list}} Each item is a PLMNID. PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of the PLMNID is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.EquivPLMNID";
+    }
+    leaf sac {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Service Area Code (SAC) {{bibref|3GPP-TS.23.003}}. The concatenation of PLMN ID (MCC+MNC), LAC, and SAC uniquely identifies the Service Area ID (SAI).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.SAC";
+    }
+    leaf broadcast-sac {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Service Area Code (SAC) for broadcast. The format of this parameter is the same with {{param|SAC}}, and it uniquely identifies the Service Area ID (SAI) for Earthquake and Tsunami Warning Services (ETWS) {{bibref|3GPP-TS.25.469|Section 9.1.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.BroadcastSAC";
+    }
+    leaf-list lacrac {
+      type string;
+      config false;
+      max-elements "256";
+      description
+        "{{list}} Each item is a LAC/RAC combination expressed in the following format: :<LAC or LACrange>':'<RAC or RACrange> Where LAC and RAC are single values, while LACrange and RACrange are inclusive and can be expressed in the following format: :<Start-value>\"..\"<End-value> Location Area Code (LAC) consists of up to 5 numerical characters. The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}. Routing Area Code (RAC) consists of up to 3 numerical characters. The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}. The FAP is to select one LAC and RAC from the combination(s) expressed in this parameter for use in {{param|LACInUse}} and {{param|RACInUse}} respectively. If a LAC occurs more than once in the list, this shall not increase the chance that it is selected over other LAC values in the list. The following are examples of the valid LACRAC combination formats: :\"64000:210\" ::(one list item with single value for LAC and RAC) :\"64000..64100:210, 64101:211\" ::(two list items, first item has a LAC range) :\"64000:210..214, 64001:215..219\" ::(two list items, both items have a RAC range for a specific LAC value) :\"64000..64100:210..214\" ::(one list item both have a LAC range and a RAC range)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.LACRAC";
+    }
+    leaf lac-in-use {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "The LAC being used by the FAP. Self-configuration for LAC is controlled by {{param|.Capabilities.UMTS.SelfConfig.LACRACURAConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.LACRACURASelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|LACRAC}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first LAC value in {{param|LACRAC}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.LACInUse";
+    }
+    leaf rac-in-use {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "The RAC being used by the FAP. Self-configuration for RAC is controlled by {{param|.Capabilities.UMTS.SelfConfig.LACRACURAConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.LACRACURASelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|LACRAC}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first RAC value in {{param|LACRAC}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.RACInUse";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.";
+  }
+
+  grouping umts-cn-cs-domain-g {
+    description
+      "This object contains parameters relating to configuring the CS domain of the UMTS CN.";
+    leaf t3212 {
+      type uint32 {
+        range "0..91800";
+      }
+      units "seconds";
+      config false;
+      description
+        "T3212 timeout value specified in {{units}} {{bibref|3GPP-TS.24.008|section 10.5.1.12.2}}. The values are implemented by steps of 360 {{units}}, which aligns with values in decihours in {{bibref|3GPP-TS.24.008}}. The value of 0 is used for infinite timeout value i.e. periodic updating shall not be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.CSDomain.T3212";
+    }
+    leaf imsi-attach-detach-enable {
+      type boolean;
+      config false;
+      description
+        "Indicates the UE behavior regarding IMSI attach/detach procedure to the CN {{bibref|3GPP-TS.24.008}}. If {{true}} UE SHALL apply IMSI attach and detach procedure If {{false}} UE SHALL NOT apply IMSI attach and detach procedure";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.CSDomain.IMSIAttachDetachEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.CSDomain.";
+  }
+
+  grouping umts-cn-ps-domain-g {
+    description
+      "This object contains parameters relating to configuring the PS domain of the UMTS CN.";
+    leaf network-mode-operation-combined {
+      type boolean;
+      config false;
+      description
+        "Network Mode of Operation of the CN. {{bibref|3GPP-TS.23.060}} {{bibref|3GPP-TS.24.008}} If {{true}} (Network Mode of Operation II) Combined procedures between CS and PS domain are not supported (i.e. Gs interface is not present). If {{false}} (Network Mode of Operation I) Combined procedures between CS and PS domain are supported (i.e. Gs interface is present).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PSDomain.NetworkModeOperationCombined";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.CN.PSDomain.";
+  }
+
+  grouping umts-ran-g {
+    description
+      "This object contains parameters relating to the RAN-level configuration.";
+    leaf-list ura-list {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      min-elements 1;
+      max-elements "50";
+      description
+        "{{list}} Each item is a URA (UTRAN Registration Area) to which the FAP belongs. The order of the URA values has no significance. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.URAList";
+    }
+    leaf ura-in-use {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "The URA being used by the FAP. Self-configuration for URA is controlled by {{param|.Capabilities.UMTS.SelfConfig.LACRACURAConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.LACRACURASelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for URA is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|URAList}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first URA value in {{param|URAList}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.URAInUse";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "RNC-ID allocated to the FAP. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RNCID";
+    }
+    leaf cell-id {
+      type uint32 {
+        range "0..268435455";
+      }
+      config false;
+      description
+        "Cell Identity. {{bibref|3GPP-TS.25.401|Section 6.1.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellID";
+    }
+    leaf t-rat-c {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Guard period in {{units}} before sending a \"RANAP:RESET ACKNOWLEDGE\" message towards the Femto GW. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TRatC";
+    }
+    leaf t-raf-c {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Maximum amount of time in {{units}} that the FAP SHOULD wait for receiving a \"RANAP:RESET ACKNOWLEDGE\" message from the Femto GW after sending a Reset to the Femto GW. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TRafC";
+    }
+    leaf n-raf-c {
+      type uint64 {
+        range "1..max";
+      }
+      config false;
+      description
+        "Maximum number for RESET procedure that can be repeated in FAP. {{bibref|3GPP-TS.25.413|Section 8.26.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NRafC";
+    }
+    leaf tig-or {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Amount of time in {{units}} used to determine when the additional level of traffic reduction in CN overload SHOULD take place. While this timer is running all OVERLOAD messages or signalling pointing to congested information received by the FAP are ignored. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TigOR";
+    }
+    leaf tin-tr {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Amount of time in {{units}} used to determine when the CN overload can be considered cleared. While this timer is running, the FAP is not allowed to increase traffic. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TinTR";
+    }
+    leaf t-data-fwd {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Maximum amount of time in {{units}} for Data Forwarding at FAP. Timer is started when a \"RANAP:SRNS Data Forward Command\" message (or a \"RANAP:Relocation Command\" message) is received. At timer expiry the \"SRNS Data Forwarding\" procedure is completed. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TDataFwd";
+    }
+    leaf t-reloc-prep {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Maximum amount of time in {{units}} for the Relocation Preparation procedure. Timer is started when a \"RANAP:Relocation Required\" message is sent. Timer is stopped when a \"RANAP:Relocation Command\" or a \"RANAP:Relocation Preparation Failure\" message is received. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TRelocPrep";
+    }
+    leaf t-reloc-overall {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Maximum amount of time in {{units}} for protection of the overall Relocation procedure. Timer is started when a \"RANAP:Relocation Command\" message is received. Timer is stopped when a \"RANAP:Iu Release Command\" is received or the relocation procedure is cancelled. {{bibref|3GPP-TS.25.413|Section 9.5}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.TRelocOverall";
+    }
+    leaf hnbid-realm {
+      type string {
+        length "0..182";
+      }
+      config false;
+      description
+        "The \"realm\" portion of the HNB-ID where HNB-ID is defined in {{bibref|3GPP-TS.25.469}} and is shown as follows: 0<IMSI>@<realm> Or 1<OUI>-<SerialNumber>@<realm> The other identifiers before \"@\" are device dependent values. Both <OUI> and <SerialNumber> are defined in {{bibref|TR-069a2|Table 36}}. <IMSI> is obtained from the USIM if it is equipped in the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.HNBIDRealm";
+    }
+    leaf hs-flag {
+      type boolean;
+      config false;
+      description
+        "Enables/disables the HSDPA function in the FAP. If {{true}} HSDPA is enabled (this is equivalent to a \"1\" in {{bibref|3GPP-TS.32.642|Section 6.3.9}}) If {{false}} HSDPA is disabled (this is equivalent to a \"0\" in {{bibref|3GPP-TS.32.642|Section 6.3.9}})";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.HSFlag";
+    }
+    leaf hs-enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables HSDPA in the cell. If {{true}} HSDPA is enabled (this is equivalent to a \"1\" in {{bibref|3GPP-TS.32.642|Section 6.3.9}}) If {{false}} HSDPA is not enabled (this is equivalent to a \"0\" in {{bibref|3GPP-TS.32.642|Section 6.3.9}}) If {{param|HSFlag}} is {{false}} then this value MUST be {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.HSEnable";
+    }
+    leaf num-of-hspdsc-hs {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "The number of codes at the defined spreading factor (SF=16), within the complete code tree. {{bibref|3GPP-TS.32.642|Section 6.3.9}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NumOfHSPDSCHs";
+    }
+    leaf num-of-hsscc-hs {
+      type uint64;
+      config false;
+      description
+        "The number of HS-SCCHs for one cell. {{bibref|3GPP-TS.32.642|Section 6.3.9}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NumOfHSSCCHs";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.";
+  }
+
+  grouping umts-ran-csg-g {
+    description
+      "This object contains parameters relating to the Closed Subscriber Group (CSG).";
+    leaf csg-indicator {
+      type boolean;
+      description
+        "The CSG-indicator Information Element (IE) in the Master Information Block reflects the access mode of the CSG cell. It is hence dependent on the value of {{param|.AccessMgmt.UMTS.AccessMode}}. If {{true}} the CSG-indicator IE is present, reflecting access to the CSG cell is closed. If {{false}} the CSG-indicator IE is absent, reflecting access to the CSG cell is not closed. {{bibref|3GPP-TS.25.331|Section 10.2.48.8.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGIndicator";
+    }
+    leaf-list uarfcndl-list {
+      type uint16 {
+        range "0..16383";
+      }
+      config false;
+      max-elements "128";
+      description
+        "{{list}} Each item is a UTRA Absolute Radio Frequency Channel Number (UARFCN) in the DL direction dedicated to the CSG cells. {{param}} is broadcast in SIB 11bis {{bibref|3GPP-TS.25.331|Section 10.2.48.8.14a}}. The corresponding UTRA Absolute Radio Frequency Channel Number (UARFCN) in the UL direction is derived based on the fixed offset applicable for the frequency band.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.UARFCNDLList";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.";
+  }
+
+  grouping umts-ran-csg-csgpsc-split-info-g {
+    description
+      "This object contains parameters relating to the Primary Scrambling Code (PSC) split information for the CSG. Defined in SIB3/11bis {{bibref|3GPP-TS.25.331|Section 10.3.2.8 and 10.3.2.9}}.";
+    leaf start-psc-range1-coefficient {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "The value of this Information Element (IE) multiplied by 8 specifies the start PSC value of the first PSC range as specified in {{bibref|3GPP-TS.25.331|Section 8.6.2.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.StartPSCRange1Coefficient";
+    }
+    leaf number-of-ps-cs {
+      type enumeration {
+        enum "5" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 5";
+        }
+        enum "10" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 10";
+        }
+        enum "15" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 15";
+        }
+        enum "20" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 20";
+        }
+        enum "30" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 30";
+        }
+        enum "40" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 40";
+        }
+        enum "50" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 50";
+        }
+        enum "64" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 64";
+        }
+        enum "80" {
+          value 9;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 80";
+        }
+        enum "120" {
+          value 10;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 120";
+        }
+        enum "160" {
+          value 11;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 160";
+        }
+        enum "256" {
+          value 12;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - 256";
+        }
+        enum "alltherest" {
+          value 13;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - alltherest";
+        }
+        enum "spare3" {
+          value 14;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - spare3";
+        }
+        enum "spare2" {
+          value 15;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - spare2";
+        }
+        enum "spare1" {
+          value 16;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs - spare1";
+        }
+      }
+      config false;
+      description
+        "This Information Element (IE) specifies the number of PSCs reserved for CSG cells in each PSC range.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.NumberOfPSCs";
+    }
+    leaf psc-range2-offset {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "If this Information Element (IE) is included, the UE shall calculate the second PSC range as specified in {{bibref|3GPP-TS.25.331|Section 8.6.2.4}}. If this Information Element (IE) is not included, the UE shall consider the second PSC range to be not present.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.PSCRange2Offset";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CSG.CSGPSCSplitInfo.";
+  }
+
+  grouping umts-ran-cell-selection-g {
+    description
+      "This object contains parameters related to cell selection and reselection.";
+    leaf quality-measure-cpich {
+      type enumeration {
+        enum "ec/no" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QualityMeasureCPICH - Ec/No";
+        }
+        enum "rscp" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QualityMeasureCPICH - RSCP";
+        }
+      }
+      config false;
+      description
+        "Which mechanism to use when doing CPICH quality measurements. {{bibref|3GPP-TS.25.331|Section 10.3.7.47}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QualityMeasureCPICH";
+    }
+    leaf qqual-min {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Minimum required quality measure, specified in {{units}}. {{bibref|3GPP-TS.25.331|Section 10.3.2.3 and Section 10.3.2.4}} This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|Ec/No|QualityMeasureCPICH}} and it MUST otherwise be ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QqualMin";
+    }
+    leaf qqual-min-offset {
+      type uint8 {
+        range "1..16";
+      }
+      units "dB";
+      default "1";
+      config false;
+      description
+        "Offset for {{param|QqualMin}} specified in {{units}}. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|Ec/No|QualityMeasureCPICH}} and it MUST otherwise be ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QqualMinOffset";
+    }
+    leaf q-rx-lev-min {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Minimum required RX level in the cell, specified in {{units}}. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} Only odd values are valid, use of an even value MUST be rejected by the CPE. This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|RSCP|QualityMeasureCPICH}} and it MUST otherwise be ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QRxLevMin";
+    }
+    leaf delta-q-rx-lev-min {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Delta for the minimum required RX level in the cell, specified in {{units}}. {{bibref|3GPP-TS.25.331|Section 10.3.2.3 and Section 10.3.2.4}} The actual value of {{param|QRxLevMin}} = {{param|QRxLevMin}} + {{param}} This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|RSCP|QualityMeasureCPICH}} and it MUST otherwise be ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.DeltaQRxLevMin";
+    }
+    leaf q-rx-lev-min-offset {
+      type uint8 {
+        range "2 | 4 | 6 | 8 | 10 | 12 | 14 | 16";
+      }
+      units "dB";
+      default "2";
+      config false;
+      description
+        "Offset for {{param|QRxLevMin}}, specified in {{units}}. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|RSCP|QualityMeasureCPICH}} and it MUST otherwise be ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QRxLevMinOffset";
+    }
+    leaf q-hyst1s {
+      type uint8 {
+        range "0..40";
+      }
+      config false;
+      description
+        "GSM and FDD Cell reselection hysteresis 1. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} Only even values are valid, use of an odd value MUST be rejected by the CPE.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QHyst1s";
+    }
+    leaf q-hyst2s {
+      type uint8 {
+        range "0..40";
+      }
+      config false;
+      description
+        "FDD Cell reselection hysteresis 2. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} Only even values are valid, use of an odd value MUST be rejected by the CPE. This value is only meaningful if {{param|QualityMeasureCPICH}} has the value {{enum|Ec/No|QualityMeasureCPICH}} and it MUST otherwise be ignored. By default when {{param|QHyst1s}} is set and {{param}} is not, then the value for {{param}} SHOULD match the value of {{param|QHyst1s}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QHyst2s";
+    }
+    leaf t-reselections {
+      type uint8 {
+        range "0..31";
+      }
+      units "seconds";
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. A UE triggers the reselection of a new cell if the cell reselection criteria are fulfilled during the time interval in {{units}}. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TReselections";
+    }
+    leaf s-intrasearch {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the threshold for intra-frequency measurements, and for the HCS measurement rules. Only even values are valid, use of an odd value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SIntrasearch";
+    }
+    leaf s-intersearch {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the threshold for inter-frequency measurements, and for the HCS measurement rules. Only even values are valid, use of an odd value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SIntersearch";
+    }
+    leaf s-search-hcs {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the threshold for intrafrequency and interfrequency measurement rules in HCS. Below this limit in the serving cell, the UE initiates measurements of all intrafrequency and interfrequency neighbouring cells of the serving cell. Only odd values are valid, use of an even value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SSearchHCS";
+    }
+    leaf s-search-rat {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the RAT (GSM) specific threshold for inter-RAT measurement rules. Only even values are valid, use of an odd value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SSearchRAT";
+    }
+    leaf shcsrat {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the RAT (GSM) specific threshold for inter-RAT measurement rules in HCS. Only odd values are valid, use of an even value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SHCSRAT";
+    }
+    leaf s-limit-search-rat {
+      type int64;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the threshold for skipping inter-RAT measurement rules in HCS. Above this RAT (GSM) specific threshold in the serving UTRA cell, the UE does not need to perform any inter-RAT measurements. Only even values are valid, use of an odd value MUST be rejected by the CPE. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.SLimitSearchRAT";
+    }
+    leaf non-hcstcr-max {
+      type enumeration {
+        enum "not used" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - not used";
+        }
+        enum "30" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - 30";
+        }
+        enum "60" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - 60";
+        }
+        enum "120" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - 120";
+        }
+        enum "180" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - 180";
+        }
+        enum "240" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax - 240";
+        }
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the duration in seconds for evaluating the allowed amount of cell reselections. If the number of cell reselections during the time period defined by {{param}} exceeds {{param|NonHCSNCR}}, high mobility has been detected. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMax";
+    }
+    leaf non-hcsncr {
+      type uint8 {
+        range "1..16";
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the maximum number of cell reselections. If the number of cell reselections during the {{param|NonHCSTCRMax}} time period exceeds the value of {{param}}, high mobility has been detected. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSNCR";
+    }
+    leaf non-hcstcr-max-hyst {
+      type enumeration {
+        enum "not used" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - not used";
+        }
+        enum "10" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 10";
+        }
+        enum "20" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 20";
+        }
+        enum "30" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 30";
+        }
+        enum "40" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 40";
+        }
+        enum "50" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 50";
+        }
+        enum "60" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 60";
+        }
+        enum "70" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst - 70";
+        }
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the cell reselection hysteresis for reverting from UE high-mobility measurements. The additional time period in seconds before UE reverts to low-mobility measurements. When the number of cell reselections during the time period defined by {{param|TCRMax}} no longer exceeds {{param|NCR}}, UE continues measurements during the time period defined by {{param|TCRMaxHyst}}. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.2.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NonHCSTCRMaxHyst";
+    }
+    leaf qhcs {
+      type uint8 {
+        range "0..99";
+      }
+      default "0";
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the quality threshold levels for applying prioritised hierarchical cell reselection. {{bibref|3GPP-TS.25.331|Section 10.3.7.12 and Section 10.3.7.54a}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.QHCS";
+    }
+    leaf use-of-hcs {
+      type boolean;
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Indicate whether HCS is used in this cell or not. {{bibref|3GPP-TS.25.331|Section 10.3.7.47}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.UseOfHCS";
+    }
+    leaf hcs-prio {
+      type uint8 {
+        range "0..7";
+      }
+      default "0";
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the HCS priority of this cell. {{bibref|3GPP-TS.25.331|Section 10.3.7.12}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.HCSPrio";
+    }
+    leaf tcr-max {
+      type enumeration {
+        enum "not used" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - not used";
+        }
+        enum "30" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - 30";
+        }
+        enum "60" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - 60";
+        }
+        enum "120" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - 120";
+        }
+        enum "180" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - 180";
+        }
+        enum "240" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax - 240";
+        }
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the duration in seconds for evaluating the allowed amount of cell reselections. If the number of cell reselections during the time period defined by {{param}} exceeds {{param|NCR}}, high mobility has been detected. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.7.12}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMax";
+    }
+    leaf ncr {
+      type uint8 {
+        range "1..16";
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the maximum number of cell reselections. If the number of cell reselections during the {{param|TCRMax}} time period exceeds the value of {{param}}, high mobility has been detected. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.7.12}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.NCR";
+    }
+    leaf tcr-max-hyst {
+      type enumeration {
+        enum "not used" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - not used";
+        }
+        enum "10" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 10";
+        }
+        enum "20" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 20";
+        }
+        enum "30" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 30";
+        }
+        enum "40" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 40";
+        }
+        enum "50" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 50";
+        }
+        enum "60" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 60";
+        }
+        enum "70" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst - 70";
+        }
+      }
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the cell reselection hysteresis for reverting from UE high-mobility measurements. The additional time period in seconds before UE reverts to low-mobility measurements. When the number of cell reselections during the time period defined by {{param|TCRMax}} no longer exceeds {{param|NCR}}, UE continues measurements during the time period defined by {{param}}. Parameter defined in SIB3 {{bibref|3GPP-TS.25.331|Section 10.3.7.12}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.TCRMaxHyst";
+    }
+    leaf ue-tx-pwr-max-rach {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "A member of the set of parameters used for cell reselection functionality. Defines the maximum transmit power level, specified in {{units}}, that an UE MAY use when accessing the cell on RACH. Used to calculate Pcompensation, which is: max(UE_TXPWR_MAX_RACH - P_MAX, 0), where UE_TXPWR_MAX_RACH is {{param}} and P_MAX is the max transmit power for a UE. {{bibref|3GPP-TS.25.331|Section 10.3.2.3}} {{bibref|3GPP-TS.25.304|Section 5.2.3}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.UETxPwrMaxRACH";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellSelection.";
+  }
+
+  grouping umts-ran-rrc-timers-g {
+    description
+      "This object contains parameters related to miscellaneous RRC timers and constants.";
+    leaf t300 {
+      type uint16 {
+        range "100..8000";
+      }
+      units "milliseconds";
+      default "1000";
+      config false;
+      description
+        "Timer measured in {{units}}. Only the following values are considered valid: :100, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000, 3000, 4000, 6000, and 8000 Any value other than those and the CPE MUST reject the request. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T300";
+    }
+    leaf t301 {
+      type uint16 {
+        range "100..8000";
+      }
+      units "milliseconds";
+      default "2000";
+      config false;
+      description
+        "Timer measured in {{units}}. Only the following values are considered valid: :100, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000, 3000, 4000, 6000, and 8000 Any value other than those and the CPE MUST reject the request. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T301";
+    }
+    leaf t302 {
+      type uint16 {
+        range "100..8000";
+      }
+      units "milliseconds";
+      default "4000";
+      config false;
+      description
+        "Timer measured in {{units}}. Only the following values are considered valid: :100, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000, 3000, 4000, 6000, and 8000 Any value other than those and the CPE MUST reject the request. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T302";
+    }
+    leaf t304 {
+      type uint16 {
+        range "100 | 200 | 400 | 1000 | 2000";
+      }
+      units "milliseconds";
+      default "2000";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T304";
+    }
+    leaf t305 {
+      type int64;
+      units "minutes";
+      default "30";
+      config false;
+      description
+        "Timer measured in {{units}}. -1 indicates an unbounded timer in which there is no update. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T305";
+    }
+    leaf t307 {
+      type uint8 {
+        range "5 | 10 | 15 | 20 | 30 | 40 | 50";
+      }
+      units "seconds";
+      default "30";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T307";
+    }
+    leaf t308 {
+      type uint16 {
+        range "40 | 80 | 160 | 320";
+      }
+      units "milliseconds";
+      default "160";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T308";
+    }
+    leaf t309 {
+      type uint8 {
+        range "1..8";
+      }
+      units "seconds";
+      default "5";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T309";
+    }
+    leaf t310 {
+      type uint16 {
+        range "40 | 80 | 120 | 160 | 200 | 240 | 280 | 320";
+      }
+      units "milliseconds";
+      default "160";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T310";
+    }
+    leaf t311 {
+      type uint16 {
+        range "250 | 500 | 750 | 1000 | 1250 | 1500 | 1750 | 2000";
+      }
+      units "milliseconds";
+      default "2000";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T311";
+    }
+    leaf t312 {
+      type uint8 {
+        range "0..15";
+      }
+      units "seconds";
+      default "1";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T312";
+    }
+    leaf t313 {
+      type uint8 {
+        range "0..15";
+      }
+      units "seconds";
+      default "3";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T313";
+    }
+    leaf t314 {
+      type uint8 {
+        range "0 | 2 | 4 | 6 | 8 | 12 | 16 | 20";
+      }
+      units "seconds";
+      default "12";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T314";
+    }
+    leaf t315 {
+      type uint16 {
+        range "0 | 10 | 30 | 60 | 180 | 600 | 1200 | 1800";
+      }
+      units "seconds";
+      default "180";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T315";
+    }
+    leaf t316 {
+      type int64;
+      units "seconds";
+      default "30";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}. -1 indicates an unbounded timer in which there is no update.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T316";
+    }
+    leaf t317 {
+      type uint16 {
+        range "0 | 10 | 30 | 60 | 180 | 600 | 1200 | 1800";
+      }
+      units "seconds";
+      config false;
+      description
+        "Timer measured in {{units}}. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.T317";
+    }
+    leaf n300 {
+      type uint8 {
+        range "0..7";
+      }
+      default "3";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N300";
+    }
+    leaf n301 {
+      type uint8 {
+        range "0..7";
+      }
+      default "2";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N301";
+    }
+    leaf n302 {
+      type uint8 {
+        range "0..7";
+      }
+      default "3";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N302";
+    }
+    leaf n304 {
+      type uint8 {
+        range "0..7";
+      }
+      default "2";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N304";
+    }
+    leaf n310 {
+      type uint8 {
+        range "0..7";
+      }
+      default "4";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N310";
+    }
+    leaf n312 {
+      type uint16 {
+        range "1..1000";
+      }
+      default "1";
+      config false;
+      description
+        "Counter. Only the following values are considered valid: 1, 2, 4, 10, 20, 50, 100, 200, 400, 600, 800, and 1000. Any value other than those and the CPE MUST reject the request. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.44}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N312";
+    }
+    leaf n313 {
+      type uint8 {
+        range "1 | 2 | 4 | 10 | 20 | 50 | 100 | 200";
+      }
+      default "20";
+      config false;
+      description
+        "Counter. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N313";
+    }
+    leaf n315 {
+      type uint16 {
+        range "1..1000";
+      }
+      default "1";
+      config false;
+      description
+        "Counter. Only the following values are considered valid: :1, 2, 4, 10, 20, 50, 100, 200, 400, 600, 800, and 1000. Any value other than those and the CPE MUST reject the request. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 13.1 and Section 10.3.3.43}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.N315";
+    }
+    leaf wait-time {
+      type uint8 {
+        range "0..15";
+      }
+      units "seconds";
+      config false;
+      description
+        "Time period the UE has to wait before repeating the rejected procedure. This is an IE used when sending RRC connection reject, redirecting the requesting UE to another frequency. 0 indicates that repetition is not allowed. {{bibref|3GPP-TS.25.331|Section 10.3.3.50}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.WaitTime";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RRCTimers.";
+  }
+
+  grouping umts-ran-drx-g {
+    description
+      "This object contains parameters related to DRX parameters.";
+    leaf drx-cycle-length-coefficient-cs {
+      type uint8 {
+        range "6..9";
+      }
+      config false;
+      description
+        "Defines the DRX cycle length coefficient for CS domain to optimize paging in idle mode. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 10.3.3.6}}. {{param}} refers to 'k' in the formula as specified in {{bibref|3GPP-TS.25.304}}, Discontinuous reception. Used by the CN CS domain to count paging occasions for discontinuous reception in Idle Mode. The duration of the DRX cycle is 2 <power> k frames, where 'k' is the used DRX cycle length coefficient for CN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.DRX.DRXCycleLengthCoefficientCS";
+    }
+    leaf drx-cycle-length-coefficient-ps {
+      type uint8 {
+        range "6..9";
+      }
+      config false;
+      description
+        "Defines the DRX cycle length coefficient for PS domain to optimize paging in idle mode. Defined in SIB1 {{bibref|3GPP-TS.25.331|Section 10.3.3.6}}. {{param}} refers to 'k' in the formula as specified in {{bibref|3GPP-TS.25.304}}, Discontinuous reception. Used by the CN PS domain to count paging occasions for discontinuous reception in Idle Mode. The duration of the DRX cycle is 2 <power> k frames, where 'k' is the used DRX cycle length coefficient for CN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.DRX.DRXCycleLengthCoefficientPS";
+    }
+    leaf utrandrx-cycle-length-coefficient {
+      type uint8 {
+        range "3..9";
+      }
+      config false;
+      description
+        "Defines the DRX cycle length used by UTRAN to count paging occasions for discontinuous reception in Connected Mode. The duration of the DRX cycle is 2 <power> k frames, where 'k' is the used DRX cycle length coefficient for UTRAN. {{param}} SHOULD be used by the UTRAN/FAP for UEs in Cell_PCH/Cell_FACH state. {{bibref|3GPP-TS.25.331|Section 10.3.3.49}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.DRX.UTRANDRXCycleLengthCoefficient";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.DRX.";
+  }
+
+  grouping umts-ran-power-control-g {
+    description
+      "This object contains parameters related to power control and RACH.";
+    leaf constant-value {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Used by the UE to calculate the initial output power, specified in {{units}}, on PRACH according to the open loop power control procedure. Parameter in SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.11}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.ConstantValue";
+    }
+    leaf power-ramp-step-up {
+      type uint8 {
+        range "1..8";
+      }
+      units "dB";
+      config false;
+      description
+        "Used for the Uplink Common Channel. Defines the Power ramp setup, specified in {{units}}, on PRACH preamble when no acquisition indicator (AI) is detected by the UE. Parameter in SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.54}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.PowerRampStepUp";
+    }
+    leaf preamble-retrans-max {
+      type uint8 {
+        range "1..64";
+      }
+      config false;
+      description
+        "Used for the Uplink Common Channel. Defines the maximum number of preambles allowed in one preamble ramping cycle. PRACH Preamble Retrans Max is part of \"PRACH power offset\" which is part of \"PRACH system information list\". Parameter in SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.54}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.PreambleRetransMax";
+    }
+    leaf persistence-scale-factor {
+      type uint8 {
+        range "2..9";
+      }
+      config false;
+      description
+        "Persistence Scaling Factor for overload control. Parameter in SIB5. The value is the scaling factor multiplied by 10, e.g. 2 is a scaling factor of 0.2";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.PersistenceScaleFactor";
+    }
+    leaf m-max {
+      type uint8 {
+        range "1..32";
+      }
+      config false;
+      description
+        "Maximum number of RACH preamble cycles. Defines how many times the PRACH preamble ramping procedure can be repeated before UE MAC reports a failure on RACH transmission to higher layers. Maximum number of RACH preamble cycles is part of \"RACH transmission parameters\" which is part of \"PRACH system information list\" which is part of SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.67}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.MMax";
+    }
+    leaf nb01-min {
+      type uint8 {
+        range "0..50";
+      }
+      config false;
+      description
+        "RACH random back-off lower bound. {{param}} is the lower bound of the waiting time in 10 millisecond increments (i.e. 1 corresponds to 10 ms and 50 corresponds to 500 ms). {{param}} is part of \"RACH transmission parameters\" which is part of \"PRACH system information list\" which is part of SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.67}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.NB01Min";
+    }
+    leaf nb01-max {
+      type uint8 {
+        range "0..50";
+      }
+      config false;
+      description
+        "RACH random back-off upper bound. {{param}} is the Upper bound of the waiting time in 10 millisecond increments (i.e. 1 corresponds to 10 ms and 50 corresponds to 500 ms). {{param}} is part of \"RACH transmission parameters\" which is part of \"PRACH system information list\" which is part of SIB5. {{bibref|3GPP-TS.25.331|Section 10.3.6.67}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.NB01Max";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.PowerControl.";
+  }
+
+  grouping umts-ran-cell-restriction-g {
+    description
+      "This object contains parameters related to cell access restriction.";
+    leaf cell-barred {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP is barred from service or not. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.CellBarred";
+    }
+    leaf intra-freq-cell-reselection-indicator {
+      type boolean;
+      config false;
+      description
+        "When {{param|CellBarred}} is {{true}}, this indicates whether the intra-frequency cell re-selection is allowed or not. {{param}} has no meaning if {{param|CellBarred}} is {{false}} and MUST be ignored in such cases. {{true}} means that intra-frequency cell re-selection is allowed. {{false}} means that intra-frequency cell re-selection is not allowed. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.IntraFreqCellReselectionIndicator";
+    }
+    leaf t-barred {
+      type uint16 {
+        range "10 | 20 | 40 | 80 | 160 | 320 | 640 | 1280";
+      }
+      units "seconds";
+      config false;
+      description
+        "The time period in {{units}} during which the UE is barred from accessing the FAP. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.TBarred";
+    }
+    leaf-list access-class-barred-list-cs {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "{{list}} Each entry is an Access Class that is barred from CS service. The order of the list has no significance. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.AccessClassBarredListCS";
+    }
+    leaf-list access-class-barred-list-ps {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "{{list}} Each entry is an Access Class that is barred from PS service. The order of the list has no significance. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.AccessClassBarredListPS";
+    }
+    leaf cell-reserved-for-operator-use {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the FAP is reserved for operator use or not. {{bibref|3GPP-TS.25.331|Section 10.3.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.CellReservedForOperatorUse";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.CellRestriction.";
+  }
+
+  grouping umts-ran-intra-freq-meas-g {
+    description
+      "This object contains parameters relating to the intra-freq HO control parameters.";
+    leaf measurement-quantity {
+      type enumeration {
+        enum "cpich ec/no" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.MeasurementQuantity - CPICH Ec/No";
+        }
+        enum "cpich rscp" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.MeasurementQuantity - CPICH RSCP";
+        }
+        enum "pathloss" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.MeasurementQuantity - Pathloss";
+        }
+      }
+      config false;
+      description
+        "Defines the measurement quantity for intra-freq HO measurement when the UE is in Cell-DCH state. Enumeration of: {{enum}} {{bibref|3GPP-TS.25.331|Section 10.3.7.38}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.MeasurementQuantity";
+    }
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the equivalent time constant of the low pass filter applied to the CPICH quality measurements, or {{enum|CPICH Ec/No|MeasurementQuantity}}. {{bibref|3GPP-TS.25.331|Section 8.6.7.2 and Section 10.3.7.9}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.FilterCoefficient";
+    }
+    leaf-list intra-frequency-event-identity {
+      type string;
+      config false;
+      max-elements "32";
+      description
+        "{{list}} Each entry is an Event ID from the list of: 1a, 1b, 1c, 1d, 1e, 1f, 1g, 1h, 1i Defines the identity of the event used to trigger UE reporting (in case of event-triggered reporting). {{bibref|3GPP-TS.25.331|Section 10.3.7.34}} Since the FAP can determine this on its own, it might not be necessary to configure it.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.IntraFrequencyEventIdentity";
+    }
+    leaf-list triggering-condition2-event1a {
+      type enumeration {
+        enum "active" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a - Active";
+        }
+        enum "monitored" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a - Monitored";
+        }
+        enum "active and monitored" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a - Active and Monitored";
+        }
+        enum "detected" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a - Detected";
+        }
+        enum "detected and monitored" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a - Detected and Monitored";
+        }
+      }
+      config false;
+      description
+        "{{list}} Indicates which cells can trigger Event 1a. {{enum}} {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1a";
+    }
+    leaf-list triggering-condition1-event1b {
+      type enumeration {
+        enum "active" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1b - Active";
+        }
+        enum "monitored" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1b - Monitored";
+        }
+        enum "active and monitored" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1b - Active and Monitored";
+        }
+      }
+      config false;
+      description
+        "{{list}} Indicates which cells can trigger Event 1b. {{enum}} {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1b";
+    }
+    leaf-list triggering-condition2-event1e {
+      type enumeration {
+        enum "active" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e - Active";
+        }
+        enum "monitored" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e - Monitored";
+        }
+        enum "active and monitored" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e - Active and Monitored";
+        }
+        enum "detected" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e - Detected";
+        }
+        enum "detected and monitored" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e - Detected and Monitored";
+        }
+      }
+      config false;
+      description
+        "{{list}} Indicates which cells can trigger Event 1e. {{enum}} {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition2Event1e";
+    }
+    leaf-list triggering-condition1-event1f {
+      type enumeration {
+        enum "active" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1f - Active";
+        }
+        enum "monitored" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1f - Monitored";
+        }
+        enum "active and monitored" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1f - Active and Monitored";
+        }
+      }
+      config false;
+      description
+        "{{list}} Indicates which cells can trigger Event 1f. {{enum}} {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TriggeringCondition1Event1f";
+    }
+    leaf reporting-range-event1a {
+      type uint8 {
+        range "0..29";
+      }
+      units "dB";
+      config false;
+      description
+        "Defines a constant in the inequality criterion that needs to be satisfied for an Event 1a to occur. Actual values of the range are 0.0 to 14.5 {{units}} in steps of 0.5 {{units}}. The value of {{param}} divided by 2 yields the actual value of the range. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingRangeEvent1a";
+    }
+    leaf reporting-range-event1b {
+      type uint8 {
+        range "0..29";
+      }
+      units "dB";
+      config false;
+      description
+        "Defines a constant in the inequality criterion that needs to be satisfied for an Event 1b to occur. Actual values of the range are 0.0 to 14.5 {{units}} in steps of 0.5 {{units}}. The value of {{param}} divided by 2 yields the actual value of the range. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingRangeEvent1b";
+    }
+    leaf weighting-factor-event1a {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.WeightingFactorEvent1a";
+    }
+    leaf weighting-factor-event1b {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.WeightingFactorEvent1b";
+    }
+    leaf report-deactivation-threshold-event1a {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Defines the maximum number of cells allowed in the \"active cell set\" for Event 1a to occur. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportDeactivationThresholdEvent1a";
+    }
+    leaf reporting-amount-event1a {
+      type int64;
+      config false;
+      description
+        "Defines the maximum number of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1a The value -1 is used to represent an unbounded maximum. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingAmountEvent1a";
+    }
+    leaf reporting-amount-event1c {
+      type int64;
+      config false;
+      description
+        "Defines the maximum number of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1c The value -1 is used to represent an unbounded maximum. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingAmountEvent1c";
+    }
+    leaf reporting-interval-event1a {
+      type uint16 {
+        range "0 | 250 | 500 | 1000 | 2000 | 4000 | 8000 | 16000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the transmission period in {{units}} of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1a. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingIntervalEvent1a";
+    }
+    leaf reporting-interval-event1c {
+      type uint16 {
+        range "0 | 250 | 500 | 1000 | 2000 | 4000 | 8000 | 16000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the transmission period in {{units}} of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1c. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReportingIntervalEvent1c";
+    }
+    leaf hysteresis-event1a {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1a";
+    }
+    leaf hysteresis-event1b {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1b";
+    }
+    leaf hysteresis-event1c {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1c";
+    }
+    leaf hysteresis-event1d {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1d";
+    }
+    leaf hysteresis-event1e {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1e";
+    }
+    leaf hysteresis-event1f {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.HysteresisEvent1f";
+    }
+    leaf time-to-trigger-event1a {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1a";
+    }
+    leaf time-to-trigger-event1b {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1b";
+    }
+    leaf time-to-trigger-event1c {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1c";
+    }
+    leaf time-to-trigger-event1d {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1d";
+    }
+    leaf time-to-trigger-event1e {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1e";
+    }
+    leaf time-to-trigger-event1f {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.TimeToTriggerEvent1f";
+    }
+    leaf threshold-used-frequency-event1e {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for intra-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB {{enum|Pathloss|MeasurementQuantity}} has a range of 30 dB to 165 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ThresholdUsedFrequencyEvent1e";
+    }
+    leaf threshold-used-frequency-event1f {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for intra-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB {{enum|Pathloss|MeasurementQuantity}} has a range of 30 dB to 165 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ThresholdUsedFrequencyEvent1f";
+    }
+    leaf replacement-activation-threshold-event1c {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Defines the minimum number of cells allowed in the \"active cell set\" for Event 1c to occur. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.ReplacementActivationThresholdEvent1c";
+    }
+    leaf instance-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.InstanceNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.";
+  }
+
+  grouping umts-ran-intra-freq-meas-instance-g {
+    description
+      "Table containing parameters relating to a particular instance of intra-freq events.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.Alias";
+    }
+    leaf intra-frequency-event-identity {
+      type enumeration {
+        enum "1a" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1a";
+        }
+        enum "1b" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1b";
+        }
+        enum "1c" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1c";
+        }
+        enum "1d" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1d";
+        }
+        enum "1e" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1e";
+        }
+        enum "1f" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 1f";
+        }
+      }
+      description
+        "Each entry is an Event ID from the list of: {{enum}} Defines the identity of the event used to trigger UE reporting (in case of event-triggered reporting). {{bibref|3GPP-TS.25.331|Section 10.3.7.34}} This attribute is readable, as it is highly dependent on how the FAP makes use of the event.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.IntraFrequencyEventIdentity";
+    }
+    leaf event-description {
+      type string {
+        length "0..256";
+      }
+      description
+        "A free-form description of the way the event instance is meant to be used. E.g. \"hand-out to macro cells\", \"addition of enterprise HNB cell to Active Set\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.EventDescription";
+    }
+    leaf measurement-quantity {
+      type enumeration {
+        enum "cpich ec/no" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.MeasurementQuantity - CPICH Ec/No";
+        }
+        enum "cpich rscp" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.MeasurementQuantity - CPICH RSCP";
+        }
+        enum "pathloss" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.MeasurementQuantity - Pathloss";
+        }
+      }
+      config false;
+      description
+        "Defines the measurement quantity for intra-freq HO measurement when the UE is in Cell-DCH state. Enumeration of: {{enum}} {{bibref|3GPP-TS.25.331|Section 10.3.7.38}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.MeasurementQuantity";
+    }
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the equivalent time constant of the low pass filter applied to the CPICH quality measurements, or {{enum|CPICH Ec/No|MeasurementQuantity}}. {{bibref|3GPP-TS.25.331|Section 8.6.7.2 and Section 10.3.7.9}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.FilterCoefficient";
+    }
+    leaf-list triggering-condition {
+      type enumeration {
+        enum "active" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition - Active";
+        }
+        enum "monitored" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition - Monitored";
+        }
+        enum "active and monitored" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition - Active and Monitored";
+        }
+        enum "detected" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition - Detected";
+        }
+        enum "detected and monitored" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition - Detected and Monitored";
+        }
+      }
+      config false;
+      description
+        "{{list}} Indicates which cells can trigger the event instance. {{enum}} {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TriggeringCondition";
+    }
+    leaf reporting-range {
+      type uint8 {
+        range "0..29";
+      }
+      units "dB";
+      config false;
+      description
+        "Applicable to events 1a, 1b, otherwise not needed. Defines a constant in the inequality criterion that needs to be satisfied for an Event 1b to occur. Actual values of the range are 0.0 to 14.5 {{units}} in steps of 0.5 {{units}}. The value of {{param}} divided by 2 yields the actual value of the range. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ReportingRange";
+    }
+    leaf weighting-factor {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Applicable to events 1a, 1b, otherwise not needed. Defines the weighting factor for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.WeightingFactor";
+    }
+    leaf report-deactivation-threshold {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Applicable to events 1a, otherwise not needed. Defines the maximum number of cells allowed in the \"active cell set\" for Event 1a to occur. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ReportDeactivationThreshold";
+    }
+    leaf reporting-amount {
+      type int64;
+      config false;
+      description
+        "Applicable to events 1a, 1c, otherwise not needed. Defines the maximum number of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1a The value -1 is used to represent an unbounded maximum. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ReportingAmount";
+    }
+    leaf reporting-interval {
+      type uint16 {
+        range "0 | 250 | 500 | 1000 | 2000 | 4000 | 8000 | 16000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Applicable to events 1a, 1c, otherwise not needed. Defines the transmission period in {{units}} of MEASUREMENT REPORT messages sent by the UE in case of periodic reporting triggered by an Event 1a. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ReportingInterval";
+    }
+    leaf hysteresis {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for intra-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 14.1.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.Hysteresis";
+    }
+    leaf time-to-trigger {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for intra-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.TimeToTrigger";
+    }
+    leaf threshold-used-frequency {
+      type int64;
+      config false;
+      description
+        "Applicable to events 1e, 1f, otherwise not needed. Defines the reporting threshold for intra-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.39}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB {{enum|Pathloss|MeasurementQuantity}} has a range of 30 dB to 165 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ThresholdUsedFrequency";
+    }
+    leaf replacement-activation-threshold {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Applicable only to event 1c Defines the minimum number of cells allowed in the \"active cell set\" for Event 1c to occur. {{bibref|3GPP-TS.25.331|Section 14.1.2 and Section 10.3.7.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.ReplacementActivationThreshold";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.IntraFreqMeas.Instance.{i}.";
+  }
+
+  grouping umts-ran-inter-freq-meas-g {
+    description
+      "This object contains parameters relating to the inter-freq HO related control parameters.";
+    leaf measurement-quantity {
+      type enumeration {
+        enum "cpich ec/no" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.MeasurementQuantity - CPICH Ec/No";
+        }
+        enum "cpich rscp" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.MeasurementQuantity - CPICH RSCP";
+        }
+      }
+      config false;
+      description
+        "Defines the measurement quantity for inter-freq HO measurement when the UE is in Cell-DCH state. Enumeration of: {{enum}} {{bibref|3GPP-TS.25.331|Section 10.3.7.18}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.MeasurementQuantity";
+    }
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the filter coefficient for inter-freq HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.9 and Section 10.3.7.18}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.FilterCoefficient";
+    }
+    leaf-list inter-frequency-event-identity {
+      type string;
+      config false;
+      max-elements "32";
+      description
+        "{{list}} Each entry is an Event ID from the list of: 2a, 2b, 2c, 2d, 2e,2f Defines the identity of the event used to trigger inter-frequency UE reporting (in case of event-triggered reporting). {{bibref|3GPP-TS.25.331|Section 10.3.7.14}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.InterFrequencyEventIdentity";
+    }
+    leaf weighting-factor-event2a {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.WeightingFactorEvent2a";
+    }
+    leaf weighting-factor-event2b {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.WeightingFactorEvent2b";
+    }
+    leaf weighting-factor-event2d {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.WeightingFactorEvent2d";
+    }
+    leaf weighting-factor-event2f {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.WeightingFactorEvent2f";
+    }
+    leaf hysteresis-event2a {
+      type uint8 {
+        range "0..29";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 14.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.HysteresisEvent2a";
+    }
+    leaf hysteresis-event2b {
+      type uint8 {
+        range "0..29";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 14.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.HysteresisEvent2b";
+    }
+    leaf hysteresis-event2d {
+      type uint8 {
+        range "0..29";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 14.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.HysteresisEvent2d";
+    }
+    leaf hysteresis-event2f {
+      type uint8 {
+        range "0..29";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 14.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.HysteresisEvent2f";
+    }
+    leaf time-to-trigger-event2a {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.19 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.TimeToTriggerEvent2a";
+    }
+    leaf time-to-trigger-event2b {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.19 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.TimeToTriggerEvent2b";
+    }
+    leaf time-to-trigger-event2d {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.19 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.TimeToTriggerEvent2d";
+    }
+    leaf time-to-trigger-event2f {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.19 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.TimeToTriggerEvent2f";
+    }
+    leaf threshold-used-frequency-event2b {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for inter-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.ThresholdUsedFrequencyEvent2b";
+    }
+    leaf threshold-used-frequency-event2d {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for inter-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.ThresholdUsedFrequencyEvent2d";
+    }
+    leaf threshold-used-frequency-event2f {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for inter-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.ThresholdUsedFrequencyEvent2f";
+    }
+    leaf instance-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.InstanceNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.";
+  }
+
+  grouping umts-ran-inter-freq-meas-instance-g {
+    description
+      "Table containing parameters relating to a particular instance of inter-freq events.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.Alias";
+    }
+    leaf intra-frequency-event-identity {
+      type enumeration {
+        enum "2a" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2a";
+        }
+        enum "2b" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2b";
+        }
+        enum "2c" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2c";
+        }
+        enum "2d" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2d";
+        }
+        enum "2e" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2e";
+        }
+        enum "2f" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity - 2f";
+        }
+      }
+      description
+        "Each entry is an Event ID from the list of: {{enum}} Defines the identity of the event used to trigger UE reporting (in case of event-triggered reporting). {{bibref|3GPP-TS.25.331|Section 10.3.7.14}} This attribute is readable, as it is highly dependent on how the FAP makes use of the event.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.IntraFrequencyEventIdentity";
+    }
+    leaf event-description {
+      type string {
+        length "0..256";
+      }
+      description
+        "A free-form description of the way the event instance is meant to be used. E.g. \"detecting cell edge to prepare for hand-out\", \"cancel hand-out preparation\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.EventDescription";
+    }
+    leaf measurement-quantity {
+      type enumeration {
+        enum "cpich ec/no" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.MeasurementQuantity - CPICH Ec/No";
+        }
+        enum "cpich rscp" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.MeasurementQuantity - CPICH RSCP";
+        }
+      }
+      config false;
+      description
+        "Defines the measurement quantity for inter-freq HO measurement when the UE is in Cell-DCH state. Enumeration of: {{enum}} {{bibref|3GPP-TS.25.331|Section 10.3.7.18}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.MeasurementQuantity";
+    }
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the filter coefficient for inter-freq HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.9 and Section 10.3.7.18}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.FilterCoefficient";
+    }
+    leaf weighting-factor {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.WeightingFactor";
+    }
+    leaf hysteresis {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-freq HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 14.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.Hysteresis";
+    }
+    leaf time-to-trigger {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-freq HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.TimeToTrigger";
+    }
+    leaf threshold-used-frequency {
+      type int64;
+      config false;
+      description
+        "Applicable to events 2b, 2d, 2f, otherwise not needed. Defines the reporting threshold for inter-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.ThresholdUsedFrequency";
+    }
+    leaf threshold-non-used-frequency {
+      type int64;
+      config false;
+      description
+        "Applicable to events 2a, 2b, 2c, 2e otherwise not needed. Defines the reporting threshold for inter-freq HO measurement when the UE is in Cell-DCH state. This is the \"Threshold non used frequency\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.19}}. Each valid value of {{param|MeasurementQuantity}} has a different valid range. {{enum|CPICH RSCP|MeasurementQuantity}} has a range of -120 dBm to -25 dBm {{enum|CPICH Ec/No|MeasurementQuantity}} has a range of -24 dB to 0 dB";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.ThresholdNonUsedFrequency";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterFreqMeas.Instance.{i}.";
+  }
+
+  grouping umts-ran-inter-rat-meas-g {
+    description
+      "This object contains parameters relating to the inter-RAT HO related control parameters. This is specifically for GERAN system.";
+    leaf gsm-filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the filter coefficient for inter-RAT HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.9 and Section 10.3.7.29}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.GSMFilterCoefficient";
+    }
+    leaf bsic-verification-required {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the BSIC verification is required or not for inter-RAT HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.29}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.BSICVerificationRequired";
+    }
+    leaf weighting-factor {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-RAT HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.WeightingFactor";
+    }
+    leaf hysteresis {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-RAT HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Hysteresis";
+    }
+    leaf time-to-trigger {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-RAT HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.TimeToTrigger";
+    }
+    leaf threshold-own-system {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for inter-RAT HO measurement when the UE is in Cell-DCH state. This is the \"Threshold own system\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.ThresholdOwnSystem";
+    }
+    leaf threshold-other-system {
+      type int64;
+      config false;
+      description
+        "Defines the reporting threshold for inter-RAT HO measurement when the UE is in Cell-DCH state. This is the \"Threshold other system\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.ThresholdOtherSystem";
+    }
+    leaf instance-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.InstanceNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.";
+  }
+
+  grouping umts-ran-inter-rat-meas-instance-g {
+    description
+      "Table containing parameters relating to a particular instance of inter-freq events.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.Alias";
+    }
+    leaf inter-rat-event-identity {
+      type enumeration {
+        enum "3a" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.InterRATEventIdentity - 3a";
+        }
+        enum "3b" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.InterRATEventIdentity - 3b";
+        }
+        enum "3c" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.InterRATEventIdentity - 3c";
+        }
+        enum "3d" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.InterRATEventIdentity - 3d";
+        }
+      }
+      description
+        "Each entry is an Event ID from the list of: {{enum}} Defines the identity of the event used to trigger UE reporting (in case of event-triggered reporting). {{bibref|3GPP-TS.25.331|Section 10.3.7.14}} This attribute is readable, as it is highly dependent on how the FAP makes use of the event.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.InterRATEventIdentity";
+    }
+    leaf event-description {
+      type string {
+        length "0..256";
+      }
+      description
+        "A free-form description of the way the event instance is meant to be used. E.g. \"hand-out to GSM macrocell\", \"cancel hand-out preparation due to decreasing macrocell quality\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.EventDescription";
+    }
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the filter coefficient for inter-freq HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.9 and Section 10.3.7.18}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.FilterCoefficient";
+    }
+    leaf bsic-verification-required {
+      type boolean;
+      config false;
+      description
+        "Applicable only to GSM events. Indicates whether the BSIC verification is required or not for inter-RAT HO measurement when the UE is in Cell-DCH state. {{bibref|3GPP-TS.25.331|Section 10.3.7.29}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.BSICVerificationRequired";
+    }
+    leaf weighting-factor {
+      type uint8 {
+        range "0..20";
+      }
+      config false;
+      description
+        "Defines the weighting factor for inter-RAT HO measurement when the UE is in Cell-DCH state. Actual values of the weighting factor are 0.0 to 2.0 in steps of 0.1. The value of {{param}} divided by 10 yields the actual value of the weighting factor. {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.WeightingFactor";
+    }
+    leaf hysteresis {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Defines the hysteresis for inter-RAT HO measurement when the UE is in Cell-DCH state. Actual values of the range are 0.0 to 7.5 in steps of 0.5. The value of {{param}} divided by 2 yields the actual value of the hysteresis. {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.Hysteresis";
+    }
+    leaf time-to-trigger {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the time-to-trigger in {{units}} for inter-RAT HO measurement when the UE is in Cell-DCH state. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.39 and Section 10.3.7.64}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.TimeToTrigger";
+    }
+    leaf threshold-own-system {
+      type int64;
+      config false;
+      description
+        "Applicable only to event 3a, otherwise not needed. Defines the reporting threshold for inter-RAT HO measurement when the UE is in Cell-DCH state. This is the \"Threshold own system\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.ThresholdOwnSystem";
+    }
+    leaf threshold-other-system {
+      type int64;
+      config false;
+      description
+        "Applicable to events 3a, 3b, 3c, otherwise not needed. Defines the reporting threshold for inter-RAT HO measurement when the UE is in Cell-DCH state. This is the \"Threshold other system\" as defined in {{bibref|3GPP-TS.25.331|Section 10.3.7.30}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.ThresholdOtherSystem";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.InterRATMeas.Instance.{i}.";
+  }
+
+  grouping umts-ran-ue-internal-meas-g {
+    description
+      "This object contains parameters relating to the UE internal measurement control parameters.";
+    leaf filter-coefficient {
+      type uint8 {
+        range "0..9 | 11 | 13 | 15 | 17 | 19";
+      }
+      config false;
+      description
+        "Defines the filter coefficient for UE internal measurement. {{bibref|3GPP-TS.25.331|Section 10.3.7.9 and Section 10.3.7.79}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.FilterCoefficient";
+    }
+    leaf ue-tx-pwr-threshold-event6a {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Defines the threshold for UE transmit power above which Event 6a is reported. {{bibref|3GPP-TS.25.331|Section 10.3.7.80}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.UETxPwrThresholdEvent6a";
+    }
+    leaf time-to-trigger-event6a {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the period in {{units}} between detection of Event 6a and sending of Measurement Report. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.80}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.TimeToTriggerEvent6a";
+    }
+    leaf ue-tx-pwr-threshold-event6b {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Defines the threshold for UE transmit power above which Event 6b is reported. {{bibref|3GPP-TS.25.331|Section 10.3.7.80}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.UETxPwrThresholdEvent6b";
+    }
+    leaf time-to-trigger-event6b {
+      type uint16 {
+        range "0 | 10 | 20 | 40 | 60 | 80 | 100 | 120 | 160 | 200 | 240 | 320 | 640 | 1280 | 2560 | 5000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the period in {{units}} between detection of Event 6b and sending of Measurement Report. Only the specified values are considered valid, any value other than those and the CPE MUST reject the request. {{bibref|3GPP-TS.25.331|Section 10.3.7.80}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.TimeToTriggerEvent6b";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.UEInternalMeas.";
+  }
+
+  grouping umts-ran-rf-g {
+    description
+      "This object contains parameters relating to the RF configuration.";
+    leaf-list uarfcndl {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a DL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433|Section 9.2.1.65}} Self-configuration for UARFCN is controlled by {{param|.Capabilities.UMTS.SelfConfig.UARFCNConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.UARFCNSelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for UARFCN is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for {{param|UARFCNDLInUse}}. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. The UARFCN values supplied to the list are derived based on the formula defined in {{bibref|3GPP-TS.25.104|Section 5.4.3}} The order of the UARFCN entries has no significance. The carrier spacing in FDD mode is fixed as defined in {{bibref|3GPP-TS.25.104}}. Therefore, the FAP can unambiguously derive the UL UARFCN value based on the selected DL UARFCN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.UARFCNDL";
+    }
+    leaf uarfcndl-in-use {
+      type uint64;
+      description
+        "The DL UARFCN being used by the FAP. Self-configuration for UARFCN is controlled by {{param|.Capabilities.UMTS.SelfConfig.UARFCNConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.UARFCNSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|UARFCNDL}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first value in {{param|UARFCNDL}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.UARFCNDLInUse";
+    }
+    leaf uarfcnul-in-use {
+      type uint64;
+      description
+        "The UL UARFCN being used by the FAP. The UL UARFCN that corresponds to {{param|UARFCNDLInUse}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.UARFCNULInUse";
+    }
+    leaf-list uarfcndl-to-protect {
+      type string;
+      config false;
+      max-elements "64";
+      description
+        "{{list}} Each item is a DL UARFCNs to be protected from adjacent channel interference. \"Adjacent channel\" in this context means offset from the FAP's UARFCN by 5MHz. {{bibref|3GPP-TS.25.104|Section 6.4.6}} If any of the items in the list are adjacent to the FAP's own DL channel, the FAP MUST take the Primary CPICH code power measured on these channels into account as part of its maximum transmit power self-configuration. The UARFCNs in the list can belong to any operator, allowing for protection of the FAP operator's own macro layer as well as that of other operators (only the latter is mandated by the {{bibref|3GPP-TS.25.104}} requirements). The list SHOULD take into account the ability of the FAP to self-configure its own DL UARFCN and so SHOULD include any channels (requiring protection) which can potentially be adjacent to the UARFCN selected by the FAP. For example, if only adjacent operator protection is required and the FAP has the ability to self-configure to any channel owned by its operator, this list would be populated with the UARFCNs immediately above and below the range of channels owned by the FAP operator. Adjacent channel protection can cause the FAP transmit power to be reduced down to as low as 8dBm. If {{empty}} then it indicates that there are no channels adjacent to the FAP that require protection, or that self-configuration of the FAP transmit power is not enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.UARFCNDLToProtect";
+    }
+    leaf-list primary-scrambling-code {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a Primary DL Scrambling Code used by the FDD mode cell with a numeric range between 0 and 511 inclusive. {{bibref|3GPP-TS.25.433|Section 9.2.2.34}} Self-configuration for PSC is controlled by {{param|.Capabilities.UMTS.SelfConfig.PrimaryScramblingCodeConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.PrimaryScramblingCodeSelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for {{param}} is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for {{param|PrimaryScramblingCodeInUse}}. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. The multiplicity of the PSC values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. The following are examples of valid PSC string: :\"20\" ::(explicitly specifies a single PSC value) :\"20,30,40\" ::(specifies 3 possible PSC values to select from) \"20..40\" ::(specifies 21 possible values between 20 and 40, inclusive) \"20..40,50\" ::(specifies 22 possible values between 20 and 40 inclusive and a single value 50) The order of the items has no significance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PrimaryScramblingCode";
+    }
+    leaf primary-scrambling-code-in-use {
+      type uint64;
+      description
+        "The PSC being used by the FAP. Self-configuration for PSC is controlled by {{param|.Capabilities.UMTS.SelfConfig.PrimaryScramblingCodeConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.PrimaryScramblingCodeSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|PrimaryScramblingCode}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first value in {{param|PrimaryScramblingCode}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PrimaryScramblingCodeInUse";
+    }
+    leaf maxfap-tx-power-expanded {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Defines the maximum transmission power allowed on the FAP, maximum value for the linear sum of the power of all downlink physical channels, that is allowed to be used in a cell. {{param}} is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<Pmax_low>..<Pmax_high>\". {{param}} identifies the limits between which the FAP can self-configure its maximum transmit power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.MaxFAPTxPowerExpandedConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.MaxFAPTxPowerExpandedSelfConfigEnable}} from an enabled perspective. <Pmax_low> and <Pmax_high> are measured in dBm and have a range of -30.0 to 20.0 incremented by 0.1 dB. {{bibref|3GPP-TS.32.642|Section 6.3.9}} {{bibref|3GPP-TS.25.104|Section 6.2.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.MaxFAPTxPowerExpanded";
+    }
+    leaf maxfap-tx-power-in-use-expanded {
+      type int64;
+      units "dBm";
+      description
+        "The maximum transmission power measured in {{units}} currently used by the FAP. Actual values of the maximum transmission power are -30.0 {{units}} to 20.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.MaxFAPTxPowerExpandedConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.MaxFAPTxPowerExpandedSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the range provided in {{param|MaxFAPTxPowerExpanded}}. If the self-configuration capability is not available or not enabled, then this parameter contains a value selected by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.MaxFAPTxPowerInUseExpanded";
+    }
+    leaf max-ul-tx-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Defines the maximum transmission power level a UE can use on PRACH. {{param}} is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<Pmax_low>..<Pmax_high>\". {{param}} identifies the limits between which the FAP can self-configure its maximum transmit power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.MaxULTxPowerConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.MaxULTxPowerSelfConfigEnable}} from an enabled perspective. <Pmax_low> and <Pmax_high> are measured in dBm and have a range of -50 to 33 incremented by 1. {{bibref|3GPP-TS.25.331|Section 10.3.6.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.MaxULTxPower";
+    }
+    leaf max-ul-tx-power-in-use {
+      type int64;
+      units "dBm";
+      description
+        "The maximum transmission power level a UE can use on PRACH. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.MaxULTxPowerConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.MaxULTxPowerSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the range provided in {{param|MaxULTxPower}}. If the self-configuration capability is not available or not enabled, then this parameter contains a value selected by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.MaxULTxPowerInUse";
+    }
+    leaf pcpich-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "The value of the transmission power of the Primary Common PIlot CHannel (P-CPICH). The P-CPICH physical channel carries the common pilots of the cell. Parameter in SIB5. {{param}} is expressed as a range of allowed transmission power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<Pmax_low>..<Pmax_high>\". {{param}} identifies the limits between which the FAP can self-configure its transmission power. Self-configuration for transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.PCPICHPowerConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.PCPICHPowerSelfConfigEnable}} from an enabled perspective. <Pmax_low> and <Pmax_high> are measured in dBm and have a range of -10.0 to 20.0 incremented by 0.1 dB. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.104|Section 6.2.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PCPICHPower";
+    }
+    leaf pcpich-power-in-use {
+      type int64;
+      units "dBm";
+      description
+        "The P-CPICH power measured in {{units}} currently used by the FAP. Actual values of the maximum transmission power are -10.0 {{units}} to 20.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power. Self-configuration for transmission power is controlled by {{param|.Capabilities.UMTS.SelfConfig.PCPICHPowerConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.PCPICHPowerSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the range provided in {{param|PCPICHPower}}. If the self-configuration capability is not available or not enabled, then this parameter contains a value selected by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PCPICHPowerInUse";
+    }
+    leaf power-offset-pilot-dpdch {
+      type uint8 {
+        range "0..24";
+      }
+      units "dB";
+      config false;
+      description
+        "Defines the power offset between pilot channel and DPDCH. Actual values of the offset are 0.0 {{units}} to 6.0 {{units}} in steps of 0.25 {{units}}. The value of {{param}} divided by 4 yields the actual value of the offset. {{bibref|3GPP-TS.25.331|Section 10.3.6.18}} {{bibref|3GPP-TS.25.214|Section 5.2.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PowerOffsetPilotDPDCH";
+    }
+    leaf fap-coverage-target {
+      type uint8 {
+        range "50..150";
+      }
+      units "dB";
+      config false;
+      description
+        "Defines the target value measured in {{units}} for the range of the FAP's DL coverage, in terms of RF propagation loss. This value can be used by the FAP's self-configuration algorithms to help derive transmit power levels in the presence of co-channel and adjacent channel interference. {{bibref|3GPP-TS.25.967|Section 7.2.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.FAPCoverageTarget";
+    }
+    leaf fap-quality-target-ec-io {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the target value measured in dB for the downlink signal quality of the FAP in terms of CPICH Ec/Io, thereby clarifying the meaning of \"FAPCoverageTarget\". Actual values of the FAPQualityTargetEcIo are -20 dB to 0 dB in steps of 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.FAPQualityTargetEcIo";
+    }
+    leaf psch-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of the Primary SCH relative to the Primary CPICH power. Actual values of the transmission power offset are -35.0 {{units}} to 15.0 {{units}} in steps of 0.1 {{units}}. The value of {{param}} divided by 10 yields the actual value of the transmission power offset. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 9.1.24 and Section 9.2.1.21}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PSCHPower";
+    }
+    leaf ssch-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of the Secondary SCH relative to the Primary CPICH power. Actual values of the transmission power offset are -35.0 {{units}} to 15.0 {{units}} in steps of 0.1 {{units}}. The value of {{param}} divided by 10 yields the actual value of the transmission power offset. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 9.1.24 and Section 9.2.1.21}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.SSCHPower";
+    }
+    leaf pich-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the maximum transmission power offset measured in {{units}} of the PICH channel relative to the Primary CPICH transmission power. {{bibref|3GPP-TS.32.642|Section 6.3.9}} {{bibref|3GPP-TS.25.433|Section 9.2.1.49A}} {{bibref|3GPP-TS.25.331|Section 10.3.6.50}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PICHPower";
+    }
+    leaf pch-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of the PCH relative to the Primary CPICH power. Actual values of the transmission power offset are -35.0 {{units}} to 15.0 {{units}} in steps of 0.1 {{units}}. The value of {{param}} divided by 10 yields the actual value of the transmission power offset. {{bibref|3GPP-TS.32.642|Section 6.3.9}} {{bibref|3GPP-TS.25.433|Section 9.1.3.1 and Section 9.2.1.21}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.PCHPower";
+    }
+    leaf fach-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of the FACH relative to the Primary CPICH power. Actual values of the transmission power offset are -35.0 {{units}} to 15.0 {{units}} in steps of 0.1 {{units}}. The value of {{param}} divided by 10 yields the actual value of the transmission power offset. {{bibref|3GPP-TS.32.642|Section 6.3.9}} {{bibref|3GPP-TS.25.433|Section 9.1.6.1 and Section 9.2.1.21}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.FACHPower";
+    }
+    leaf bch-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of the BCH relative to the Primary CPICH power. Actual values of the transmission power offset are -35.0 {{units}} to 15.0 {{units}} in steps of 0.1 {{units}}. The value of {{param}} divided by 10 yields the actual value of the transmission power offset. {{bibref|3GPP-TS.32.642|Section 9.3.11}} {{bibref|3GPP-TS.25.433|Section 9.1.24 and Section 9.2.1.21}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.BCHPower";
+    }
+    leaf aich-power {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Defines the transmission power offset measured in {{units}} of one AICH relative to the Primary CPICH power. Parameter defined in SIB5 {{bibref|3GPP-TS.25.331|Section 10.3.6.3}}. Transmission power level of AICH, AP-AICH and CD/CA-ICH channels compared to CPICH. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 9.2.2.D}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.AICHPower";
+    }
+    leaf ctch-allocation-period {
+      type uint8 {
+        range "1..255";
+      }
+      config false;
+      description
+        "The value defines 'N' multiples of M(TTI) for CBS DRX calculations at the UE side.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.CTCHAllocationPeriod";
+    }
+    leaf cbs-frame-offset {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Value of CBS frame offset (CTCH) on DL FACH. Parameter in SIB5";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.CBSFrameOffset";
+    }
+    leaf max-tti {
+      type uint8 {
+        range "1..255";
+      }
+      config false;
+      description
+        "Defines the number of radio frames in the TTI of the FACH used for CTCH (MTTI).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.MaxTTI";
+    }
+    leaf noise-rise-limit-lower-value {
+      type uint16 {
+        range "0..500";
+      }
+      config false;
+      description
+        "Defines the lower value of the Noise Rise Limit range that UMTS FAP is allowed to pick from. The value is measured in dB and has a range of 0.0 to 50.0 incremented by 0.1 dB. the value MUST not exceed the value of {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitUpperValue}} The Noise Rise Limit range identifies the limits between which the FAP can self-configure its uplink noise rise limit. Self-configuration for noise rise limit is controlled by {{param|.Capabilities.UMTS.SelfConfig.NoiseRiseLimitConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.NoiseRiseLimitConfigEnable}} from an enabled perspective.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.NoiseRiseLimitLowerValue";
+    }
+    leaf noise-rise-limit-upper-value {
+      type uint16 {
+        range "0..500";
+      }
+      config false;
+      description
+        "Defines the upper value of the Noise Rise Limit range that UMTS FAP is allowed to pick from. The value is measured in dB and has a range of 0.0 to 50.0 incremented by 0.1 dB. the value MUST not be below the value of {{param|.CellConfig.UMTS.RAN.RF.NoiseRiseLimitLowerValue}} NoiseRiseLimit identifies the limits between which the FAP can self-configure its uplink noise rise limit. Self-configuration for noise rise limit is controlled by {{param|.Capabilities.UMTS.SelfConfig.NoiseRiseLimitConfig}} from an availability perspective and {{param|.FAPControl.UMTS.SelfConfig.NoiseRiseLimitConfigEnable}} from an enabled perspective.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.NoiseRiseLimitUpperValue";
+    }
+    leaf noise-rise-limit-in-use {
+      type uint16 {
+        range "0..500";
+      }
+      description
+        "Actual value of the Noise Rise Limit that the FAP uses. The value is measured in dB and has a range of 0.0 to 50.0 incremented by 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.NoiseRiseLimitInUse";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.RF.";
+  }
+
+  grouping umts-ran-neighbor-list-g {
+    description
+      "This object contains parameters relating to the neighbor list.";
+    leaf max-intra-freq-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.MaxIntraFreqCellEntries";
+    }
+    leaf max-inter-freq-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.MaxInterFreqCellEntries";
+    }
+    leaf intra-freq-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCellNumberOfEntries";
+    }
+    leaf inter-freq-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.";
+  }
+
+  grouping umts-ran-neighbor-list-intra-freq-cell-g {
+    description
+      "Table containing the intra-frequency cell list provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      config false;
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "RNC-ID of an intra-freq neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Cell Identifier (C-id) that identifies a cell within an RNS. This Cell Identifier together with the controlling RNC (RNC-ID) constitutes the UTRAN Cell ID (UC-ID) and is used to identify a cell uniquely within UTRAN. C-ID is either 12-bit or 16-bit value. {{bibref|3GPP-TS.25.401|Section 6.1.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      config false;
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.URA";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.PCPICHScramblingCode";
+    }
+    leaf pcpich-tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Primary CPICH Tx power in {{units}}. Actual values of the power are -10.0 {{units}} to 50.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the power. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 2.2.33}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.PCPICHTxPower";
+    }
+    leaf collocated-inter-freq-cell {
+      type uint32 {
+        range "0..268435455";
+      }
+      config false;
+      description
+        "Provides identity of collocated inter-frequency Cell. Needed for pathloss estimation, in case the femto environment masks intra-frequency neighbor. Cell Identity. {{bibref|3GPP-TS.25.331|Section 10.3.2.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.CollocatedInterFreqCell";
+    }
+    leaf max-tx-power {
+      type int64;
+      units "0.1 dBm";
+      config false;
+      description
+        "Cell Max Tx Power. Parameter needed in HNB power calibration, for protection of neighbour cells. Actual values of the power are -30.0 dBm to 60.0 dBm in steps of 0.1 dB. The value of MaxTxPower divided by 10 yields the actual value of the power. C.f {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.104|Section 6.2.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.MaxTxPower";
+    }
+    leaf max-dpc-htx-power {
+      type int64;
+      units "0.1 dBm";
+      config false;
+      description
+        "Maximum DL DPCH Tx Power per UE configured in the cell (for CS UEs). Parameter may be used by FAP to protect the DL budget allocated to neighbouring UEs served by neighbour cells. C.f (max 10 dB below max Tx power) {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.104|Section 6.2.1}} Actual values of the power are -40.0 dBm to 50.0 dBm in steps of 0.1 dB. The value of MaxDPCHtxPower divided by 10 yields the actual value of the power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.MaxDPCHtxPower";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.";
+  }
+
+  grouping umts-ran-neighbor-list-inter-freq-cell-g {
+    description
+      "Table containing the inter-frequency cell list provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      config false;
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "RNC-ID of an intra-freq neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Cell Identifier (C-id) that identifies a cell within an RNS. This Cell Identifier together with the controlling RNC (RNC-ID) constitutes the UTRAN Cell ID (UC-ID) and is used to identify a cell uniquely within UTRAN. C-ID is either 12-bit or 16-bit value. {{bibref|3GPP-TS.25.401|Section 6.1.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      config false;
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.URA";
+    }
+    leaf uarfcnul {
+      type uint16 {
+        range "0..16383";
+      }
+      config false;
+      description
+        "The UL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.UARFCNUL";
+    }
+    leaf uarfcndl {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The DL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.UARFCNDL";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.PCPICHScramblingCode";
+    }
+    leaf pcpich-tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Primary CPICH Tx power in {{units}}. Actual values of the power are -10.0 {{units}} to 50.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the power. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 2.2.33}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.PCPICHTxPower";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.";
+  }
+
+  grouping umts-ran-neighbor-list-inter-rat-cell-g {
+    description
+      "The inter-RAT cell lists separated by technology. {{bibref|3GPP-TS.25.331|Section 10.3.7.23}}";
+    leaf max-gsm-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.MaxGSMEntries";
+    }
+    leaf gsm-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSMNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.";
+  }
+
+  grouping umts-ran-neighbor-list-inter-rat-cell-gsm-g {
+    description
+      "Table containing the inter-RAT cell list for GSM provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      config false;
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.LAC";
+    }
+    leaf bsic {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "BSIC of the cell per {{bibref|3GPP-TS.23.003}}, consisting of: :Bit 7:6 - not used (\"00\") :Bit 5:3 - NCC (PLMN Color Code) :Bit 2:0 - BCC (BS color code) For example, if NCC is 7 and BCC is 2 you would have 00111010 (binary) or 0x3A (hex), and the value of this parameter would be 58.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BSIC";
+    }
+    leaf ci {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Cell ID of the cell per {{bibref|3GPP-TS.23.003|Section 4.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.CI";
+    }
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm 850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - GSM 850";
+        }
+        enum "gsm 900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - GSM 900";
+        }
+        enum "dcs 1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - DCS 1800";
+        }
+        enum "pcs 1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - PCS 1900";
+        }
+      }
+      config false;
+      description
+        "Indicates how to interpret the BCCH ARFCN. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator";
+    }
+    leaf bccharfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      description
+        "ARFCN of this cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.BCCHARFCN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.";
+  }
+
+  grouping umts-ran-neighbor-list-in-use-g {
+    description
+      "This object contains parameters relating to the neighbor list used by the FAP based on its self-configuration capability and {{object|.CellConfig.UMTS.RAN.NeighborList.}} configuration of adding and excluding cells.";
+    leaf max-intra-freq-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.IntraFreqCell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.MaxIntraFreqCellEntries";
+    }
+    leaf max-inter-freq-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.InterFreqCell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.MaxInterFreqCellEntries";
+    }
+    leaf intra-freq-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCellNumberOfEntries";
+    }
+    leaf inter-freq-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.";
+  }
+
+  grouping umts-ran-neighbor-list-in-use-intra-freq-cell-g {
+    description
+      "Table containing the intra-frequency cell list.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "RNC-ID of an intra-freq neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "C-ID of the intra-freq neighbour cell {{bibref|3GPP-TS.25.401|Section 6.1.5}}. If {{param|RNCID}} is larger than 4095, then {{param}} will be 12 bits (i.e. a range of [0:4095]), else {{param}} is 16 bits long (i.e. range of [4096:65535]). This is needed to facilitate Femto to Macro handover. Used in {{bibref|3GPP-TS.25.413|Section 9.2.1.28}} as part of Target Cell ID.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.URA";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.PCPICHScramblingCode";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.IntraFreqCell.{i}.";
+  }
+
+  grouping umts-ran-neighbor-list-in-use-inter-freq-cell-g {
+    description
+      "Table containing the inter-frequency cell list.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "RNC-ID of an intra-freq neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "C-ID of the intra-freq neighbour cell {{bibref|3GPP-TS.25.401|Section 6.1.5}}. If {{param|RNCID}} is larger than 4095, then {{param}} will be 12 bits (i.e. a range of [0:4095]), else {{param}} is 16 bits long (i.e. range of [4096:65535]). This is needed to facilitate Femto to Macro handover. Used in {{bibref|3GPP-TS.25.413|Section 9.2.1.28}} as part of Target Cell ID.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.URA";
+    }
+    leaf uarfcnul {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The UL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.UARFCNUL";
+    }
+    leaf uarfcndl {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The DL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.UARFCNDL";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.PCPICHScramblingCode";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterFreqCell.{i}.";
+  }
+
+  grouping umts-ran-neighbor-list-in-use-inter-rat-cell-g {
+    description
+      "The inter-RAT cell lists separated by technology. {{bibref|3GPP-TS.25.331|Section 10.3.7.23}}";
+    leaf max-gsm-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.UMTS.RAN.NeighborList.InterRATCell.GSM.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.MaxGSMEntries";
+    }
+    leaf gsm-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSMNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.";
+  }
+
+  grouping umts-ran-neighbor-list-in-use-inter-rat-cell-gsm-g {
+    description
+      "Table containing the inter-RAT cell list for GSM.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.LAC";
+    }
+    leaf bsic {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "BSIC of the cell per {{bibref|3GPP-TS.23.003}}, consisting of: :Bit 7:6 - not used (\"00\") :Bit 5:3 - NCC (PLMN Color Code) :Bit 2:0 - BCC (BS color code) For example, if NCC is 7 and BCC is 2 you would have 00111010 (binary) or 0x3A (hex), and the value of this parameter would be 58.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BSIC";
+    }
+    leaf ci {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Cell ID of the cell per {{bibref|3GPP-TS.23.003|Section 4.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.CI";
+    }
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm 850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - GSM 850";
+        }
+        enum "gsm 900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - GSM 900";
+        }
+        enum "dcs 1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - DCS 1800";
+        }
+        enum "pcs 1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - PCS 1900";
+        }
+      }
+      description
+        "Indicates how to interpret the BCCH ARFCN. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator";
+    }
+    leaf bccharfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      description
+        "ARFCN of this cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BCCHARFCN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAN.NeighborListInUse.InterRATCell.GSM.{i}.";
+  }
+
+  grouping umts-rab-g {
+    description
+      "This object contains parameters relating to Radio Access layers {{bibref|3GPP-TS.32.405}}";
+    leaf rab-succ-estab-cs {
+      type uint64;
+      description
+        "The number of successfully established RABs (with or without queueing) for CS domain.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABSuccEstabCS";
+    }
+    leaf rab-fail-estab-cs {
+      type uint64;
+      description
+        "The number of RAB establishment failures for CS domain.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABFailEstabCS";
+    }
+    leaf rab-succ-estab-ps {
+      type uint64;
+      description
+        "The number of successfully established RABs for PS domain.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABSuccEstabPS";
+    }
+    leaf rab-fail-estab-ps {
+      type uint64;
+      description
+        "The number of RABs failed to establish for PS domain.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABFailEstabPS";
+    }
+    leaf rabcs-setup-time-mean {
+      type uint64;
+      units "milliseconds";
+      description
+        "The mean time in {{units}} for a FAP to establish a RAB CS connection. This measurement is obtained by accumulating the time intervals for each successful RAB establishment between the receipt by the FAP of a RANAP \"RAB ASSIGNMENT REQUEST\" message to establish a RAB for CS domain, and the first corresponding (based on RAB ID) transmission by the FAP of a RANAP \"RAB ASSIGNMENT RESPONSE\" message for successfully established RABs over a granularity period (Sample Interval {{bibref|3GPP-TS.32.582|Section 6.3.2}}). This end value of the time will then be divided by the number of successfully established RABs observed in the granularity period to give the arithmetic mean. The accumulator SHALL be reinitialized at the beginning of each granularity period.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABCSSetupTimeMean";
+    }
+    leaf rabcs-setup-time-max {
+      type uint64;
+      units "milliseconds";
+      description
+        "The maximum time in {{units}} for a FAP to establish a RAB CS connection. This measurement is obtained by monitoring the time intervals for each successful RAB establishment between the receipt by the FAP of a RANAP \"RAB ASSIGNMENT REQUEST\" message to establish a RAB for CS domain, and the first corresponding (based on RAB ID) transmission by the FAP of a RANAP \"RAB ASSIGNMENT RESPONSE\" message for successfully established RABs. The high tide mark of this time will be stored in a gauge; the gauge SHALL be reinitialized at the beginning of each granularity period (Sample Interval {{bibref|3GPP-TS.32.582|Section 6.3.2}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABCSSetupTimeMax";
+    }
+    leaf rabps-setup-time-mean {
+      type uint64;
+      units "milliseconds";
+      description
+        "The mean time in {{units}} for a FAP to establish a RAB PS connection. This measurement is obtained by accumulating the time intervals for each successful RAB establishment between the receipt by the FAP of a RANAP \"RAB ASSIGNMENT REQUEST\" message to establish a RAB for PS domain, and the first corresponding (based on RAB ID) transmission by the FAP of a RANAP \"RAB ASSIGNMENT RESPONSE\" message for successfully established RABs over a granularity period (Sample Interval {{bibref|3GPP-TS.32.582|Section 6.3.2}}). This end value of the time will then be divided by the number of successfully established RABs observed in the granularity period to give the arithmetic mean. The accumulator SHALL be reinitialized at the beginning of each granularity period.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABPSSetupTimeMean";
+    }
+    leaf rabps-setup-time-max {
+      type uint64;
+      units "milliseconds";
+      description
+        "The maximum time in {{units}} for a FAP to establish a RAB PS connection. This measurement is obtained by monitoring the time intervals for each successful RAB establishment between the receipt by the FAP of a RANAP \"RAB ASSIGNMENT REQUEST\" message to establish a RAB for PS domain, and the first corresponding (based on RAB ID) transmission by the FAP of a RANAP \"RAB ASSIGNMENT RESPONSE\" message for successfully established RABs. The high tide mark of this time will be stored in a gauge; the gauge SHALL be reinitialized at the beginning of each granularity period (Sample Interval {{bibref|3GPP-TS.32.582|Section 6.3.2}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.RABPSSetupTimeMax";
+    }
+    leaf fail-ho {
+      type uint64;
+      description
+        "The number of failed Handovers.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.FailHO";
+    }
+    leaf succ-ho {
+      type uint64;
+      description
+        "The number of successful Handovers.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.SuccHO";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.UMTS.RAB.";
+  }
+
+  grouping lte-g {
+    description
+      "This object contains parameters relating to configuring the LTE FAP.";
+    leaf tunnel-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.TunnelNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.";
+  }
+
+  grouping lte-tunnel-g {
+    description
+      "This object contains a table of all tunnel instances configured for the LTE FAP.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.Tunnel.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.Tunnel.{i}.Alias";
+    }
+    leaf tunnel-ref {
+      type string {
+        length "0..256";
+      }
+      description
+        "This is the reference to an IPsec tunnel instance used by the LTE FAP. For all root data models, which use the tunnel definition provided in {{bibref|TR-262}} (InternetGatewayDevice:1 {{bibref|TR-098}} and Device:1 {{bibref|TR-181i1}}) the {{param}} MUST point to a row in the 'FAP.Tunnel.IKESA.{i}.' table, defined in {{bibref|TR-262}}. If the root data model used is Device:2 {{bibref|TR-181i2}} than the {{param}} MUST point to IPsec tunnel instance defined in {{bibref|TR-181i2}}. If the referenced object is deleted, the parameter value MUST be set to an empty string. In case of a multiple-radio-technology FAP product, each radio technology can have its own tunnels or share common tunnels. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.Tunnel.{i}.TunnelRef";
+    }
+    leaf-list plmnid {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Optional list of PLMM IDs associated with the tunnel, which can be used for selecting the tunnel. Each PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.Tunnel.{i}.PLMNID";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.Tunnel.{i}.";
+  }
+
+  grouping lte-epc-g {
+    description
+      "This object contains parameters relating to configuring LTE EPC.";
+    leaf-list allowed-ciphering-algorithm-list {
+      type enumeration {
+        enum "eea0" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedCipheringAlgorithmList - EEA0";
+        }
+        enum "128-eea1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedCipheringAlgorithmList - 128-EEA1";
+        }
+        enum "128-eea2" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedCipheringAlgorithmList - 128-EEA2";
+        }
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a ciphering algorithm allowed to be used for RRC and UP confidentiality protection as defined in {{bibref|3GPP-TS.33.401}}. If the list contains more than 1 item, it is in the order of the preferred algorithm to be used. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedCipheringAlgorithmList";
+    }
+    leaf-list allowed-integrity-protection-algorithm-list {
+      type enumeration {
+        enum "128-eia1" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedIntegrityProtectionAlgorithmList - 128-EIA1";
+        }
+        enum "128-eia2" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedIntegrityProtectionAlgorithmList - 128-EIA2";
+        }
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a integrity protection algorithm allowed to be used for RRC as defined in {{bibref|3GPP-TS.33.401}}. If the list contains more than 1 item, it is in the order of the preferred algorithm to be used. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.AllowedIntegrityProtectionAlgorithmList";
+    }
+    leaf tac {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "TAC (Tracking Area Code) for LTE FAP as specified in SystemInformationBlockType1 message in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.TAC";
+    }
+    leaf eaid {
+      type uint32 {
+        range "0..16777216";
+      }
+      config false;
+      description
+        "Emergency Area ID that uniquely identifies the area of emergency for Earthquake and Tsunami Warning Services (ETWS). Corresponds to Emergency Area ID in {{bibref|3GPP-TS.36.413|Section 9.2.1.47}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.EAID";
+    }
+    leaf max-plmn-list-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.CellConfig.LTE.EPC.PLMNList.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.MaxPLMNListEntries";
+    }
+    leaf plmn-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNListNumberOfEntries";
+    }
+    leaf max-qo-s-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.EPC.QoS.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.MaxQoSEntries";
+    }
+    leaf qo-s-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoSNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.";
+  }
+
+  grouping lte-epc-plmn-list-g {
+    description
+      "This object contains parameters relating to list of PLMN identity specific to LTE EPC definition, called PLMN-IdentityList, as specified in SystemInformationBlockType1 message in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. Each instance in this object is a PLMN-IdentityInfo which consists of plmn-Identity and cellReservedForOperatorUse IEs. At minimum 1 item MUST be present in this list, and maximum of 6 items.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.Alias";
+    }
+    leaf is-primary {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this {{param|PLMNID}} is a primary PLMN or not. If there is more than one instance in {{object|.CellConfig.LTE.EPC.PLMNList.{i}.}} table, then ACS MUST set this {{param}} set to {{true}} in only one instance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.IsPrimary";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.PLMNID";
+    }
+    leaf cell-reserved-for-operator-use {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the cell is reserved for operator use or not. If {{true}}, it is reserved. If {{false}}, it is not reserved. Corresponds to \"reserved\" \"notReserved\" respectively as defined in PLMN-IdentityInfo in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.CellReservedForOperatorUse";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.PLMNList.{i}.";
+  }
+
+  grouping lte-epc-qo-s-g {
+    description
+      "This object contains parameters relating to configuring QoS in LTE EPC.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Alias";
+    }
+    leaf qci {
+      type uint8 {
+        range "1..20";
+      }
+      description
+        "QoS class identity as defined in {{bibref|3GPP-TS.23.203|Section 6.1.7.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.QCI";
+    }
+    leaf type {
+      type enumeration {
+        enum "gbr" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Type - GBR";
+        }
+        enum "non-gbr" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Type - Non-GBR";
+        }
+      }
+      config false;
+      description
+        "Defines the type of the QoS class as defined in {{bibref|3GPP-TS.23.203|Section 6.1.7.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Type";
+    }
+    leaf priority {
+      type uint8 {
+        range "1..20";
+      }
+      config false;
+      description
+        "Priority of the QoS class as defined in {{bibref|3GPP-TS.23.203|Section 6.1.7.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.Priority";
+    }
+    leaf packet-delay-budget {
+      type uint16 {
+        range "50 | 100 | 150 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000 | 1500 | 2000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Defines the Packet delay budget, specified in {{units}}, as defined in {{bibref|3GPP-TS.23.203|Section 6.1.7.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.PacketDelayBudget";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.EPC.QoS.{i}.";
+  }
+
+  grouping lte-ran-g {
+    description
+      "This object contains parameters relating to the LTE RAN level configuration.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.";
+  }
+
+  grouping lte-ran-common-g {
+    description
+      "This object contains parameters relating to the common configuration in LTE RAN.";
+    leaf cell-identity {
+      type uint32 {
+        range "0..268435455";
+      }
+      config false;
+      description
+        "Cell Identity as specified in {{bibref|3GPP-TS.36.331|Section 6.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Common.CellIdentity";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Common.";
+  }
+
+  grouping lte-ran-s1-ap-g {
+    description
+      "This object contains parameters relating to the S1AP configuration.";
+    leaf-list t-reloc-prep {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a maximum time for the Handover Preparation procedure in the source LTE FAP, specified in seconds, with a numeric range between 0 and 300 inclusive. Only values in multiple of 5 are valid; use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. The value of {{param}} divided by 10 yields the actual value. The timer is started when the LTE FAP sends the HANDOVER REQUIRED message. Upon reception of the HANDOVER COMMAND message the LTE FAP shall stop the timer. Corresponds to parameter TS1RELOCprep defined in {{bibref|3GPP-TS.36.413|Section 8.4.1.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If the LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then the LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If the LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then the LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.S1AP.TRelocPrep";
+    }
+    leaf-list t-reloc-overall {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a maximum time for the protection of the overall handover procedure in the source LTE FAP, specified in seconds, with a numeric range between 0 and 300 inclusive. Only values in multiple of 5 are valid; use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. The value of {{param}} divided by 10 yields the actual value. The timer is started reception of the HANDOVER COMMAND message. Corresponds to parameter TS1RELOCOverall defined in {{bibref|3GPP-TS.36.413|Section 8.4.1.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.S1AP.TRelocOverall";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.S1AP.";
+  }
+
+  grouping lte-ran-s1-u-g {
+    description
+      "This object contains parameters relating to the S1-U configuration.";
+    leaf gtpu-echo-interval {
+      type uint8 {
+        range "0 | 60..max";
+      }
+      units "seconds";
+      config false;
+      description
+        "Defines the interval in {{units}} between each GTP-U Echo Request that LTE FAP sends to the GTP-U peer, as specified in {{bibref|3GPP-TS.29.281|Section 7.2.1}}. If the value of {{param}} is equal to 0, then this functionality is supressed and thus LTE FAP does not send GTP-U Echo Request. If there is no GTP-U path in use, then no Echo Request is sent regardless of the value of {{param}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.S1U.GTPUEchoInterval";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.S1U.";
+  }
+
+  grouping lte-ran-rf-g {
+    description
+      "This object contains parameters relating to the RF, see {{bibref|3GPP-TS.32.592|Section 6.1.7.1}}.";
+    leaf-list earfcndl {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is an E-UTRA Absolute Radio Frequency Channel Number in the downlink direction. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter NDL specified in {{bibref|3GPP-TS.36.104|Table 5.7.3.1}}. If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.EARFCNDL";
+    }
+    leaf-list earfcnul {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is an E-UTRA Absolute Radio Frequency Channel Number in the uplink direction. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter NUL specified in {{bibref|3GPP-TS.36.104|Table 5.7.3.1}}. If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.EARFCNUL";
+    }
+    leaf freq-band-indicator {
+      type uint8 {
+        range "1..40";
+      }
+      config false;
+      description
+        "Frequency band indicator. Corresponds to parameter freqBandIndicator in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.FreqBandIndicator";
+    }
+    leaf-list dl-bandwidth {
+      type uint8 {
+        range "6 | 15 | 25 | 50 | 75 | 100";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a downlink transmission bandwidth, specified in number of Resource Blocks. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter dl_Bandwidth in MIB (Master Information Block) in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. and to parameter NRB in {{bibref|3GPP-TS.36.101|Table 5.6-1}}. If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.DLBandwidth";
+    }
+    leaf-list ul-bandwidth {
+      type uint8 {
+        range "6 | 15 | 25 | 50 | 75 | 100";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is an uplink transmission bandwidth, specified in number of Resource Blocks. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter ul_Bandwidth in SIB2 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}. and to parameter NRB in {{bibref|3GPP-TS.36.101|Table 5.6-1}}. If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.ULBandwidth";
+    }
+    leaf-list reference-signal-power {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a downlink reference-signal transmit power, specified in dBm, with a numeric range between -60 and 50 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Defined as the linear average over the power contributions (in W) of all resource elements that carry cell-specific reference signals within the operating system bandwidth. Corresponds to parameter referenceSignalPower in PDSCH-Config IE in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then LTE FAP accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of LTE FAP, LTE FAP accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.ReferenceSignalPower";
+    }
+    leaf-list phy-cell-id {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a physical cell ID with a numeric range between 0 and 503 inclusive. Represents the list of physical cell identities LTE FAP to choose from. In case there is more than one item in the list, the first item contains the most preferred value. As specified in {{bibref|3GPP-TS.36.211|Section 6.11}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If LTE FAP supports self-configuration capability for {{param}} and more than one item is configured, then LTE FAP is expected to select one from the list and overwrite this parameter containing only the one selected. If LTE FAP does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.PhyCellID";
+    }
+    leaf-list psch-power-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a power offset, specified in dB, of the Primary Synchronization Channel with respect to the ReferenceSignalPower, with a numeric range between -350 and 150 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of {{param}} divided by 10 yields the actual value. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.PSCHPowerOffset";
+    }
+    leaf-list ssch-power-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a power offset, specified in dB, of the Secondary Synchronization Channel with respect to the ReferenceSignalPower, with a numeric range between -350 and 150 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of {{param}} divided by 10 yields the actual value. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.SSCHPowerOffset";
+    }
+    leaf-list pbch-power-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a power offset, specified in dB, of the Physical Broadcast Channel with respect to the ReferenceSignalPower, with a numeric range between -350 and 150 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of {{param}} divided by 10 yields the actual value. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.PBCHPowerOffset";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RF.";
+  }
+
+  grouping lte-ran-phy-g {
+    description
+      "This object contains parameters relating to the physical layer level configuration.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.";
+  }
+
+  grouping lte-ran-phy-antenna-info-g {
+    description
+      "This object contains parameters relating to the antenna configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.1}}).";
+    leaf antenna-ports-count {
+      type uint8 {
+        range "1 | 2 | 4";
+      }
+      description
+        "Defines the number of cell specific antenna ports according to {{bibref|3GPP-TS.36.211|Section 6.2.1}}. A UE in IDLE mode acquires the information about the number of transmit antenna ports according to {{bibref|3GPP-TS.36.212|Section 5.3.1.1}}. Corresponds to antennaPortsCount IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.AntennaInfo.AntennaPortsCount";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.AntennaInfo.";
+  }
+
+  grouping lte-ran-phy-pdsch-g {
+    description
+      "This object contains parameters relating to the PDSCH (Physical Downlink Shared Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.2}}).";
+    leaf-list pb {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a Eb/Ea value with a numeric range between 0 and 3 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of this parameter is the same for all UEs in the cell. Eb repsents EPRE of PDSCH REs type B, i.e. REs in OFDM symbols that include reference symbols, as specified in {{bibref|3GPP-TS.36.213|Section 5.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PDSCH.Pb";
+    }
+    leaf-list pa {
+      type int64;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a Ea/Ers value. In case there is more than one item in the list, the first item contains the most preferred value. Ea represents EPRE of PDSCH REs type A, i.e. REs in OFDM symbols that do not include reference symbols. Ers represents EPRE of reference symbols REs. Specified in {{bibref|3GPP-TS.36.213|Section 5.2}}. Actual values of range are -6.00 to 3.00dB. The value of each item in {{param}} divided by 100 yields the actual value. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PDSCH.Pa";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PDSCH.";
+  }
+
+  grouping lte-ran-phy-srs-g {
+    description
+      "This object contains parameters relating to the UL SRS (Sounding Reference Signal) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.3}}).";
+    leaf srs-enabled {
+      type boolean;
+      config false;
+      description
+        "Indicates whether UL SRS (Sounding RS) is enabled or not. If {{true}}, UL Sounding RS is enabled. If {{false}}, UL Sounding RS is disabled. Corresponds to SoundingRS-UL-ConfigCommonIE defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.SRSEnabled";
+    }
+    leaf-list srs-bandwidth-config {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a index into tables of cell specific SRS Bandwidth Configuration, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. SRS Bandwidth Configuration tables are specified in {{bibref|3GPP-TS.36.211|Table 5.5.3.2-1, 5.5.3.2-2, 5.5.3.2-3 and 5.5.3.2– 4}}. Corresponds to srs-BandwidthConfig IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.SRSBandwidthConfig";
+    }
+    leaf srs-max-up-pts {
+      type boolean;
+      config false;
+      description
+        "Defines whether reconfiguration of SRS applies to UpPTS or not. If {{true}}, SRS applies to UpPTS. If {{false}}, SRS does not apply to UpPTS. Corresponds to srs-MaxUpPts specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and srsMaxUpPts specified in {{bibref|3GPP-TS.36.211|Section 5.5.3.2}}. This parameter is applicable to TDD mode only.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.SRSMaxUpPTS";
+    }
+    leaf ack-nack-srs-simultaneous-transmission {
+      type boolean;
+      config false;
+      description
+        "Defines whether a UE can simultaneously transmit SRS and HARQ ACK/NACK or not. If {{true}}, simultaneous transmission is allowed. If {{false}}, simultaneous transmission is not allowed. Corresponds to ackNackSRS-SimultaneousTransmission specfied in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and Simultaneous-AN-and-SRS specified in {{bibref|3GPP-TS.36.213|Section 8.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.AckNackSRSSimultaneousTransmission";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.SRS.";
+  }
+
+  grouping lte-ran-phy-prach-g {
+    description
+      "This object contains parameters relating to the PRACH (Physical Random Access Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.4}}).";
+    leaf-list root-sequence-index {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a Logical root sequence index with a numeric range between 0 and 837 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Logical root sequence index is used to determine 64 physical RACH preamble sequences available in the cell. Corresponds to RACH_ROOT_SEQUENCE parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and {{bibref|3GPP-TS.36.211|Section 5.7.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.RootSequenceIndex";
+    }
+    leaf-list configuration-index {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is an index to the table defining PRACH resources within the frame with a numeric range between 0 and 63 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to PRACH-Configuration-Index parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and {{bibref|3GPP-TS.36.211|Section 5.7.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.ConfigurationIndex";
+    }
+    leaf high-speed-flag {
+      type boolean;
+      config false;
+      description
+        "Indicates whether restricted set or unrestricted set of preambles is used. If {{true}}, indicates restricted set. If {{false}}, indicates unrestricted set. Corresponds to highSpeedFlag parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and high-speed-flag parameter defined in {{bibref|3GPP-TS.36.211|Section 5.7.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.HighSpeedFlag";
+    }
+    leaf-list zero-correlation-zone-config {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a value used for preamble sequence generation with a numeric range between 0 and 15 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Each item corresponds to zeroCorrelationZoneConfig parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and to NCS parameter defined in {{bibref|3GPP-TS.36.211|Section 5.7.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.ZeroCorrelationZoneConfig";
+    }
+    leaf-list freq-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item represents the first available physical resource block number for PRACH. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to prach-FreqOffset parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and nPRBoffsetRA parameter defined {{bibref|3GPP-TS.36.211|Section 5.7.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.FreqOffset";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRACH.";
+  }
+
+  grouping lte-ran-phy-pucch-g {
+    description
+      "This object contains parameters relating to the PUCCH (Physical Uplink Control Channel) configuration. (see {{bibref|3GPP-TS.32.592|Section 6.1.1.5}})";
+    leaf delta-pucch-shift {
+      type enumeration {
+        enum "ds1" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.DeltaPUCCHShift - ds1";
+        }
+        enum "ds2" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.DeltaPUCCHShift - ds2";
+        }
+        enum "ds3" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.DeltaPUCCHShift - ds3";
+        }
+      }
+      config false;
+      description
+        "Defines the cyclic shift used for PUCCH formats 1/1a/1b in a resource block used for a mix of formats 1/1a/1b and 2/2a/2b. It is an integer multiple of deltaPUCCHShift within the range of {0, 1, ., 7} . Corresponds to deltaPUCCH-Shift parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and Delta-shiftPUCCH parameter defined {{bibref|3GPP-TS.36.211|Section 5.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.DeltaPUCCHShift";
+    }
+    leaf-list nrbcqi {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a value that defines the bandwidth in terms of resource blocks available for use by PUCCH formats 2/2a/2b transmission in each slot, with a numeric range between 0 and 98 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to nRB-CQI parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and NRB(2) parameter defined {{bibref|3GPP-TS.36.211|Section 5.4}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive.If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.NRBCQI";
+    }
+    leaf ncsan {
+      type uint8 {
+        range "0..7";
+      }
+      description
+        "Defines the number of cyclic shift used for PUCCH formats 1/1a/1b in a resource block used for a mix of formats 1/1a/1b and 2/2a/2b. The value is an integer multiple of deltaPUCCHShift within the range of {0, 1, ., 7}. Corresponds to nCS-AN parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and NRB(1) parameter defined {{bibref|3GPP-TS.36.211|Section 5.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.NCSAN";
+    }
+    leaf-list n1-pucchan {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a value that determines resources used for transmission of PUCCH format 1/1a/1b and 2/2a/2b, with a numeric range between 0 and 2047 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to n1PUCCH-AN parameter defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and NPUCCH(1) parameter defined {{bibref|3GPP-TS.36.213|Section 10.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.N1PUCCHAN";
+    }
+    leaf-list cqipucch-resource-index {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a value that indicates the position of PUCCH, with a numeric range between 0 and 1185 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. . Corresponds to the cqi-PUCCH-ResourceIndex IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. and to parameter nPUCCH(2) specified in {{bibref|3GPP-TS.36.213|Section 7.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.CQIPUCCHResourceIndex";
+    }
+    leaf k {
+      type uint8 {
+        range "1..4";
+      }
+      units "Resource Blocks";
+      description
+        "Sub-band size for sub-band reporting mode expressed in units of physical {{units}}, see {{bibref|3GPP-TS.36.213|Section 7.2.2}}. This parameter corresponds to the K IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.K";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUCCH.";
+  }
+
+  grouping lte-ran-phy-pusch-g {
+    description
+      "This object contains parameters relating to the PUSCH (Physical Uplink Shared Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.6}}).";
+    leaf nsb {
+      type uint8 {
+        range "1..4";
+      }
+      config false;
+      description
+        "Defines the number of sub-bands. This parameter corresponds to n-SB parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and NSB parameter specified in {{bibref|3GPP-TS.36.211|Section 5.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.NSB";
+    }
+    leaf hopping-mode {
+      type enumeration {
+        enum "inter-sub-frame" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.HoppingMode - InterSubFrame";
+        }
+        enum "intra-and-inter-sub-frame" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.HoppingMode - IntraAndInterSubFrame";
+        }
+      }
+      config false;
+      description
+        "Indicates if hopping is \"inter-subframe\" or \"intra and inter-subframe\". Corresponds to hoppingMode parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and Hopping-mode parameter specified in {{bibref|3GPP-TS.36.211|Section 5.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.HoppingMode";
+    }
+    leaf-list hopping-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a value to compute the set of physical resource blocks to be used for transmission on PUSCH if uplink frequency hopping mode is enabled, with a numeric range between 0 and 98 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. This parameter corresponds to pusch-HoppingOffset parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and NRBHO parameter specified in {{bibref|3GPP-TS.36.211|Section 5.3.4}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.HoppingOffset";
+    }
+    leaf enable64-qam {
+      type boolean;
+      description
+        "Indicates whether 64QAM is allowed or not. If {{true}}, 64QAM is allowed. If {{false}}, 64QAM is not allowed. Corresponds to enable64QAM parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.Enable64QAM";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.";
+  }
+
+  grouping lte-ran-phy-pusch-ulrs-g {
+    description
+      "This object contains parameters relating to the ULRS (Uplink Reference Signal) of PUSCH (Physical Uplink Shared Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.6.1}}).";
+    leaf group-hopping-enabled {
+      type boolean;
+      config false;
+      description
+        "Indicates whether group hopping is enabled or not. If {{true}}, group hopping is enabled. If {{false}}, group hopping is not enabled. Corresponds to groupHoppingEnabled parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.and in {{bibref|3GPP-TS.36.211|Section 5.5.1.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.GroupHoppingEnabled";
+    }
+    leaf group-assignment-pusch {
+      type uint8 {
+        range "0..29";
+      }
+      description
+        "Corresponds to parameter groupAssignmentPUSCH specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.GroupAssignmentPUSCH";
+    }
+    leaf sequence-hopping-enabled {
+      type boolean;
+      config false;
+      description
+        "Indicates whether sequence hopping is enabled or not. If {{true}}, sequence hopping is enabled. If {{false}}, sequence hopping is not enabled. Corresponds to sequenceHoppingEnabled parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.and in {{bibref|3GPP-TS.36.211|Section 5.5.1.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.SequenceHoppingEnabled";
+    }
+    leaf cyclic-shift {
+      type uint8 {
+        range "0..7";
+      }
+      description
+        "Corresponds to parameter cyclcShift specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.CyclicShift";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PUSCH.ULRS.";
+  }
+
+  grouping lte-ran-phy-ul-power-control-g {
+    description
+      "This object contains parameters relating to the uplink power control configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.7}}).";
+    leaf-list p0-nominal-pusch {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a value to compute the UL UE transmit power for transmission on PUSCH for semi-persistant grants, with a numeric range between -126 and 24 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to p0-NominalPUSCH parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and PO_NOMINAL_PUSCH(0) parameter specified in {{bibref|3GPP-TS.36.211|Section 5.1.1.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.P0NominalPUSCH";
+    }
+    leaf-list alpha {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a value used to compute the UL UE transmit power for transmission on PUSCH, from the list of 0, 4, 5, 6, 7, 8, 9, 100. In case there is more than one item in the list, the first item contains the most preferred value. Actual values of range are from 0.00 to 1.00. The value of {{param}} divided by 100 yields the actual value. Corresponds to alpha parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and to α parameter specified in {{bibref|3GPP-TS.36.211|Section 5.1.1.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.Alpha";
+    }
+    leaf-list p0-nominal-pucch {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item is a value to compute the UL UE transmit power for transmission on PUCCH, with a numeric range between -126 and 24 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to p0-NominalPUCCH parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and PO_NOMINAL_PUCCH parameter specified in {{bibref|3GPP-TS.36.211|Section 5.1.2.1}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.P0NominalPUCCH";
+    }
+    leaf delta-fpucch-format1 {
+      type int64;
+      units "dB";
+      description
+        "Defines deltaF-PUCCH-Format1 to derive the UE transmit power. Corresponds to parameter ?F_PUCCH(1) in {{units}} as specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.213|Section 5.1.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaFPUCCHFormat1";
+    }
+    leaf delta-fpucch-format1b {
+      type uint8 {
+        range "1 | 3 | 5";
+      }
+      units "dB";
+      description
+        "Defines deltaF-PUCCH-Format1b to derive the UE transmit power. Corresponds to parameter ?F_PUCCH(1b) in {{units}} dB as specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.213|Section 5.1.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaFPUCCHFormat1b";
+    }
+    leaf delta-fpucch-format2 {
+      type int64;
+      units "dB";
+      description
+        "Defines deltaF-PUCCH-Format2 to derive the UE transmit power. Corresponds to parameter ?F_PUCCH(2) in {{units}} as specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.213|Section 5.1.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaFPUCCHFormat2";
+    }
+    leaf delta-fpucch-format2a {
+      type int64;
+      units "dB";
+      description
+        "Defines deltaF-PUCCH-Format2a to derive the UE transmit power. Corresponds to parameter ?F_PUCCH(2a) in {{units}} as specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.213|Section 5.1.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaFPUCCHFormat2a";
+    }
+    leaf delta-fpucch-format2b {
+      type int64;
+      units "dB";
+      description
+        "Defines deltaF-PUCCH-Format2b to derive the UE transmit power. Corresponds to parameter ?F_PUCCH(2b) in {{units}} as specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.213|Section 5.1.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaFPUCCHFormat2b";
+    }
+    leaf delta-preamble-msg3 {
+      type int64;
+      units "dB";
+      description
+        "Defines the parameter in {{units}} used to compute the UL UE transmit power for transmission of random access response grant. This parameter corresponds to deltaPreambleMsg3 parameter specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and to ?PREAMBLE_Msg3 parameter specified in {{bibref|3GPP-TS.36.213|Section 5.1.1.1}}. Actual value is 2x the value of this parameter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.DeltaPreambleMsg3";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.ULPowerControl.";
+  }
+
+  grouping lte-ran-phy-mbsfn-g {
+    description
+      "This object contains parameters relating to the MBSFN (Multimedia Broadcast multicast service Single Frequency Network) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.8}}).";
+    leaf neigh-cell-config {
+      type uint8 {
+        range "0..3";
+      }
+      config false;
+      description
+        "Defines the information related to MBSFN and TDD UL/DL configuration of neighbour cells. Corresponds to NeighCellConfig IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.6}}. Value 0: Not all neighbour cells have the same MBSFN sub-frame allocation as serving cell. Value 1: No MBSFN sub-frames are present in all neighbour cells. Value 2: The MBSFN sub-frame allocations of all neighbour cells are identical to or subsets of that in the serving cell. Value 3: Different UL/DL allocation in neighbouring cells for TDD compared to the serving cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.NeighCellConfig";
+    }
+    leaf max-sf-config-list-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.MaxSFConfigListEntries";
+    }
+    leaf sf-config-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigListNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.";
+  }
+
+  grouping lte-ran-phy-mbsfn-sf-config-list-g {
+    description
+      "This object contains parameters relating to the sub-frame that are reserved for MBSFN (Multimedia Broadcast multicast service Single Frequency Network) in downlink direction. For FDD mode, only one entry can exist in this table. For TDD mode, at most one entry can exist with a given value of stratumID (see {{bibref|3GPP-TS.32.592|Section 6.1.1.8}}).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.Alias";
+    }
+    leaf sync-stratum-id {
+      type uint8 {
+        range "1..8";
+      }
+      config false;
+      description
+        "This parameter is applicable to TDD mode only. Defines the synchronization stratum level to which the MBSFN configuration applies.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.SyncStratumID";
+    }
+    leaf radio-frame-allocation-period {
+      type uint8 {
+        range "1..2 | 4 | 8 | 16 | 32";
+      }
+      description
+        "Defines the period where MBSFN sub-frames occur in the radio frames. Radio frames contain MBSFN sub-frame when the following condition is met: ((SFN mod {{param}}) = {{param|RadioframeAllocationOffset}}). The value of 1 and 2 are only meaningful when the value of {{param|RadioFrameAllocationSize}} parameter is 1. Corresponds to radioFrameAllocationPeriod IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.RadioFrameAllocationPeriod";
+    }
+    leaf radioframe-allocation-offset {
+      type uint8 {
+        range "0..7";
+      }
+      description
+        "Defines the offset where MBSFN sub-frames occur in the radio frames. Radio frames contain MBSFN sub-frame when the following condition is met: ((SFN mod {{param|RadioFrameAllocationPeriod}}) = {{param}}). Corresponds to radioFrameAllocationOffset IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.RadioframeAllocationOffset";
+    }
+    leaf radio-frame-allocation-size {
+      type uint8 {
+        range "1 | 4";
+      }
+      description
+        "Defines the number of connsecutive frames that the MBSFN allocation pertains to defined by the combination of {{param|RadioFrameAllocationPeriod}} and {{param|RadioframeAllocationOffset}} parameters.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.RadioFrameAllocationSize";
+    }
+    leaf-list sub-frame-allocations {
+      type uint8 {
+        range "0 | 1";
+      }
+      config false;
+      max-elements "64";
+      description
+        "{{list}} The value of \"1\" indicates the position of sub-frames that is allocated to MBSFN within the radio frame. First item defines the MBSFN allocation for sub-frame #1, second item for #2, third item for #3, fourth item for #6, fifth item for #7, sixth item for #8. If the value of {{param|RadioFrameAllocationSize}} is 4, then this pattern repeats in the sequence of the four radio frames. The actual size of this parameter depends on the value of {{param|RadioFrameAllocationSize}} parameter. If the value of {{param|RadioFrameAllocationSize}} is 1, then the size of this parameter is 6; if the size {{param|RadioFrameAllocationSize}} is 4, then the size of this parameter is 24. Corresponds to subframeAllocation IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.SubFrameAllocations";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.MBSFN.SFConfigList.{i}.";
+  }
+
+  grouping lte-ran-phy-prs-g {
+    description
+      "This object contains parameters relating to the PRS (Positioning Reference Signal) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.9}}).";
+    leaf num-prs-resource-blocks {
+      type uint64;
+      units "Resource Blocks";
+      config false;
+      description
+        "Defines the number of RBs ({{units}}) used for PRS. Corresponds to the parameter NRBPRS in {{bibref|3GPP-TS.36.211|Section 6.10.4.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRS.NumPRSResourceBlocks";
+    }
+    leaf prs-configuration-index {
+      type uint16 {
+        range "0..4095";
+      }
+      config false;
+      description
+        "Corresponds to the PRS configuration index defined as parameter IPRS in {{bibref|3GPP-TS.36.211|Section 6.10.4.3 and Table 6.10.4.3.-1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRS.PRSConfigurationIndex";
+    }
+    leaf num-consecutive-prs-subfames {
+      type uint8 {
+        range "1..2 | 4 | 6";
+      }
+      config false;
+      description
+        "Defines the number of consecutive positioning sub-frames. Corresponds to the parameter NPRS in {{bibref|3GPP-TS.36.211|Section 6.10.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRS.NumConsecutivePRSSubfames";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.PRS.";
+  }
+
+  grouping lte-ran-phy-tdd-frame-g {
+    description
+      "This object is applicable to TDD mode only. This object contains parameters relating to the TDD frame structure configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.1.10}}).";
+    leaf sub-frame-assignment {
+      type uint8 {
+        range "0..6";
+      }
+      config false;
+      description
+        "Defines the DL/UL sub-frame configuration. Corresponds to subframAssignment specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and {{bibref|3GPP-TS.36.211|Table 4.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.TDDFrame.SubFrameAssignment";
+    }
+    leaf special-subframe-patterns {
+      type uint8 {
+        range "0..8";
+      }
+      config false;
+      description
+        "Defines the configuration of the special sub-frame that contains the guard period between the downlink and uplink transmissions. Corresponds to the specialSubframePatterns specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and {{bibref|3GPP-TS.36.211|Table 4.2.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.TDDFrame.SpecialSubframePatterns";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.PHY.TDDFrame.";
+  }
+
+  grouping lte-ran-mac-g {
+    description
+      "This object contains parameters relating to the MAC (Medium Access Control) configuration.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.";
+  }
+
+  grouping lte-ran-mac-rach-g {
+    description
+      "This object contains parameters relating to the RACH (Random Access Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.2.1}}).";
+    leaf-list number-of-ra-preambles {
+      type uint8 {
+        range "4..64";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a number of non-dedicated random access preambles. Only values in multiple of 4 are valid (i.e. 4, 8, 12, 16,...64); use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter numberOfRA-Preambles specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.1}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.NumberOfRaPreambles";
+    }
+    leaf-list size-of-ra-group-a {
+      type uint8 {
+        range "4..60";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a number of non-dedicated random access preambles in Random Acces Preambles group A. Only values in multiple of 4 are valid (i.e. 4, 8, 12, 16,...60); use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter sizeOfRA-PreamblesGroupA specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.1}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.SizeOfRaGroupA";
+    }
+    leaf-list message-size-group-a {
+      type uint16 {
+        range "56 | 144 | 208 | 256";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a threshold for preamble selection, specified in bits. In case there is more than one item in the list, the first item contains the most preferred value. Defined in {{bibref|3GPP-TS.36.321|Section 5.1.2}}. Corresponds to parameter messageSizeGroupA specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.MessageSizeGroupA";
+    }
+    leaf-list message-power-offset-group-b {
+      type int64;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a threshold for preamble selection, specified in dB. In case there is more than one item in the list, the first item contains the most preferred value. Defined in {{bibref|3GPP-TS.36.321|Section 5.1.2}}. Corresponds to parameter messagePowerOffsetGroupB specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. Value of -1 indicates \"minusinfinity.\" If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.MessagePowerOffsetGroupB";
+    }
+    leaf-list power-ramping-step {
+      type uint8 {
+        range "0 | 2 | 4 | 6";
+      }
+      config false;
+      min-elements 1;
+      max-elements "16";
+      description
+        "{{list}} Each item is a power increase factor between subsequent random access preamble transmissions, specified in dB. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter powerRampingStep specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.PowerRampingStep";
+    }
+    leaf-list preamble-initial-received-target-power {
+      type int64;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a value used as the baseline for computation for random access transmission power, specified in dBm. Also used as a parameter in the criteria for preamble selection. Only even values are valid (i.e. -120, -118, -116,...-90); use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter preambleInitialReceivedTargetPower specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.2}}. and section 5.1.3. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.PreambleInitialReceivedTargetPower";
+    }
+    leaf-list preamble-trans-max {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a maximum number of random access preamble transmissions, from the list of 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter preambleTransMax specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.4 and section 5.1.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.PreambleTransMax";
+    }
+    leaf-list response-window-size {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a duration of the random access response window, specified in sub-frames, with a numeric range between 2 and 10 inclusive (except value of 9). In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter ra-ResponseWindowSize specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.4}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.ResponseWindowSize";
+    }
+    leaf-list contention-resolution-timer {
+      type uint8 {
+        range "8..64";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a contention resolution timer, specified in sub-frames. Only values multiple of 8 are valid (i.e. 8, 16, 24,...64); use of other values within the defined range MUST be rejected by the CPE. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter mac-ContentionResolutionTimer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.1.5}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.ContentionResolutionTimer";
+    }
+    leaf-list max-harq-msg3-tx {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a maximum number of Msg3 HARQ transmissions by RRC, with a numeric range between 1 and 8 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter maxHARQ-Msg3Tx specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.4.2.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.MaxHARQMsg3Tx";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.RACH.";
+  }
+
+  grouping lte-ran-mac-drx-g {
+    description
+      "This object contains parameters relating to the DRX (Discontinuous Reception) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.2.2}}).";
+    leaf drx-enabled {
+      type boolean;
+      config false;
+      description
+        "Specifies whether DRX operation is enabled or not. If {{true}}, DRX operation is enabled. If {{false}}, DRX operation is not enabled. Corresponds to drx-Configuration IE defined in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.DRXEnabled";
+    }
+    leaf-list on-duration-timer {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is the DRX cycle during which UE actively monitors PDCCH, specified in number of PDCCH sub-frames, from the list of 1, 2, 3, 4, 5, 6, 8, 10, 20, 30, 40, 50, 60, 80, 100, 200. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter onDurationTimer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.OnDurationTimer";
+    }
+    leaf-list drx-inactivity-timer {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item defines the number of inactive consecutive PDCCH sub-frame(s) that will activate short DRX cycle, specified in number of PDCCH sub-frames, from the list of 1, 2, 3, 4, 5, 6, 8, 10, 20, 30, 40, 50, 60, 80, 100, 200, 300, 500, 750, 1280, 1920, 2560. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter drx-InactivityTimer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.DRXInactivityTimer";
+    }
+    leaf-list drx-retransmission-timer {
+      type uint8 {
+        range "1 | 2 | 4 | 6 | 8 | 16 | 24 | 33";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item defines the maximum number of consecutive PDCCH sub-frame(s) UE MUST remain active expecting a DL retransmission, specified in number of PDCCH sub-frames. In case there is more than one item in the list, the first item contains the most preferred value. The timer is started when a HARQ RTT Timer expires and the data in the soft buffer of the corresponding HARQ process was not successfully decoded. There is one timer for each active HARQ process. Corresponds to parameter drx-RetransmissionTimer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.7}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.DRXRetransmissionTimer";
+    }
+    leaf-list long-drx-cycle {
+      type uint16 {
+        range "10 | 20 | 32 | 40 | 64 | 80 | 128 | 160 | 256 | 320 | 512 | 640 | 1024 | 1280 | 2048 | 2560";
+      }
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is long DRX Cycle value, specified in number of sub-frames. In case there is more than one item in the list, the first item contains the most preferred value. If shortDRX-Cycle is configured, this value MUST be a multiple of the {{param|ShortDRXCycle}} value. Corresponds to longDRX-Cycle parameter specified in {{bibref|3GPP-TS.36.321|Section 5.7}} and longDRX-CycleStartOffset specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.LongDRXCycle";
+    }
+    leaf-list drx-start-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "512";
+      description
+        "{{list}} Each item defines the starting frame of the DRX cycle within the long DRX cycle, with a numeric range between 0 and 2559 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The valid value range is dependent on {{param|LongDRXCycle}} parameter which defines the upper bound of this range, i.e., range definition is [0: ({{param|LongDRXCycle}}-1)]. Corresponds to drxStartOffset parameter specified in {{bibref|3GPP-TS.36.321|Section 5.7}}. Use of values bigger than ({{param|LongDRXCycle}}-1) MUST be rejected by the CPE. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.DRXStartOffset";
+    }
+    leaf-list short-drx-cycle {
+      type uint16 {
+        range "2 | 5 | 8 | 10 | 16 | 20 | 32 | 40 | 64 | 80 | 128 | 160 | 256 | 320 | 512 | 640";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is the short DRX Cycle value, specified in number of sub-frames. In case there is more than one item in the list, the first item contains the most preferred value. If shortDRX-Cycle is configured, the value of {{param|LongDRXCycle}} MUST be a multiple of the {{param}} value. Corresponds to shortDRX-Cycle parameter specified in {{bibref|3GPP-TS.36.321|Section 5.7}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.ShortDRXCycle";
+    }
+    leaf-list drx-short-cycle-timer {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item defined the duration of the short DRX cycle in multiples of {{param|ShortDRXCycle}} parameter, specified in number of sub-frames, with a numeric range between 1 and 16 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Denotes the number of consecutive sub-frame(s)the UE shall follow the short DRX cycle after the DRX Inactivity Timer has expired. Corresponds to drxShortCycleTimer parameter specified in {{bibref|3GPP-TS.36.321|Section 5.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.DRXShortCycleTimer";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.DRX.";
+  }
+
+  grouping lte-ran-mac-ulsch-g {
+    description
+      "This object contains parameters relating to the ULSCH (Uplink Shared Channel) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.2.3}}).";
+    leaf max-harq-tx {
+      type uint8 {
+        range "1..8 | 10 | 12 | 16 | 20 | 24 | 28";
+      }
+      description
+        "Maximum number of UL HARQ transmissions. Corresponds to parameter maxHARQ-Tx specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.4.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.MaxHARQTx";
+    }
+    leaf periodic-bsr-timer {
+      type uint16 {
+        range "0 | 5 | 10 | 16 | 20 | 32 | 40 | 64 | 80 | 128 | 160 | 320 | 640 | 1280 | 2560";
+      }
+      units "subframes";
+      description
+        "Timer for Periodic BSR (Buffer Status Report) reporting, specified in number of {{units}}. UE transmits periodic BSR at the expiration of this timer. Corresponds to parameter periodicBSR-Timer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.4.5}}. Value of 0 indicates \"infinity.\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.PeriodicBSRTimer";
+    }
+    leaf retx-bsr-timer {
+      type uint16 {
+        range "320 | 640 | 1280 | 2560 | 5120 | 10240";
+      }
+      units "subframes";
+      description
+        "Timer for Regular BSR reporting, specified in number of {{units}}. UE transmits a Regular BSR at the expiration of this timer if data is available in the buffer. Corresponds to parameter retxBSR-Timer specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.RetxBSRTimer";
+    }
+    leaf tti-bundling {
+      type boolean;
+      description
+        "Enables/disables TTI bundling. If {{true}}, TTI bundling is enabled. If {{false}}, TTI bundling is disabled. Corresponds to parameter ttiBundling specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.321|Section 5.4.2.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.TTIBundling";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.MAC.ULSCH.";
+  }
+
+  grouping lte-ran-rlc-g {
+    description
+      "This object contains parameters relating to the RLC (Radio Link Control) configuration.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.";
+  }
+
+  grouping lte-ran-rlc-srb1-g {
+    description
+      "This object contains parameters relating to the SRB1 (Signaling Radio Bearer 1) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.3.1}}).";
+    leaf default-configuration {
+      type boolean;
+      config false;
+      description
+        "Indicates the whether default RLC configuration for SRB1 is used or not. If {{true}}, the default RLC configuration is used as specified in {{bibref|3GPP-TS.36.331|Section 9.2.1.1}}. In this case, rest of the parameters defined under the current object are ignored by the CPE. If {{false}}, rest of the parameters defined under the current object are used by the CPE for RLC configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.DefaultConfiguration";
+    }
+    leaf-list t-poll-retransmit {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a timer between successive poll transmissions, specified in milliseconds, specified in milliseconds, with a numeric range between 5 and 500 inclusive. Only the multiple of 5 are valid in the range between 5 and 250 inclusive (i.e. 5, 10, 15, 20,... 250), and only the multiple of 50 are valid in the range between 300 and 500 inclusive (i.e., 300, 350, 400, 450, 500). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-PollRetransmit IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.TPollRetransmit";
+    }
+    leaf-list poll-pdu {
+      type uint16 {
+        range "0 | 4 | 8 | 16 | 32 | 64 | 128 | 256";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a counter of PDUs between successive poll transmissions, specified in the number of PDUs. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to pollPDU IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2.1}}. Value of 0 indicates \"infinity.\" If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.PollPDU";
+    }
+    leaf-list poll-byte {
+      type uint16 {
+        range "0 | 25 | 50 | 75 | 100 | 125 | 250 | 375 | 500 | 750 | 1000 | 1250 | 1500 | 2000 | 3000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a counter of PDU bytes transmitted between successive poll transmissions, specified in kilobytes. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to pollByte IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2.1}}. Value of 0 indicates infinite amount of kilobytes. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.PollByte";
+    }
+    leaf-list max-retx-threshold {
+      type uint8 {
+        range "1..4 | 6 | 8 | 16 | 32";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item defines the maximum number of transmission retry used by the RLC entity to limit the number of retransmissions of an AMD PDU. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to maxRetxThreshold IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.1}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.MaxRetxThreshold";
+    }
+    leaf-list t-reordering {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item defines a timer used by the receiving side of an RLC entity in order to detect loss of RLC PDUs at lower layer, specified in milliseconds, with a numeric range between 0 and 200 inclusive. Only the multiple of 5 are valid in the range between 0 and 100 inclusive (i.e. 0, 5, 10, 15,...,100), and only the multiple of 10 are valid in the range between 110 and 200 inclusive (110, 120, 130,...,200). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-Reordering IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.1.2.2. and 5.1.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.TReordering";
+    }
+    leaf-list t-status-prohibit {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item defines a timer used by the receiving side of an AM RLC entity in order to prohibit transmission of a STATUS PDU, specified in milliseconds, with a numeric range between 0 and 500 inclusive. Only the multiple of 5 are valid in the range between 0 and 250 inclusive (i.e. 0, 5, 10, 15,...,250), and only the multiple of 50 are valid in the range between 300 and 500 inclusive (i.e. 300, 350, 400, 450, 500). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-StatusProhibit IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.3}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.TStatusProhibit";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB1.";
+  }
+
+  grouping lte-ran-rlc-srb2-g {
+    description
+      "This object contains parameters relating to the SRB2 (Signaling Radio Bearer 2) configuration (see {{bibref|3GPP-TS.32.592|Section 6.1.3.1}}).";
+    leaf default-configuration {
+      type boolean;
+      config false;
+      description
+        "Indicates the whether default RLC configuration for SRB1 is used or not. If {{true}}, the default RLC configuration is used as specified in {{bibref|3GPP-TS.36.331|Section 9.2.1.1}}. In this case, rest of the parameters defined under the current object are ignored by the CPE. If {{false}}, rest of the parameters defined under the current object are used by the CPE for RLC configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.DefaultConfiguration";
+    }
+    leaf-list t-poll-retransmit {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a timer between successive poll transmissions, specified in milliseconds, with a numeric range between 5 and 500 inclusive. Only the multiple of 5 are valid in the range between 5 and 250 inclusive (i.e. 5, 10, 15, 20,... 250), and only the multiple of 50 are valid in the range between 300 and 500 inclusive (i.e., 300, 350, 400, 450, 500). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-PollRetransmit IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.TPollRetransmit";
+    }
+    leaf-list poll-pdu {
+      type uint16 {
+        range "0 | 4 | 8 | 16 | 32 | 64 | 128 | 256";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a counter of PDUs between successive poll transmissions, specified in the number of PDUs. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to pollPDU IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2.1}}. Value of 0 indicates \"infinity.\" If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.PollPDU";
+    }
+    leaf-list poll-byte {
+      type uint16 {
+        range "0 | 25 | 50 | 75 | 100 | 125 | 250 | 375 | 500 | 750 | 1000 | 1250 | 1500 | 2000 | 3000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a counter of PDU bytes transmitted between successive poll transmissions, specified in kilobytes. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to pollByte IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.2.1}}. Value of 0 indicates infinite amount of kilobytes. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.PollByte";
+    }
+    leaf-list max-retx-threshold {
+      type uint8 {
+        range "1..4 | 6 | 8 | 16 | 32";
+      }
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item defines the maximum number of transmission retry used by the RLC entity to limit the number of retransmissions of an AMD PDU. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to maxRetxThreshold IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.1}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.MaxRetxThreshold";
+    }
+    leaf-list t-reordering {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item defines a timer used by the receiving side of an RLC entity in order to detect loss of RLC PDUs at lower layer, specified in milliseconds, with a numeric range between 0 and 200 inclusive. Only the multiple of 5 are valid in the range between 0 and 100 inclusive (i.e. 0, 5, 10, 15,...,100), and only the multiple of 10 are valid in the range between 110 and 200 inclusive (110, 120, 130,...,200). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-Reordering IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.1.2.2. and 5.1.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.TReordering";
+    }
+    leaf-list t-status-prohibit {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item defines a timer used by the receiving side of an AM RLC entity in order to prohibit transmission of a STATUS PDU, specified in milliseconds, with a numeric range between 0 and 500 inclusive. Only the multiple of 5 are valid in the range between 0 and 250 inclusive (i.e. 0, 5, 10, 15,...,250), and only the multiple of 50 are valid in the range between 300 and 500 inclusive (i.e. 300, 350, 400, 450, 500). If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. This parameter is valid only if {{param|DefaultConfiguration}} paramter under the current object is set to {{false}}. Corresponds to t-StatusProhibit IE specified in {{bibref|3GPP-TS.36.331|Section 6.3.2}} and in {{bibref|3GPP-TS.36.322|Section 5.2.3}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.TStatusProhibit";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RLC.SRB2.";
+  }
+
+  grouping lte-ran-rrc-timers-g {
+    description
+      "This object contains parameters relating to the RRC timers and constants (see {{bibref|3GPP-TS.32.592|Section 6.1.6.1}}) and (see {{bibref|3GPP-TS.32.592|Section 6.1.6.2}}).";
+    leaf-list t300 {
+      type uint16 {
+        range "100 | 200 | 300 | 400 | 600 | 1000 | 1500 | 2000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is an interval, in milliseconds, between subsequent transmissions of RRCConnectionRequest. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t300 specified in UE-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T300";
+    }
+    leaf-list t301 {
+      type uint16 {
+        range "100 | 200 | 300 | 400 | 600 | 1000 | 1500 | 2000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is an interval, in milliseconds, between subsequent transmissions of RRCConnectionReestablishmentRequest. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t301 specified in UE-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T301";
+    }
+    leaf t302 {
+      type uint16 {
+        range "100 | 200 | 300 | 400 | 600 | 1000 | 1500 | 2000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Time to wait in {{units}} for cell re-selection or RRConnectionSetup after RRCConnectionReject. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T302";
+    }
+    leaf-list t304-eutra {
+      type uint16 {
+        range "50 | 100 | 150 | 200 | 500 | 1000 | 2000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a HO failure timer, in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to t304 defined within IE MobilityControlInfo in RRCConnectionReconfiguration message in {{bibref|3GPP-TS.36.331|Section 5.3.5.4 and Section 6.3.4}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T304EUTRA";
+    }
+    leaf-list t304-irat {
+      type uint16 {
+        range "100 | 200 | 500 | 1000 | 2000 | 4000 | 8000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a HO failure timer, in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to t304 defined within IE CellChangeOrder in MobilityFromEUTRACommand message in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T304IRAT";
+    }
+    leaf-list t310 {
+      type uint16 {
+        range "0 | 50 | 100 | 200 | 500 | 1000 | 2000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a RLF declaration timer, in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t310 specified in RLF-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T310";
+    }
+    leaf-list t311 {
+      type uint16 {
+        range "1000 | 3000 | 5000 | 10000 | 15000 | 20000 | 30000";
+      }
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a RLF recovery timer, in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t311 specified in RLF-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6}}. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T311";
+    }
+    leaf t320 {
+      type uint8 {
+        range "5 | 10 | 20 | 30 | 60 | 120 | 180";
+      }
+      units "minutes";
+      config false;
+      description
+        "Time in {{units}} after RRCConnection Release in which cell re-selection priority info supplied in RRCConnectionRelease MUST be observed. Start/stop/expirary condition is defined in {{bibref|3GPP-TS.36.331|Section 7.3}}. Corresponds to parameter t320 specified in RRCConnectionRelease message in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. S";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.T320";
+    }
+    leaf n310 {
+      type uint8 {
+        range "1..4 | 6 | 8 | 10 | 20";
+      }
+      config false;
+      description
+        "Number of consecutive \"out-of-sync\" indications received from lower layers that triggers timer T310. Corresponds to parameter n310 specified in UE-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6 and Section 7.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.N310";
+    }
+    leaf n311 {
+      type uint8 {
+        range "1..6 | 8 | 10";
+      }
+      config false;
+      description
+        "Number of consecutive \"in-sync\" indications received from lower layers that stops timer T310. Corresponds to parameter n311 specified in UE-TimersAndConstants IE in {{bibref|3GPP-TS.36.331|Section 6.3.6 and Section 7.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.N311";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.RRCTimers.";
+  }
+
+  grouping lte-ran-cell-restriction-g {
+    description
+      "This object contains parameters relating to the cell restriction configuration.";
+    leaf cell-barred {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the is barred or not. If {{true}}, the cell is barred. If {{false}}, the cell is not barred. Corresponds to parameter CellBarred specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.CellRestriction.CellBarred";
+    }
+    leaf cell-reserved-for-operator-use {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the is reserved for operator's use or not. If {{true}}, the cell is reserved for operator use. If {{false}}, the cell is not reserved for operator use. Corresponds to parameter cellReservedForOperatorUse specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.CellRestriction.CellReservedForOperatorUse";
+    }
+    leaf barring-for-emergency {
+      type boolean;
+      config false;
+      description
+        "Indicates whether the is barred for Access Class 10 or not. If {{true}}, the cell is barred for Access Class 10. If {{false}}, the cell is not barred for Access Class 10. Corresponds to parameter ac-BarringForEmergency specified in SIB2 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.CellRestriction.BarringForEmergency";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.CellRestriction.";
+  }
+
+  grouping lte-ran-mobility-g {
+    description
+      "This object contains parameters relating to the UE's mobility configuration. It covers both idle mode and connected mode.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-g {
+    description
+      "This object contains parameters relating to the UE's mobility while it is in idle mode (cell (re-)selection). Parameters under this object determines the content in the SIB (System Information Block) that is broadcast by LTE .";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-common-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration that is common to all cell re-selection scenarios (intra/inter-freq, inter-RAT to UTRA (UMTS), GERAN (GSM) and CDMA2000) (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.1}}).";
+    leaf-list qhyst {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a hysteresis value applied to serving cell for evaluating cell ranking criteria specified in dB, with a numeric range between 0 and 24 inclusive. For the value greater than 6, only even numbers are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter q-Hyst specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.Qhyst";
+    }
+    leaf q-hyst-sf-medium {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Speed-dependent scaling factor for Qhyst in Medium-mobility state, specified in {{units}}. Corresponds to parameter q-HystSF:sf-Medium specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.QHystSFMedium";
+    }
+    leaf q-hyst-sf-high {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Speed-dependent scaling factor for Qhyst in High-mobility state, specified in {{units}}. Corresponds to parameter q-HystSF:sf-High specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.QHystSFHigh";
+    }
+    leaf t-evaluation {
+      type uint8 {
+        range "30 | 60 | 120 | 180 | 240";
+      }
+      units "seconds";
+      config false;
+      description
+        "Duration for evaluating allowed amount of cell re-selection(s) required to enter mobility states, specified in {{units}}. Corresponds to parameter t-Evaluation specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.4}} and to parameter TCRmax specified in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.TEvaluation";
+    }
+    leaf t-hyst-normal {
+      type uint8 {
+        range "30 | 60 | 120 | 180 | 240";
+      }
+      units "seconds";
+      config false;
+      description
+        "Additional duration for evaluating criteria to enter normal mobility state, specified in {{units}}. Specifies the additional time period for evaluating criteria to enter Normal-mobility state. Corresponds to parameter t-HystNormal specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.4}} and to parameter TCRmaxHyst specified in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.THystNormal";
+    }
+    leaf n-cell-change-medium {
+      type uint8 {
+        range "1..16";
+      }
+      config false;
+      description
+        "Defines the number of cell re-selections within TEvaluation to enter Medium-mobility state. Corresponds to parameter n-cellChangeMedium specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.4}} and to parameter NCR_M specified in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.NCellChangeMedium";
+    }
+    leaf n-cell-change-high {
+      type uint8 {
+        range "1..16";
+      }
+      config false;
+      description
+        "Defines the number of cell re-selections within TEvaluation to enter High-mobility state. Corresponds to parameter n-cellChangeHigh specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.4}} and to parameter NCR_H specified in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.NCellChangeHigh";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.Common.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-intra-freq-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for intra-freq re-selection scenario (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.2}}).";
+    leaf-list q-rx-lev-min-sib1 {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a required minimum received RSRP level of a E-UTRA cell for cell selection, specified in dBm, with a numeric range between -70 and -22 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter q-rxLevMin in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}} and in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.QRxLevMinSIB1";
+    }
+    leaf-list q-rx-lev-min-sib3 {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a required minimum received RSRP level for intra-frequency E-UTRA cell re-selection, specified in dBm, with a numeric range between -70 and -22 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter q-rxLevMin in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.QRxLevMinSIB3";
+    }
+    leaf q-rx-lev-min-offset {
+      type uint8 {
+        range "1..8";
+      }
+      units "dBm";
+      config false;
+      description
+        "Defines offset with respect to QrxLevMin, specified in {{units}}. This offset is taken into account in the computation of Srxlev for cell selection evaluation of cells detected during a periodic search for a higher priority PLMN while camped normally in a VPLMN. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter q-rxLevMinOffset in SIB1 specified in {{bibref|3GPP-TS.36.331|Section 6.2.2}} and in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.QRxLevMinOffset";
+    }
+    leaf-list s-intra-search {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a threshold for intra-frequency measurements, specified in dB, with a numeric range between 0 and 31 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter s-IntraSearch specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.SIntraSearch";
+    }
+    leaf-list t-reselection-eutra {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a cell re-selection timer for intra-frequency E-UTRA cell re-selection, specified in seconds, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t-ReselectionEUTRA specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.TReselectionEUTRA";
+    }
+    leaf-list s-non-intra-search {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a threshold for inter-frequency and inter-RAT measurements with lower or equal priority, specified in dB, with a numeric range between 0 and 31 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter s-NonIntraSearch specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.SNonIntraSearch";
+    }
+    leaf cell-reselection-priority {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Absolute priority of the E-UTRAN serving carrier frequency used in the inter-frequency and inter-RAT cell re-selection procedure. Corresponds to parameter CellReselectionPriority specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.CellReselectionPriority";
+    }
+    leaf p-max {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Used to limit the allowed UE uplink transmission power on the serving frequency, specified in {{units}}. It is used to calculate the parameter Pcompensation defined in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}. Corresponds to parameter p-Max specified in SIB1 and SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1 and Section 6.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.PMax";
+    }
+    leaf thresh-serving-low {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold for serving frequency used in evaluation of re-selection towards lower priority E-UTRAN frequency or inter-RAT, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshServingLow specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.ThreshServingLow";
+    }
+    leaf t-reselection-eutrasf-medium {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for intra-frequency TreselectionEUTRA in Medium-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionEUTRA-SF:sf-Medium specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.TReselectionEUTRASFMedium";
+    }
+    leaf t-reselection-eutrasf-high {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for intra-frequency TreselectionEUTRA in High-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionEUTRA-SF:sf-High specified in SIB3 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.TReselectionEUTRASFHigh";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IntraFreq.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-inter-freq-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for inter-freq re-selection scenario .";
+    leaf max-carrier-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.MaxCarrierEntries";
+    }
+    leaf carrier-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.CarrierNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-inter-freq-carrier-g {
+    description
+      "This object contains parameters relating to the carrier information for inter-freq re-selection scenario (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.3}}).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.Alias";
+    }
+    leaf eutra-carrier-arfcn {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Indicates the ARFCN of this frequency carrier. Corresponds to parameter dl-CarrierFreq in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.EUTRACarrierARFCN";
+    }
+    leaf-list q-rx-lev-min-sib5 {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a required minimum received RSRP level on this E-UTRA frequency carrier, spcified in dBm, with a numeric range between -70 and -22 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter q-rxLevMin in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.QRxLevMinSIB5";
+    }
+    leaf-list q-offset-freq {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is an offset applicable between serving and this frequency carrier, specified in dBm, with a numeric range between -24 and 24 inclusive. For values less than or equal to -6, or values greater than or equal to 6, only the even values are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter q-OffsetFreq in SIB5 specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.4.2.6}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.QOffsetFreq";
+    }
+    leaf-list t-reselection-eutra {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a cell re-selection timer for inter-frequency cell re-selection to this E-UTRA frequency carrier, specified in seconds, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t-ReselectionEUTRA specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.TReselectionEUTRA";
+    }
+    leaf cell-reselection-priority {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Absolute priority of this E-UTRA frequency carrier, as used by the inter-frequency cell re-selection procedure. Corresponds to parameter CellReselectionPriority specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.CellReselectionPriority";
+    }
+    leaf thresh-x-high {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting from a lower priority E-UTRAN frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-High specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.ThreshXHigh";
+    }
+    leaf thresh-x-low {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting from a higher priority E-UTRAN frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-Low specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.ThreshXLow";
+    }
+    leaf p-max {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Used to limit the allowed UE uplink transmission power on this carrier frequency, specified in {{units}}. It is used to calculate the parameter Pcompensation defined in {{bibref|3GPP-TS.36.304|Section 5.2.3.2}}. Corresponds to parameter p-Max specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.PMax";
+    }
+    leaf t-reselection-eutrasf-medium {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionEUTRA for inter-frequency re-selection to this frequency carrier in Medium-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionEUTRA-SF:sf-Medium specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.TReselectionEUTRASFMedium";
+    }
+    leaf t-reselection-eutrasf-high {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionEUTRA for inter-frequency re-selection to this frequency carrier in High-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionEUTRA-SF:sf-High specified in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.TReselectionEUTRASFHigh";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.InterFreq.Carrier.{i}.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for inter-RAT (Radio Access Technology) re-selection scenario.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-utra-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for inter-RAT (Radio Access Technology) re-selection, specifically for re-selection to UTRA (UMTS) scenario (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.4}}).";
+    leaf-list t-reselection-utra {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a cell re-selection timer for re-selection to a UTRA frequency carrier, specified in seconds, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t-ReselectionUTRA specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.TReselectionUTRA";
+    }
+    leaf t-reselection-utrasf-medium {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionUTRA for inter-RAT re-selection to UTRA in Medium-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionUTRA-SF:sf-Medium specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.TReselectionUTRASFMedium";
+    }
+    leaf t-reselection-utrasf-high {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionEUTRA for inter-frequency re-selection to this frequency carrier in High-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionUTRA-SF:sf-High specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.TReselectionUTRASFHigh";
+    }
+    leaf max-utranfdd-freq-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.MaxUTRANFDDFreqEntries";
+    }
+    leaf utranfdd-freq-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreqNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-utra-utranfdd-freq-g {
+    description
+      "This object contains parameters relating to the channel frequncy related information of UTRA (UMTS) system (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.5, 6.1.5.1.6}}).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.Alias";
+    }
+    leaf utra-carrier-arfcn {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "Indicates the ARFCN of the frequency carrier. Corresponds to parameter CarrierFreq in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.UTRACarrierARFCN";
+    }
+    leaf-list q-rx-lev-min {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a required minimum received RSCP level on this UTRA frequency carrier, specified in dBm, with a numeric range between -60 and -13 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2 + 1) yields the actual value. Corresponds to parameter q-RxLevMin in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.25.304|Section 5.2.3.1.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.QRxLevMin";
+    }
+    leaf-list q-qual-min {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a required minimum received Ec/Io level on this UTRA FDD carrier, specified in dB, with a numeric range between -24 and 0 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter q-QualMin in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.25.304|Section 5.2.3.1.2}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.QQualMin";
+    }
+    leaf cell-reselection-priority {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Absolute priority of this UTRA FDD frequency carrier, as used by the inter-frequency cell re-selection procedure. Corresponds to parameter CellReselectionPriority specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.CellReselectionPriority";
+    }
+    leaf thresh-x-high {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a higher priority UTRA FDD frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-High specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.ThreshXHigh";
+    }
+    leaf thresh-x-low {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a lower priority UTRA FDD frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-Low specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.ThreshXLow";
+    }
+    leaf p-max-utra {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Used to limit the allowed UE uplink transmission power on this UTRA FDD carrier frequency, specified in {{units}}. It is used to calculate the parameter Pcompensation defined in {{bibref|3GPP-TS.25.304|Section 5.2.3.1.2}}. Corresponds to parameter p-MaxUTRA specified in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.PMaxUTRA";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.UTRA.UTRANFDDFreq.{i}.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-geran-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for inter-RAT (Radio Access Technology) re-selection, specifically for re-selection to GERAN (GSM) scenario (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.6}}).";
+    leaf-list t-reselection-geran {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a cell re-selection timer for re-selection to a GERAN frequency carrier, specified in seconds, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t-ReselectionGERAN specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and to TreselectionGERA in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.TReselectionGERAN";
+    }
+    leaf t-reselection-geransf-medium {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionGERAN for inter-RAT re-selection to GERAN in Medium-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionGERAN-SF:sf-Medium specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.TReselectionGERANSFMedium";
+    }
+    leaf t-reselection-geransf-high {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TreselectionGERAN for inter-RAT re-selection to GERAN in High-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionGERAN-SF:sf-High specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.TReselectionGERANSFHigh";
+    }
+    leaf max-geran-freq-group-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.MaxGERANFreqGroupEntries";
+    }
+    leaf geran-freq-group-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroupNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-geran-geran-freq-group-g {
+    description
+      "This object contains parameters relating to the channel frequncy related information of GERAN (GSM) system (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.7}}).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.Alias";
+    }
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BandIndicator - GSM850";
+        }
+        enum "gsm900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BandIndicator - GSM900";
+        }
+        enum "dcs1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BandIndicator - DCS1800";
+        }
+        enum "pcs1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BandIndicator - PCS1900";
+        }
+      }
+      config false;
+      description
+        "Indicates how to interpret the BCCH ARFCN. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BandIndicator";
+    }
+    leaf bccharfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      description
+        "ARFCN of this cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.BCCHARFCN";
+    }
+    leaf-list q-rx-lev-min {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is a required minimum received RSSI level on this GERAN frequency carrier for re-selection to this UTRA FDD carrier, specified in dBm, with a numeric range between 0 and 63 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. The value of ({{param}} * 2 - 115) yields the actual value. Corresponds to parameter q-rxLevMin in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and to RXLEV_ACCESS_MIN in {{bibref|3GPP-TS.45.008}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.QRxLevMin";
+    }
+    leaf cell-reselection-priority {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Absolute priority of this GERAN frequency group, as used by the inter-frequency cell re-selection procedure. Corresponds to parameter CellReselectionPriority specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.CellReselectionPriority";
+    }
+    leaf thresh-x-high {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a higher priority GERAN frequency group than current serving E-UTRA frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-High specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.ThreshXHigh";
+    }
+    leaf thresh-x-low {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a lower priority GERAN frequency group than current serving E-UTRA frequency, specified in {{units}} dB. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-Low specified in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.ThreshXLow";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.GERAN.GERANFreqGroup.{i}.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-cdma2000-g {
+    description
+      "This object contains parameters relating to the idle mode mobility configuration for inter-RAT (Radio Access Technology) re-selection, specifically for re-selection to CDMA2000 system scenario (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.8}}).";
+    leaf-list search-window-size {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a CDMA2000 parameter affecting the search for neighbouring pilots, with a numeric range between 0 and 15 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter searchWindowSize in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP2-C.S0005-A|Table 2.6.6.2.1-1}} and {{bibref|3GPP2-C.S0024-A|Table 8.7.6.2-4}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.SearchWindowSize";
+    }
+    leaf-list t-reselection-cdma2000 {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "32";
+      description
+        "{{list}} Each item is a cell re-selection timer for a CDMA2000 band, specified in seconds, with a numeric range between 0 and 7 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter t-ReselectionCDMA2000 specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and to TreselectionCDMA_HRPD or TreselectionCDMA_1xRTT in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.TReselectionCDMA2000";
+    }
+    leaf t-reselection-cdma2000-sf-medium {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TReselectionCDMA2000 for inter-RAT re-selection to CDMA2000 in Medium-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionCDMA2000-SF:sf-Medium specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.TReselectionCDMA2000SFMedium";
+    }
+    leaf t-reselection-cdma2000-sf-high {
+      type uint8 {
+        range "25 | 50 | 75 | 100";
+      }
+      config false;
+      description
+        "Scaling factor for TReselectionCDMA2000 for inter-RAT re-selection to CDMA2000 in High-mobility state. The value of {{param}} divided by 100 yields the actual SF value. Corresponds to parameter t-ReselectionCDMA2000-SF:sf-High specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.TReselectionCDMA2000SFHigh";
+    }
+    leaf max-cdma2000-band-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.MaxCDMA2000BandEntries";
+    }
+    leaf cdma2000-band-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000BandNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.";
+  }
+
+  grouping lte-ran-mobility-idle-mode-irat-cdma2000-cdma2000-band-g {
+    description
+      "This object contains parameters relating to the channel frequncy related information of CDMA2000 system (see {{bibref|3GPP-TS.32.592|Section 6.1.5.1.8}}).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.Alias";
+    }
+    leaf band-class {
+      type uint8 {
+        range "0..17";
+      }
+      units "bandclass number";
+      description
+        "Defines the CDMA2000 band in which the CDMA2000 carrier frequency can be found, specified in {{units}}. BandClass is defined in 3GPP2 C.S0057-B Table 1.5-1. Corresponds to parameter bandClass specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.BandClass";
+    }
+    leaf cell-reselection-priority {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Absolute priority of this CDMA2000 band used by the inter-frequency cell re-selection procedure. Corresponds to parameter CellReselectionPriority specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.7}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.CellReselectionPriority";
+    }
+    leaf thresh-x-high {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a higher priority CDMA2000 band than current serving E-UTRA frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-High specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.ThreshXHigh";
+    }
+    leaf thresh-x-low {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "Threshold used when re-selecting towards a lower priority CDMA2000 band than current serving E-UTRA frequency, specified in {{units}}. The value of ({{param}} * 2) yields the actual value. Corresponds to parameter threshX-Low specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}} and in {{bibref|3GPP-TS.36.304|Section 5.2.4.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.ThreshXLow";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.IdleMode.IRAT.CDMA2000.CDMA2000Band.{i}.";
+  }
+
+  grouping lte-ran-mobility-conn-mode-g {
+    description
+      "This object contains parameters relating to the UE's mobility while it is in connected mode (handover). Parameters under this object determines the content in the SIB (System Information Block) that is broadcast by LTE .";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.";
+  }
+
+  grouping lte-ran-mobility-conn-mode-eutra-g {
+    description
+      "This object contains parameters relating to the connected mode mobility (handover) configuration within LTE system (see {{bibref|3GPP-TS.32.592|Section 6.1.5.2.1}}).";
+    leaf-list filter-coefficient-rsrp {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a filtering coefficient used for RSRP measurements, with a numeric range between 0 and 19 inclusive. For values greater than 9, only odd values are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to filterCoefficientRSRP parameter specified in QuantityConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.FilterCoefficientRSRP";
+    }
+    leaf-list filter-coefficient-rsrq {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a filtering coefficient used for RSRQ measurements, with a numeric range between 0 and 19 inclusive. For values greater than 9, only odd values are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to filterCoefficientRSRQ parameter specified in QuantityConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.FilterCoefficientRSRQ";
+    }
+    leaf a1-threshold-rsrp {
+      type uint8 {
+        range "0..97";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A1. Valid only if {{param|TriggerQuantity}} is {{enum|RSRP|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133|Table 9.1.4-1}}. Corresponds to parameter a1-Threshold:threshold-RSRP specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A1ThresholdRSRP";
+    }
+    leaf a1-threshold-rsrq {
+      type uint8 {
+        range "0..34";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A1. Valid only if {{param|TriggerQuantity}} is {{enum|RSRQ|TriggerQuantity}}. Mapping to actual values is specified in 3GPP TS 36.133}} table 9.1.7-1. Corresponds to parameter a1-Threshold:threshold-RSRQ specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A1ThresholdRSRQ";
+    }
+    leaf a2-threshold-rsrp {
+      type uint8 {
+        range "0..97";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A2. Valid only if {{param|TriggerQuantity}} is {{enum|RSRP|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133|Table 9.1.4-1}}. Corresponds to parameter a2-Threshold:threshold-RSRP specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A2ThresholdRSRP";
+    }
+    leaf a2-threshold-rsrq {
+      type uint8 {
+        range "0..34";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A2. Valid only if {{param|TriggerQuantity}} is {{enum|RSRQ|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133|Table 9.1.7-1}}. Corresponds to parameter a2-Threshold:threshold-RSRQ specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A2ThresholdRSRQ";
+    }
+    leaf-list a3-offset {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "256";
+      description
+        "{{list}} Each item is an offset to be used in evaluation of EUTRA measurement report triggering condition for event A3, with a numeric range between -30 and 30 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a3-Offset specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A3Offset";
+    }
+    leaf report-on-leave {
+      type boolean;
+      config false;
+      description
+        "Indicates whether or not the UE shall initiate the measurement reporting procedure when the leaving condition is met for event A3 for a cell in cellsTriggeredList, as specified in {{bibref|3GPP-TS.36.331|Section 5.5.4.1 and Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportOnLeave";
+    }
+    leaf a4-threshold-rsrp {
+      type uint8 {
+        range "0..97";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A4. Valid only if {{param|TriggerQuantity}} is {{enum|RSRP|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a4-Threshold:threshold-RSRP specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A4ThresholdRSRP";
+    }
+    leaf a4-threshold-rsrq {
+      type uint8 {
+        range "0..34";
+      }
+      config false;
+      description
+        "Threshold to be used in EUTRA measurement report triggering condition for event A4. Valid only if {{param|TriggerQuantity}} is {{enum|RSRQ|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a4-Threshold:threshold-RSRQ specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A4ThresholdRSRQ";
+    }
+    leaf a5-threshold1-rsrp {
+      type uint8 {
+        range "0..97";
+      }
+      config false;
+      description
+        "Threshold1 to be used in EUTRA measurement report triggering condition for event A5. Valid only if {{param|TriggerQuantity}} is {{enum|RSRP|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a5-Threshold1:threshold-RSRP specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A5Threshold1RSRP";
+    }
+    leaf a5-threshold1-rsrq {
+      type uint8 {
+        range "0..34";
+      }
+      config false;
+      description
+        "Threshold1 to be used in EUTRA measurement report triggering condition for event A5. Valid only if {{param|TriggerQuantity}} is {{enum|RSRQ|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a5-Threshold1:threshold-RSRQ specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A5Threshold1RSRQ";
+    }
+    leaf a5-threshold2-rsrp {
+      type uint8 {
+        range "0..97";
+      }
+      config false;
+      description
+        "Threshold2 to be used in EUTRA measurement report triggering condition for event A5. Valid only if {{param|TriggerQuantity}} is {{enum|RSRP|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a5-Threshold2:threshold-RSRP specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A5Threshold2RSRP";
+    }
+    leaf a5-threshold2-rsrq {
+      type uint8 {
+        range "0..34";
+      }
+      config false;
+      description
+        "Threshold2 to be used in EUTRA measurement report triggering condition for event A5. Valid only if {{param|TriggerQuantity}} is {{enum|RSRQ|TriggerQuantity}}. Mapping to actual values is specified in {{bibref|3GPP-TS.36.133}}. Corresponds to parameter a5-Threshold2:threshold-RSRQ specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.A5Threshold2RSRQ";
+    }
+    leaf-list hysteresis {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a hysteresis value applied to entry and leave condition of a report triggering event, with a numeric range between 0 and 30 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter hysteresis specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.Hysteresis";
+    }
+    leaf-list time-to-trigger {
+      type uint16 {
+        range "0 | 40 | 64 | 80 | 100 | 128 | 160 | 256 | 320 | 480 | 512 | 640 | 1024 | 1280 | 2560 | 5120";
+      }
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a time period during which measurement report triggering condition needs to be met in order to trigger a measurement report, specified in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter timeToTrigger specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.TimeToTrigger";
+    }
+    leaf trigger-quantity {
+      type enumeration {
+        enum "rsrp" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.TriggerQuantity - RSRP";
+        }
+        enum "rsrq" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.TriggerQuantity - RSRQ";
+        }
+      }
+      config false;
+      description
+        "Quantities used to evaluate a measurement report triggering condition. Corresponds to parameter triggerQuantity specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.TriggerQuantity";
+    }
+    leaf report-quantity {
+      type enumeration {
+        enum "same-as-trigger-quantity" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportQuantity - SameAsTriggerQuantity";
+        }
+        enum "both" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportQuantity - Both";
+        }
+      }
+      config false;
+      description
+        "Measrument quantities to be included in the measurement report. Corresponds to parameter reportQuantity specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The value {{enum|Both}} specifies that both the RSRP and RSRQ quantities are to be included in the measurement report.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportQuantity";
+    }
+    leaf max-report-cells {
+      type uint8 {
+        range "1..8";
+      }
+      description
+        "Maximum number of cells that can be included in a measurement report. Corresponds to parameter maxReportCells specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.MaxReportCells";
+    }
+    leaf report-interval {
+      type uint32 {
+        range "120 | 240 | 480 | 640 | 1024 | 2048 | 5120 | 10240 | 60000 | 360000 | 720000 | 1800000 | 3600000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Interval between successive measurement reports, specified in {{units}}. Corresponds to parameter reportInterval specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportInterval";
+    }
+    leaf report-amount {
+      type uint8 {
+        range "0..2 | 4 | 8 | 16 | 32 | 64";
+      }
+      config false;
+      description
+        "Number of times a measurement report is sent. Corresponds to parameter reportAmount specified in ReportConfigEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. Value of 0 indicates \"infinity.\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.ReportAmount";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.EUTRA.";
+  }
+
+  grouping lte-ran-mobility-conn-mode-irat-g {
+    description
+      "This object contains parameters relating to the connected mode mobility (handover) configuration that is common to all inter-RAT handover scenarios (UTRA (UMTS), GERAN (GSM) and CDMA2000) (see {{bibref|3GPP-TS.32.592|Section 6.1.5.2.2}}).";
+    leaf-list qoffsett-utra {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a UTRA-specific offset to be applied when evaluating triggering conditions for measurement reporting in connected mode, with a numeric range between -15 and 15 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter offsetFreq included in the IE MeasObjectUTRA specified in {{bibref|3GPP-TS.36.331}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.QoffsettUTRA";
+    }
+    leaf-list filter-coefficient-utra {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a filtering coefficient used for UTRA measurements, with a numeric range between 0 and 19 inclusive. For values greater than 9, only odd values are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to filterCoefficient parameter specified in QuantityConfigUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.FilterCoefficientUTRA";
+    }
+    leaf meas-quantity-utrafdd {
+      type enumeration {
+        enum "cpich-rscp" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityUTRAFDD - CPICH-RSCP";
+        }
+        enum "cpich-ec-n0" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityUTRAFDD - CPICH-EcN0";
+        }
+      }
+      config false;
+      description
+        "Measurement quantity used for UTRA measurements. Corresponds to measQuantityUTRA-FDD parameter specified in QuantityConfigUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityUTRAFDD";
+    }
+    leaf b1-threshold-utrarscp {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "RSCP threshold to be used in UTRA measurement report triggering condition for event B1. Mapping to actual {{units}} values is specified in 3GPP TS 25.133}}. Corresponds to parameter b1-ThresholdUTRA:utra-RSCP specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B1ThresholdUTRARSCP";
+    }
+    leaf b1-threshold-utra-ec-n0 {
+      type uint8 {
+        range "0..49";
+      }
+      units "dBm";
+      config false;
+      description
+        "EcNo threshold to be used in UTRA measurement report triggering condition for event B1. Mapping to actual {{units}} values is specified in 3GPP TS 25.133}}. Corresponds to parameter b1-ThresholdUTRA:utra-EcNo specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B1ThresholdUTRAEcN0";
+    }
+    leaf-list qoffset-geran {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a GERAN-specific offset to be applied when evaluating triggering conditions for measurement reporting in connected mode, with a numeric range between -15 and 15 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter offsetFreq included in the IE MeasObjectGERAN specified in {{bibref|3GPP-TS.36.331}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.QoffsetGERAN";
+    }
+    leaf-list filter-coefficient-geran {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "64";
+      description
+        "{{list}} Each item is a filtering coefficient used for GERAN measurements, with a numeric range between 0 and 19 inclusive. For values greater than 9, only odd values are valid. If the value is other than these, the CPE MUST reject the value. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to filterCoefficient parameter specified in QuantityConfigGERAN IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.FilterCoefficientGERAN";
+    }
+    leaf b1-threshold-geran {
+      type uint8 {
+        range "0..63";
+      }
+      units "dBm";
+      config false;
+      description
+        "Threshold to be used in GERAN measurement report triggering condition for event B1. Mapping to actual {{units}} values is specified in 3GPP TS 45.008}}. Corresponds to parameter b1-ThresholdGERAN specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B1ThresholdGERAN";
+    }
+    leaf-list qoffset-cdma2000 {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a CDMA2000-specific offset to be applied when evaluating triggering conditions for measurement reporting in connected mode, with a numeric range between -15 and 15 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter offsetFreq included in the IE MeasObjectCDMA2000 specified in {{bibref|3GPP-TS.36.331}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.QoffsetCDMA2000";
+    }
+    leaf meas-quantity-cdma2000 {
+      type enumeration {
+        enum "pilot-strength" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityCDMA2000 - PilotStrength";
+        }
+        enum "pilot-pn-phase-and-pilot-strength" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityCDMA2000 - PilotPnPhaseAndPilotStrength";
+        }
+      }
+      config false;
+      description
+        "Measurement quantity used for CDMA2000 measurements. Corresponds to measQuantityCDMA2000 parameter specified in QuantityConfigCDMA2000 IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MeasQuantityCDMA2000";
+    }
+    leaf b1-threshold-cdma2000 {
+      type uint8 {
+        range "0..63";
+      }
+      units "dBm";
+      config false;
+      description
+        "Threshold to be used in CDMA2000 measurement report triggering condition for event B1. Mapping to actual {{units}} values is specified in {{bibref|3GPP-TS.45.008}}. Corresponds to parameter b1-ThresholdCDMA2000 specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B1ThresholdCDMA2000";
+    }
+    leaf b2-threshold2-utrarscp {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "RSCP threshold to be used in UTRA measurement report triggering condition for event B2. Mapping to actual {{units}} values is specified in {{bibref|3GPP-TS.25.133}}. Corresponds to parameter b2-Threshold2UTRA:utra-RSCP specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B2Threshold2UTRARSCP";
+    }
+    leaf b2-threshold2-utra-ec-n0 {
+      type uint8 {
+        range "0..49";
+      }
+      units "dBm";
+      config false;
+      description
+        "EcNo threshold to be used in UTRA measurement report triggering condition for event B2. Mapping to actual {{units}} values is specified in 3GPP TS 25.133}}. Corresponds to parameter b2-Threshold2UTRA:utra-EcNo specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B2Threshold2UTRAEcN0";
+    }
+    leaf b2-threshold2-geran {
+      type uint8 {
+        range "0..63";
+      }
+      units "dBm";
+      config false;
+      description
+        "Threshold to be used in GERAN measurement report triggering condition for event B2. Mapping to actual {{units}} values is specified in 3GPP TS 45.008}}. Corresponds to parameter b2-Threshold2GERAN specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B2Threshold2GERAN";
+    }
+    leaf b2-threshold2-cdma2000 {
+      type uint8 {
+        range "0..63";
+      }
+      units "dBm";
+      config false;
+      description
+        "Threshold to be used in CDMA2000 measurement report triggering condition for event B2. Mapping to actual {{units}} values is specified in 3GPP TS 45.008}}. Corresponds to parameter b2-Threshold2CDMA2000 specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.B2Threshold2CDMA2000";
+    }
+    leaf-list hysteresis {
+      type string;
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a hysteresis value applied to entry and leave condition of an IRAT report triggering event, with a numeric range between 0 and 30 inclusive. In case there is more than one item in the list, the first item contains the most preferred value. Corresponds to parameter hysteresis specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. The multiplicity of the {{param}} values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. If this notation is used, then the list contains at least 2 items: \"<preferred-value>,<lower-bound>..<upper-bound>\". If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.Hysteresis";
+    }
+    leaf-list time-to-trigger {
+      type uint16 {
+        range "0 | 40 | 64 | 80 | 100 | 128 | 160 | 256 | 320 | 480 | 512 | 640 | 1024 | 1280 | 2560 | 5120";
+      }
+      config false;
+      min-elements 1;
+      max-elements "128";
+      description
+        "{{list}} Each item is a time period during which IRAT measurement report triggering condition needs to be met in order to trigger IRAT measurement report, specified in milliseconds. In case there is more than one item in the list, the first item contains the most preferred value.. Corresponds to parameter timeToTrigger specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. If supports self-configuration capability for {{param}} and more than one item is configured, then is expected to select one from the list and overwrite this parameter containing only the one selected. If does not support self-configuration capability for {{param}} and more than one item is configured, then accepts the first value and ignore the rest. If only one item is configured regardless of the self-configuration capability of , accepts the value as an explicit configuration by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.TimeToTrigger";
+    }
+    leaf max-report-cells {
+      type uint8 {
+        range "1..8";
+      }
+      description
+        "Maximum number of IRAT cells that can be included in a measurement report. Corresponds to parameter maxReportCells specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.MaxReportCells";
+    }
+    leaf report-interval {
+      type uint32 {
+        range "120 | 240 | 480 | 640 | 1024 | 2048 | 5120 | 10240 | 60000 | 360000 | 720000 | 1800000 | 3600000";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Interval between successive IRAT measurement reports, specified in {{units}}. Corresponds to parameter reportInterval specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.ReportInterval";
+    }
+    leaf report-amount {
+      type uint8 {
+        range "0..2 | 4 | 8 | 16 | 32 | 64";
+      }
+      config false;
+      description
+        "Number of times an IRAT measurement report is sent. Corresponds to parameter reportAmount specified in ReportConfigInterRAT IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. Value of 0 indicates \"infinity.\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.ReportAmount";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.Mobility.ConnMode.IRAT.";
+  }
+
+  grouping lte-ran-neighbor-list-g {
+    description
+      "This object contains parameters relating to the neighbor list.";
+    leaf max-lte-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.MaxLTECellEntries";
+    }
+    leaf lte-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.";
+  }
+
+  grouping lte-ran-neighbor-list-lte-cell-g {
+    description
+      "Table containing the E-UTRA (i.e. intra-RAT) cell list provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.PLMNID";
+    }
+    leaf cid {
+      type uint32 {
+        range "0..268435455";
+      }
+      description
+        "Cell Identity. {{bibref|3GPP-TS.36.331|Section 6.3.4}}. Combination of {{param|PLMNID}} and {{param}} constitutes the Cell Global ID (CGI).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.CID";
+    }
+    leaf eutra-carrier-arfcn {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Indicates the ARFCN of this carrier frequency. Corresponds to parameter dl-CarrierFreq in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}, and and parameter NDL in {{bibref|3GPP-TS.36.101|Section 5.7.3}}. If the value of {{param}} is the same with the one currently being used by the, then it implies that this neighbor cell is an intra-frequency cell; otherwise, it is an inter-frequency cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.EUTRACarrierARFCN";
+    }
+    leaf phy-cell-id {
+      type uint16 {
+        range "0..503";
+      }
+      config false;
+      description
+        "Physical cell ID, as specified in {{bibref|3GPP-TS.36.211|Section 6.11}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.PhyCellID";
+    }
+    leaf q-offset {
+      type int64;
+      config false;
+      description
+        "Indicate a cell-specific offset applicable to a specific neighbouring cell. It is used for evaluating the cell as a candidate for cell re-selection in idle mode. Corresponds to parameter q-OffsetCell broadcast in SIB4 for intra-frequency cells and in SIB5 for inter-frequency cells, specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}}. For the value less than or equal to -8, and bigger than or equal to 8, only even numbers are valid. If the value is other than these, the CPE MUST reject the value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.QOffset";
+    }
+    leaf cio {
+      type int64;
+      config false;
+      description
+        "Cell individual offset applicable to a specific neighbouring cell. It is used for evaluating triggering conditions for measurement reporting in connected mode. Specified by cellIndividualOffset in MeasObjectEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}. For the value less than or equal to -8, and bigger than or equal to 8, only even numbers are valid. If the value is other than these, the CPE MUST reject the value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.CIO";
+    }
+    leaf rs-tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "The downlink reference-signal transmit power, specified in {{units}}. Defined as the linear average over the power contributions (in W) of all resource elements that carry cell-specific reference signals within the operating system bandwidth. Corresponds to parameter referenceSignalPower in SIB4 as a part of PDSCH-Config IE in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.RSTxPower";
+    }
+    leaf blacklisted {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this neighbor cell is allowed for UEs as handover target or not. If {{true}}, handover is prohibited towards this cell. If {{false}}, handover is allowed toward this cell. The {{param}} parameter allows this cell to be prohibited as a handover target, while still allowing this cell to be included in the BCCH SIB4 or 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.Blacklisted";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.LTECell.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-inter-rat-cell-g {
+    description
+      "The inter-RAT cell lists separated by technology. {{bibref|3GPP-TS.36.331|Section 6.3.1 (SIB6, 7, 8)}}.";
+    leaf max-umts-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.}} table. There can be maximum of 16 UTRAN (UMTS) neighbor cells, as specified by carrierFreqListUTRA-FDD in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.MaxUMTSEntries";
+    }
+    leaf max-gsm-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.}} table. There can be maximum of 16 GERAN (GSM) neighbor cells, as specified by carrierFreqsInfoList in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.MaxGSMEntries";
+    }
+    leaf max-cdma2000-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.}} table. There can be maximum of 32 bandclasses. In each bandclass, there can be maximum of 16 CDMA2000 carrier frequencies. In each carrier, there can be maximum of 16 CDMA2000 neighbor cells (PN offset). It is specified by neighCellList in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.MaxCDMA2000Entries";
+    }
+    leaf umts-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTSNumberOfEntries";
+    }
+    leaf gsm-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSMNumberOfEntries";
+    }
+    leaf cdma2000-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000NumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.";
+  }
+
+  grouping lte-ran-neighbor-list-inter-rat-cell-umts-g {
+    description
+      "Table containing the inter-RAT cell list for UTRA (UMTS) provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "RNC-ID of an intra-RAT UMTS neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Cell Identifier (C-id) that identifies a cell within an RNS. This Cell Identifier together with the controlling RNC (RNC-ID) constitutes the UTRAN Cell ID (UC-ID) and is used to identify a cell uniquely within UTRAN. C-ID is either 12-bit or 16-bit value. {{bibref|3GPP-TS.25.401|Section 6.1.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      config false;
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.URA";
+    }
+    leaf uarfcnul {
+      type uint16 {
+        range "0..16383";
+      }
+      config false;
+      description
+        "The UL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.UARFCNUL";
+    }
+    leaf uarfcndl {
+      type uint16 {
+        range "0..16383";
+      }
+      config false;
+      description
+        "The DL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.UARFCNDL";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      config false;
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.PCPICHScramblingCode";
+    }
+    leaf pcpich-tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "Primary CPICH Tx power in {{units}}. Actual values of the power are -10.0 {{units}} to 50.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the power. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 2.2.33}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.PCPICHTxPower";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.UMTS.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-inter-rat-cell-gsm-g {
+    description
+      "Table containing the inter-RAT cell list for GERAN (GSM) provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.MustInclude";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.LAC";
+    }
+    leaf bsic {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "BSIC of the cell per {{bibref|3GPP-TS.23.003}}, consisting of: :Bit 7:6 - not used (\"00\") :Bit 5:3 - NCC (PLMN Color Code) :Bit 2:0 - BCC (BS color code) For example, if NCC is 7 and BCC is 2 you would have 00111010 (binary) or 0x3A (hex), and the value of this parameter would be 58.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BSIC";
+    }
+    leaf ci {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Cell ID of the cell per {{bibref|3GPP-TS.23.003|Section 4.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.CI";
+    }
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - GSM850";
+        }
+        enum "gsm900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - GSM900";
+        }
+        enum "dcs1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - DCS1800";
+        }
+        enum "pcs1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator - PCS1900";
+        }
+      }
+      config false;
+      description
+        "Indicates how to interpret the BCCH ARFCN. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BandIndicator";
+    }
+    leaf bccharfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      config false;
+      description
+        "ARFCN of this cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.BCCHARFCN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.GSM.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-inter-rat-cell-cdma2000-g {
+    description
+      "Table containing the inter-RAT cell list for CDMA2000 provided by the ACS. The table contents MAY be added/deleted/modified during operation, in which case these changes shall be reflected in the broadcast information as soon as possible.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables this entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.Alias";
+    }
+    leaf must-include {
+      type boolean;
+      config false;
+      description
+        "Indicates whether this instance of the neighbor shall be included or excluded in the FAP's NL configuration.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.MustInclude";
+    }
+    leaf band-class {
+      type uint8 {
+        range "0..17";
+      }
+      config false;
+      description
+        "Defines the CDMA2000 band in which the CDMA2000 frequency carrier can be found, specified in bandclass number. BandClass is defined in {{bibref|3GPP2-C.S0057-B}} Table 1.5-1. Corresponds to parameter bandClass specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.BandClass";
+    }
+    leaf arfcn {
+      type uint16 {
+        range "0..2047";
+      }
+      config false;
+      description
+        "Defines the CDMA2000 frequency carrier within a CDMA2000 band, as specified by ARFCN-ValueCDMA2000 in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}, and {{bibref|3GPP2-C.S0002-A}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.ARFCN";
+    }
+    leaf pn-offset {
+      type uint16 {
+        range "0..511";
+      }
+      config false;
+      description
+        "Defines the PN offset that represents the \"Physical cell identity\" in CDMA2000 system, as specified by PhysCellIdCDMA2000 in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.PNOffset";
+    }
+    leaf type {
+      type enumeration {
+        enum "1x-rtt" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.Type - 1xRTT";
+        }
+        enum "hrpd" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.Type - HRPD";
+        }
+      }
+      config false;
+      description
+        "Indicates the type of the cell. This parameter determines the length of the CID parameter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.Type";
+    }
+    leaf cid {
+      type string {
+        length "0..16";
+      }
+      description
+        "Defines the global cell identity of the cell. For a 1xRTT cell, the cell identity is a binary string 47 bits long. For a HRPD cell, the cell identity is a binary string 128 bits long. The value of {{param}} parameter is interpreted as 128-bit long unsigned integer. If {{param|Type}} is {{enum|1xRTT|Type}}, the first 47 bits (6 octet) is used and the rest of this {{param}} parameter MUST be ignored by the CPE. If {{param|Type}} is {{enum|HRPD|Type}}, the entire 16 octet is used as {{param}}. Corresponds to IE CellGlobalIdCDMA2000 specified in {{bibref|3GPP-TS.36.331|Section 6.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.CID";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborList.InterRATCell.CDMA2000.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-g {
+    description
+      "This object contains parameters relating to the neighbor list used by the FAP based on its self-configuration capability and {{object|.CellConfig.LTE.RAN.NeighborList.}} configuration of adding and excluding cells.";
+    leaf max-lte-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.MaxLTECellEntries";
+    }
+    leaf lte-cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-lte-cell-g {
+    description
+      "Table containing the LTE EUTRA (i.e. intra-RAT) cell list.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.PLMNID";
+    }
+    leaf cid {
+      type uint32 {
+        range "0..268435455";
+      }
+      description
+        "Cell Identity. {{bibref|3GPP-TS.36.331|Section 6.3.4}}. Combination of {{param|PLMNID}} and {{param}} constitutes the Cell Global ID (CGI).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.CID";
+    }
+    leaf eutra-carrier-arfcn {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Indicates the ARFCN of this carrier frequency. Corresponds to parameter dl-CarrierFreq in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}, and and parameter NDL in {{bibref|3GPP-TS.36.101|Section 5.7.3}}. If the value of {{param}} is the same with the one currently being used by the, then it implies that this neighbor cell is an intra-frequency cell; otherwise, it is an inter-frequency cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.EUTRACarrierARFCN";
+    }
+    leaf phy-cell-id {
+      type uint16 {
+        range "0..503";
+      }
+      description
+        "Physical cell ID, as specified in {{bibref|3GPP-TS.36.211|Section 6.11}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.PhyCellID";
+    }
+    leaf q-offset {
+      type int64;
+      description
+        "Indicate a cell-specific offset applicable to a specific neighbouring cell. It is used for evaluating the cell as a candidate for cell re-selection in idle mode. Corresponds to parameter q-OffsetCell broadcast in SIB4 for intra-frequency cells and in SIB5 for inter-frequency cells, specified in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.QOffset";
+    }
+    leaf cio {
+      type int64;
+      description
+        "Cell individual offset applicable to a specific neighbouring cell. It is used for evaluating triggering conditions for measurement reporting in connected mode. Specified by cellIndividualOffset in MeasObjectEUTRA IE in {{bibref|3GPP-TS.36.331|Section 6.3.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.CIO";
+    }
+    leaf rs-tx-power {
+      type int64;
+      units "dBm";
+      description
+        "The downlink reference-signal transmit power, specified in {{units}}. Defined as the linear average over the power contributions (in W) of all resource elements that carry cell-specific reference signals within the operating system bandwidth. Corresponds to parameter referenceSignalPower in SIB4 as a part of PDSCH-Config IE in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.RSTxPower";
+    }
+    leaf blacklisted {
+      type boolean;
+      description
+        "Indicates whether this neighbor cell is allowed for UEs as handover target or not. If {{true}}, handover is prohibited towards this cell. If {{false}}, handover is allowed toward this cell. The {{param}} parameter allows this cell to be prohibited as a handover target, while still allowing this cell to be included in the BCCH SIB4 or 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.Blacklisted";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.LTECell.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-inter-rat-cell-g {
+    description
+      "Table containing the inter-RAT cell lists separated by technology. {{bibref|3GPP-TS.36.331|Section 6.3.1 (SIB6, 7, 8)}}.";
+    leaf max-umts-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.}} table. There can be maximum of 16 UTRAN (UMTS) neighbor cells, as specified by carrierFreqListUTRA-FDD in SIB6 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.MaxUMTSEntries";
+    }
+    leaf max-gsm-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.}} table. There can be maximum of 16 GERAN (GSM) neighbor cells, as specified by carrierFreqsInfoList in SIB7 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.MaxGSMEntries";
+    }
+    leaf max-cdma2000-entries {
+      type uint64;
+      description
+        "The maximum number of entries in the {{object|.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.}} table. There can be maximum of 32 banclasses. In each bandclass, there can be maximum of 16 CDMA2000 carrier frequencies. In each carrier, there can be maximum of 16 CDMA2000 neighbor cells (PN offset). It is specified by neighCellList in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.MaxCDMA2000Entries";
+    }
+    leaf umts-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTSNumberOfEntries";
+    }
+    leaf gsm-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSMNumberOfEntries";
+    }
+    leaf cdma2000-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000NumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-inter-rat-cell-umts-g {
+    description
+      "Table containing the inter-RAT cell list for UTRA (UMTS) cell.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.PLMNID";
+    }
+    leaf rncid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "RNC-ID of an intra-RAT UMTS neighbor cell. It uniquely identifies an RNC within a PLMN. Normally, RNC-ID consists of 12 bits (i.e. a range of [0:4095]). However, if the value is larger than 4095, then Extended RNC-ID (range of [4096:65535]) is used in RANAP. The RNC-ID and Extended RNC-ID are combined into a single parameter here as there is no explicit need to have them separated. {{bibref|3GPP-TS.25.413|Section 9.2.1.39}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.RNCID";
+    }
+    leaf cid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Cell Identifier (C-id) that identifies a cell within an RNS. This Cell Identifier together with the controlling RNC (RNC-ID) constitutes the UTRAN Cell ID (UC-ID) and is used to identify a cell uniquely within UTRAN. C-ID is either 12-bit or 16-bit value. {{bibref|3GPP-TS.25.401|Section 6.1.5}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.CID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65533 | 65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "Routing Area Code (RAC). The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.RAC";
+    }
+    leaf ura {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "UTRAN Registration Area (URA) {{bibref|3GPP-TS.23.401}}. Indicates to the UE which {{param}} it shall use in case of overlapping URAs. {{bibref|3GPP-TS.25.331|Section 10.3.2.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.URA";
+    }
+    leaf uarfcnul {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The UL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.UARFCNUL";
+    }
+    leaf uarfcndl {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The DL UTRA Absolute Radio Frequency Channel Number (UARFCN) in an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.UARFCNDL";
+    }
+    leaf pcpich-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary CPICH scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.PCPICHScramblingCode";
+    }
+    leaf pcpich-tx-power {
+      type int64;
+      units "dBm";
+      description
+        "Primary CPICH Tx power in {{units}}. Actual values of the power are -10.0 {{units}} to 50.0 {{units}} in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the power. {{bibref|3GPP-TS.32.642|Section 6.3.11}} {{bibref|3GPP-TS.25.433|Section 2.2.33}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.PCPICHTxPower";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.UMTS.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-inter-rat-cell-gsm-g {
+    description
+      "Table containing the inter-RAT cell list for GERAN (GSM) cell.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Location Area Code (LAC). The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the Location Area ID (LAI). {{bibref|3GPP-TS.23.003|Section 4.1}} {{bibref|3GPP-TS.25.413|Section 9.2.3.6}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.LAC";
+    }
+    leaf bsic {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "BSIC of the cell per {{bibref|3GPP-TS.23.003}}, consisting of: :Bit 7:6 - not used (\"00\") :Bit 5:3 - NCC (PLMN Color Code) :Bit 2:0 - BCC (BS color code) For example, if NCC is 7 and BCC is 2 you would have 00111010 (binary) or 0x3A (hex), and the value of this parameter would be 58.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BSIC";
+    }
+    leaf ci {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Cell ID of the cell per {{bibref|3GPP-TS.23.003|Section 4.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.CI";
+    }
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - GSM850";
+        }
+        enum "gsm900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - GSM900";
+        }
+        enum "dcs1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - DCS1800";
+        }
+        enum "pcs1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator - PCS1900";
+        }
+      }
+      description
+        "Indicates how to interpret the BCCH ARFCN. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BandIndicator";
+    }
+    leaf bccharfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      description
+        "ARFCN of this cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.BCCHARFCN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.GSM.{i}.";
+  }
+
+  grouping lte-ran-neighbor-list-in-use-inter-rat-cell-cdma2000-g {
+    description
+      "Table containing the inter-RAT cell list for CDMA2000 cell.";
+    leaf band-class {
+      type uint8 {
+        range "0..17";
+      }
+      description
+        "Defines the CDMA2000 band in which the CDMA2000 frequency carrier can be found, specified in bandclass number. BandClass is defined in {{bibref|3GPP2-C.S0057-B|Table 1.5-1}}. Corresponds to parameter bandClass specified in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.BandClass";
+    }
+    leaf arfcn {
+      type uint16 {
+        range "0..2047";
+      }
+      description
+        "Defines the CDMA2000 frequency carrier within a CDMA2000 band, as specified by ARFCN-ValueCDMA2000 in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}, and {{bibref|3GPP2-C.S0002-A}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.ARFCN";
+    }
+    leaf pn-offset {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Defines the PN offset that represents the \"Physical cell identity\" in CDMA2000 system, as specified by PhysCellIdCDMA2000 in SIB8 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.PNOffset";
+    }
+    leaf type {
+      type enumeration {
+        enum "1x-rtt" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.Type - 1xRTT";
+        }
+        enum "hrpd" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.Type - HRPD";
+        }
+      }
+      description
+        "Indicates the type of the cell. This parameter determines the length of the CID parameter.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.Type";
+    }
+    leaf cid {
+      type string {
+        length "0..16";
+      }
+      description
+        "Defines the global cell identity of the cell. For a 1xRTT cell, the cell identity is a binary string 47 bits long. For a HRPD cell, the cell identity is a binary string 128 bits long. The value of {{param}} parameter is interpreted as 128-bit long unsigned integer. If {{param|Type}} is {{enum|1xRTT|Type}}, the first 47 bits (6 octet) is used and the rest of this {{param}} parameter MUST be ignored by the CPE. If {{param|Type}} is {{enum|HRPD|Type}}, the entire 16 octet is used as {{param}}. Corresponds to IE CellGlobalIdCDMA2000 specified in {{bibref|3GPP-TS.36.331|Section 6.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.CID";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.LTE.RAN.NeighborListInUse.InterRATCell.CDMA2000.{i}.";
+  }
+
+  grouping cdma2000-g {
+    description
+      "This object contains parameters relating to configuring the CDMA2000 FAP.";
+    leaf tunnel-instance {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "This is the reference to the IPsec tunnel instance used by the CDMA2000 FAP. For all root data models, which use the tunnel definition provided in {{bibref|TR-262}} (InternetGatewayDevice:1 {{bibref|TR-098}} and Device:1 {{bibref|TR-181i1}}) the {{param}} MUST point to a row in the 'FAP.Tunnel.IKESA.{i}.' table, defined in {{bibref|TR-262}}. If the root data model used is Device:2 {{bibref|TR-181i2}} than the {{param}} MUST point to IPsec tunnel instance defined in {{bibref|TR-181i2}}. If the referenced object is deleted, the parameter value MUST be set to an empty string. In case of a multiple-radio-technology FAP product, each radio technology can have its own tunnels or share common tunnels. In the former case, {{param}} can contain a unique instance number. In the latter case, {{param}} under all radio technologies can have the same instance number.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.TunnelInstance";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.";
+  }
+
+  grouping cdma2000-one-x-g {
+    description
+      "This object contains parameters relating to configuring the CDMA2000 1x FAP.";
+    leaf pcfpdsn-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSNNumberOfEntries";
+    }
+    leaf max-batch-pcfpdsn-entries {
+      type uint64;
+      description
+        "Maximum number of entries in the {{object|.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.MaxBatchPCFPDSNEntries";
+    }
+    leaf batch-pcfpdsn-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSNNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.";
+  }
+
+  grouping cdma2000-one-x-ran-g {
+    description
+      "This object contains parameters relating to RAN configuring the CDMA2000 1x FAP.";
+    leaf one-x-sector-nid {
+      type int64;
+      config false;
+      description
+        "SID for 1x. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.OneXSectorNID";
+    }
+    leaf one-x-sector-sid {
+      type int64;
+      config false;
+      description
+        "NID for 1x . See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.OneXSectorSID";
+    }
+    leaf one-xpzid {
+      type int64;
+      config false;
+      description
+        "packet Zone ID for 1x packet calls";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.OneXPZID";
+    }
+    leaf base-id {
+      type int64;
+      config false;
+      description
+        "Base station ID (needed in SPM). This is also the CellID. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.BaseID";
+    }
+    leaf max-neighbor-list-entries {
+      type uint64;
+      description
+        "Maximum number of entries avaiable in {{object|.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.MaxNeighborListEntries";
+    }
+    leaf neighbor-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborListNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.";
+  }
+
+  grouping cdma2000-one-x-ran-rf-g {
+    description
+      "This object contains parameters relating to RF configuration of the FAP.";
+    leaf-list rfcnfl {
+      type string {
+        length "0..256";
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a pair of 2-digit Band class number (as defined in {{bibref|3GPP2-C.S0057}}) followed by 4-digit FL Radio Frequency Channel Number (RFCN). Self-configuration for RFCN is controlled by {{param|.FAPControl.CDMA2000.OneX.SelfConfig.RFCNFLSelfConfigEnable}}. If the FAP's self-configuration capability for RFCN is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for RFCNFLInUse. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. An example value is \"010001, 030500\". If multiple items are specified, they are done in the order of preference.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFL";
+    }
+    leaf rfcnfl-band-in-use {
+      type string {
+        length "0..16";
+      }
+      description
+        "The FL Band being used by the FAP. Self-configuration for Band and RFCN is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.RFCNFLConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.RFCNFLSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in RFCNFL. If the self-configuration capability is not available or not enabled, then this parameter contains the first band class value in RFCNFL.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFLBandInUse";
+    }
+    leaf rfcnfl-in-use {
+      type uint64;
+      description
+        "The FL RFCN being used by the FAP. Self-configuration for RFCN is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.RFCNFLConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.RFCNFLSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in RFCNFL. If the self-configuration capability is not available or not enabled, then this parameter contains the first RFCN value in RFCNFL.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.RFCNFLInUse";
+    }
+    leaf-list pilot-pn {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Each item is a pilot PN offset in units of 64 PN chips. Self-configuration for pilot PN is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.PilotPNConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.PilotPNSelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for Pilot PN Offset is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for PilotPNInUse. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. The multiplicity of the PN offset values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. The order of the items has no significance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.PilotPN";
+    }
+    leaf pilot-pn-in-use {
+      type uint16 {
+        range "0..511";
+      }
+      units "64 PN chips";
+      description
+        "The Pilot PN Offset being used by the FAP in {{units}}. Self-configuration for Pilot PN Offset is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.PilotPNConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.PilotPNSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in PilotPN. If the self-configuration capability is not available or not enabled, then this parameter contains the first value in PilotPN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.PilotPNInUse";
+    }
+    leaf maxfap-tx-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Defines the maximum transmission power allowed on the FAP. MaxFAPTxPower is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<Pmax_low>;..<Pmax_high>;\". {{param}} identifies the limits between which the FAP can self-configure its maximum transmit power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerSelfConfigEnable}} from an enabled perspective. <Pmax_low>; and <Pmax_high>; are measured in dBm and have a range of -40.0 to 20.0 incremented by 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.MaxFAPTxPower";
+    }
+    leaf maxfap-tx-power-in-use {
+      type int64;
+      units "0.1 dBm";
+      description
+        "The maximum transmission power measured in {{units}} currently used by the FAP. Actual values of the maximum transmission power are -40.0 dBm to 20.0 dBm in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPTxPowerSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the range provided in {{param|MaxFAPTxPower}}. If the self-configuration capability is not available or not enabled, then this parameter contains a value selected by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.MaxFAPTxPowerInUse";
+    }
+    leaf pch-pwr-percentage {
+      type uint32 {
+        range "1000..1000000";
+      }
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Paging Channel (expressed in {{units}}). For example, 93333 means 93.333% of the max sector power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.PchPwrPercentage";
+    }
+    leaf pilot-pwr-percentage {
+      type uint32 {
+        range "1000..1000000";
+      }
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Pilot Channel (expressed in {{units}}). For example, 19950 means 19.95% of total.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.PilotPwrPercentage";
+    }
+    leaf sync-pwr-percentage {
+      type uint32 {
+        range "1000..1000000";
+      }
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Sync Channel (expressed in {{units}}). For example, 23458 means 23.4% of the max sector power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.SyncPwrPercentage";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.RF.";
+  }
+
+  grouping cdma2000-one-x-ran-network-listen-mode-config-g {
+    description
+      "This object contains parameters relating to self-configuration of the MaxFAPTxPower of the FAP.";
+    leaf rfcnfl-margin {
+      type uint64;
+      config false;
+      description
+        "If self-configuration of RFCNFL is enabled, this value indicates the total received signal strength margin to be applied to the entries in RFCNFL when the FAP decides on the RFCNInUse in order to bias the selection of the most preferred frequency.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.RFCNFLMargin";
+    }
+    leaf fap-coverage-target {
+      type string {
+        length "0..32";
+      }
+      config false;
+      description
+        "Defines the target value measured in dB for the range of the FAP's FL coverage, in terms of RF propagation loss. This value can be used by the FAP's selfconfiguration algorithms to help derive transmit power levels in the presence of co-channel and adjacent channel interference. {{param}} is expressed as a range of the minimum coverage path loss and the maximum coverage path loss with \"..\" (two periods) between the minimum and maximum values, i.e., \"<FAPCoverageTarget_min>..<FAPCoverageTarget_max>\". These values can be used by the FAP's selfconfiguration algorithms to help derive transmit power levels in the presence of co-channel and adjacent channel interference. <FAPCoverageTarget_min> and <FAPCoverageTarget_max> are measured in dB and have a range of [50,150] incremented by 1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.FAPCoverageTarget";
+    }
+    leaf fap-beacon-coverage-target {
+      type string {
+        length "0..32";
+      }
+      config false;
+      description
+        "Defines the target value measured in dB for the range of the FAP's FL Beacon coverage, in terms of RF propagation loss. This value can be used by the FAP's selfconfiguration algorithms to help derive beacon transmit power levels. {{param}} is expressed as a range of the minimum coverage path loss and the maximum coverage path loss with \"..\" (two periods) between the minimum and maximum values, i.e., \"<BeaconCoverageTarget_min>..<BeaconCoverageTarget_max>\". These values can be used by the FAP's selfconfiguration algorithms to help derive transmit power levels for the beacon(s) in the presence of co-channel and adjacent channel interference.\" <BeaconCoverageTarget_min> and <BeaconCoverageTarget_max> are measured in dB and have a range of [50,150] incremented by 1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.FAPBeaconCoverageTarget";
+    }
+    leaf max-coverage-edge-pilot-strength {
+      type int64;
+      units "0.1 dB";
+      config false;
+      description
+        "The maximum strength of the received pilot energy per chip, Ec, to total received spectral density, Io (signal and noise) desired for FAP users at the edge of the FAP coverage target in units of {{units}}. This value can be used by the FAP's self configuration algorithms to help prevent aggressive transmit power level settings .";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.MaxCoverageEdgePilotStrength";
+    }
+    leaf max-allowable-pilot-strength-degradation {
+      type int64;
+      units "0.1 dB";
+      config false;
+      description
+        "The maximum amount in dB by which the strength of the received pilot energy per chip, Ec, to total received spectral density, Io (signal and noise) for alien users can be degraded in the presence of FAP interference at the edge of FAP coverage, in {{units}} units.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.MaxAllowablePilotStrengthDegradation";
+    }
+    leaf-list rfcnfl-to-protect {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Each item is a FL RFCN corresponding to a CDMA2000 carrier that is adjacent to the RFCNFLInUse to be protected from adjacent channel interference. If any of the items in the list are adjacent to the FAP's own FL channel, the FAP MUST take the PilotStrength and total received power spectral density (Io) measured on these channels into account as part of its maximum transmit power selfconfiguration. The RFCNs in the list can belong to any operator, allowing for protection of the FAP operator's own macro layer as well as that of other operators. The list should take into account the ability of the FAP to self-configure its own FL RFCN and so SHOULD include any channels (requiring protection) which can potentially be adjacent to the RFCN selected by the FAP. For example, if only adjacent operator protection is needed and the FAP has the ability to self-configure to any channel owned by its operator, this list would be populated with the RFCNs immediately above and below the range of channels owned by the FAP operator. If an empty string then it indicates that there are no channels adjacent to the FAP that require protection, or that self-configuration of the FAP transmit power is not enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.RFCNFLToProtect";
+    }
+    leaf fap-allowed-adj-chan-coverage-hole {
+      type uint8 {
+        range "30..150";
+      }
+      units "dB";
+      config false;
+      description
+        "Defines the maximum allowed coverage hole created on carriers listed in RFCNFLToProtect by the FAP transmission, measured in {{units}}, in terms of RF propagation loss such that the {{param|MaxAllowablePilotStrengthDegradation}} is maintained outside the {{param}} for MS on that {{param|RFCNFLToProtect}}. This value can be used by the FAP's self configuration algorithms to help derive transmit power levels.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.FAPAllowedAdjChanCoverageHole";
+    }
+    leaf acir {
+      type uint64;
+      units "dB";
+      config false;
+      description
+        "AdjacentChannelInterferenceRatio value in {{units}} to be used when determining the coverage hole created on adjacent channels due to leakage.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.ACIR";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NetworkListenModeConfig.";
+  }
+
+  grouping cdma2000-one-x-ran-access-parameters-g {
+    description
+      "The object used for configuring access parameter messages for 1x. See {{bibref|3GPP2-C.S0005}}.";
+    leaf nom-pwr {
+      type int64;
+      config false;
+      description
+        "Nominal power correction factor used by the mobile in open loop power adjustment. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.NomPwr";
+    }
+    leaf init-pwr {
+      type int64;
+      config false;
+      description
+        "Initial power offset used by the mobile in open loop power adjustment. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.InitPwr";
+    }
+    leaf pwr-step-indb {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Power step increment in successive access probes. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.PwrStepIndb";
+    }
+    leaf nom-pwr-ext {
+      type uint8 {
+        range "0..1";
+      }
+      units "dBm";
+      config false;
+      description
+        "{{param}} should be zero for BC0 and BC1. For other band classes, {{param}} is 1 if Mobile's correction factor is between -24dBm and -9dBm. Otherwise {{param}} is zero. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.NomPwrExt";
+    }
+    leaf apm-auth {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Enabling/disabling global authentication. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.APMAuth";
+    }
+    leaf apm-rand-update-prd {
+      type uint16 {
+        range "16..14400";
+      }
+      units "seconds";
+      config false;
+      description
+        "The period (in {{units}}) that the BSS updates the RAND value sent via APM. Only 2 second multiples accepted.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.APMRandUpdatePrd";
+    }
+    leaf initialpwr {
+      type uint8 {
+        range "0..31";
+      }
+      units "dB";
+      config false;
+      description
+        "Initial power offset for access. The base station shall set this field to the correction factor to be used by mobile stations in the open loop power estimate for the initial transmission on an Access Channel, expressed as a two's complement value in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Initialpwr";
+    }
+    leaf pwr-step {
+      type uint8 {
+        range "0..7";
+      }
+      units "dB";
+      config false;
+      description
+        "Power increment. The base station shall set this field to the value by which mobile stations are to increase their transmit power between successive access probes in an access probe sequence, in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.PwrStep";
+    }
+    leaf num-step {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Number of access probes. The base station shall set this field to one less than the maximum number of access probes mobile stations are to transmit in a single access probe sequence.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.NumStep";
+    }
+    leaf max-cap-size {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Maximum Access Channel message capsule size. The base station shall set this field to the value in the range 0 to 7. {{param}} is set to three less than the maximum number of Access Channel frames in an Access Channel message capsule.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.MaxCapSize";
+    }
+    leaf preamble-size {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Access Channel preamble length. The base station shall set this field to one less than the number of Access Channel frames that mobile stations are to transmit in each Access Channel preamble.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.PreambleSize";
+    }
+    leaf psist09 {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 0 - 9. A value of 63 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist09";
+    }
+    leaf psist10 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 10 (test Mobile). A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist10";
+    }
+    leaf psist11 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 11 (emergency Mobile). A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist11";
+    }
+    leaf psist12 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 12. A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist12";
+    }
+    leaf psist13 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 13. A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist13";
+    }
+    leaf psist14 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 14. A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist14";
+    }
+    leaf psist15 {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence value for access probes sent by mobiles with Access Overload calls values of 15. A value of 7 indicates such mobiles are not allowed to send access probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Psist15";
+    }
+    leaf msg-psist {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence modifier for access channel attempts transmitting a message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.MsgPsist";
+    }
+    leaf reg-psist {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Persistence modifier for registration message transmission.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.RegPsist";
+    }
+    leaf probe-pn-ran {
+      type uint8 {
+        range "0..9";
+      }
+      config false;
+      description
+        "Time randomization for access channel probes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.ProbePNRan";
+    }
+    leaf acc-tmo {
+      type uint8 {
+        range "0..15";
+      }
+      units "80 ms slots";
+      config false;
+      description
+        "Access transmission timeout. Two less than the time the mobile has to wait before determining that the probe is not received by the BSS. It is in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.AccTmo";
+    }
+    leaf probe-bkoff {
+      type uint8 {
+        range "0..15";
+      }
+      units "frames";
+      config false;
+      description
+        "One less than maximum number for randomized delay between successive access probes in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.ProbeBkoff";
+    }
+    leaf bkoff {
+      type uint8 {
+        range "0..15";
+      }
+      units "80 ms slots";
+      config false;
+      description
+        "One less than maximum number for randomized delay between successive access sequences in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.Bkoff";
+    }
+    leaf max-req-seq {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Maximum number of access probe sequences for an access request.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.MaxReqSeq";
+    }
+    leaf max-rsp-seq {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Maximum number of access probe sequences for an access response";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.MaxRspSeq";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.AccessParameters.";
+  }
+
+  grouping cdma2000-one-x-ran-system-parameters-g {
+    description
+      "The object used for configuring system parameter messages for 1x";
+    leaf reg-zone {
+      type uint16 {
+        range "0..4095";
+      }
+      config false;
+      description
+        "registration zone number (refer to Section 2.6.5.1.5 of {{bibref|3GPP2-C.S0005}})";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.RegZone";
+    }
+    leaf total-zones {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Total number of zones the mobile shall retain for zone based registration. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.TotalZones";
+    }
+    leaf zone-timer {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "timer value to be used by the mobile in the zone registration timer. Refer to table 3.7.2.3.2.1-1 of the standard {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.ZoneTimer";
+    }
+    leaf reg-period {
+      type uint8 {
+        range "29..85";
+      }
+      config false;
+      description
+        "Registration period for timer based registration. Registration period is calculated from the formula 2^(REG_PRD/4) x 0.08 seconds. Thus a value of 59 corresponds to 1853.6 seconds (~ 1/2 hour). See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.RegPeriod";
+    }
+    leaf srch-win-a {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Search window size to be used ny the mobile for active set and candidate set. Refer to table 2.6.6.2.1-1 of {{bibref|3GPP2-C.S0005}}. For example, 11 corresponds to 130 chips";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.SrchWinA";
+    }
+    leaf srch-win-n {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Search window size to be used by the mobile for neighbor set. Refer to table 2.6.6.2.1-1 of {{bibref|3GPP2-C.S0005}}. For example, 8 corresponds to 60 chips";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.SrchWinN";
+    }
+    leaf srch-win-r {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Search window size to be used by the mobile for remaining set. Refer to table 2.6.6.2.1-1 of {{bibref|3GPP2-C.S0005}}. For example, 8 corresponds to 60 chips";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.SrchWinR";
+    }
+    leaf nghbr-max-age {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "neighbor set maximum age beyond which the mobiles are supposed to drop a neighbor. This is the count of neighbout list updat or extended neighbor list updates a mobile shall receive before removing a neighbor from the neighbor list. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.NghbrMaxAge";
+    }
+    leaf pwr-rep-thresh {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "Power control reporting threshold. Number of bad frames a mobile should receive before sending a PMRM message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.PwrRepThresh";
+    }
+    leaf pwr-rep-frames {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Duration (in number of frames) for measuring bad frames - given by equation 2^(PWR_REP_FRAMES/2) x 5 frames. For example, 6 corresponds to 40 frames. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.PwrRepFrames";
+    }
+    leaf pwr-thresh-enable {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "enable/disable power measurement report message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.PwrThreshEnable";
+    }
+    leaf pwr-period-enable {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "enable/disable periodic power measurement report message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.PwrPeriodEnable";
+    }
+    leaf pwr-rep-delay {
+      type uint8 {
+        range "0..32";
+      }
+      config false;
+      description
+        "Delay (in unit of four frames) following a PMRM before the mobile restarts counting bad frames for power control measuremnt. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.PwrRepDelay";
+    }
+    leaf rescan {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "If {{param}} is set to 1, the mobiles should restart and reinitialize the System Parameters message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.Rescan";
+    }
+    leaf tadd {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "Power threshold (in {{units}}) for transferring a neighbor from neighbor set or remaining set to active set. For example, a value of 26 corresponds to -13 dB. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.Tadd";
+    }
+    leaf tdrop {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "Drop threshold (in {{units}}) to start a handoff timer to drop a neighbor from active or candidate set. For example, 30 corresponds to -15dB. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.Tdrop";
+    }
+    leaf tcomp {
+      type uint8 {
+        range "0..15";
+      }
+      units "0.5 dB";
+      config false;
+      description
+        "If a pilot in condidate set exceeds the power of a pilot in active set by threshold, the mobile shall send a power strenght measurement report message. This threshold is defined in unit of {{units}}. For example, 5 corresponds to a threshold of 2.5 dB. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.Tcomp";
+    }
+    leaf t-tdrop {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Timer value for which an action is taken by the mobile for a neighbor in candidate set or in active set. Refer to Table 2.6.6.2.3-1 of the {{bibref|3GPP2-C.S0005}} for details. For example, 3 corresponds to four seconds";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.TTdrop";
+    }
+    leaf in-traffic-tadd {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "T-ADD value (in {{units}}) used for in-traffic system parameter message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.InTrafficTadd";
+    }
+    leaf in-traffic-tdrop {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "T-Drop value (in {{units}}) used in in-traffic system parameter message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.InTrafficTdrop";
+    }
+    leaf in-traffic-tcomp {
+      type uint8 {
+        range "0..15";
+      }
+      units "dB";
+      config false;
+      description
+        "T_Comp value (in {{units}}) used for in-traffic system parameter message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.InTrafficTcomp";
+    }
+    leaf in-traffic-ttdrop {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "T_Tdrop timer value value used for in-traffic system parameter message. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.InTrafficTtdrop";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.SystemParameters.";
+  }
+
+  grouping cdma2000-one-x-ran-extended-system-parameters-g {
+    description
+      "The object used for configuring extended system parameter messages for 1x";
+    leaf prev {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "protocol revision";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.Prev";
+    }
+    leaf p-min-rev {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "minimum protocol revision";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.PMinRev";
+    }
+    leaf delete-for-tmsi {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Delete Foreign TMSI. The base station shall set this field to '1' to cause the mobile station to delete its TMSI if the TMSI was assigned in a different TMSI zone from that specified by the TMSI_ZONE field of this message; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.DeleteForTMSI";
+    }
+    leaf use-tmsi {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Use TMSI indicator. The base station shall set this field to the value shown next field corresponding to the type of MSID that the mobile station is to use on the Access Channel.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.UseTMSI";
+    }
+    leaf pref-msid-type {
+      type uint8 {
+        range "0..3";
+      }
+      config false;
+      description
+        "Preferred Access Channel Mobile Station Identifier Type. F294. The base station shall set this field to the value shown as below corresponding to the type of MSDI that the mobile station is to use on the Access Channel. [useTMSI] [prefMSIDType] [description] 0 00 IMSI_S and ESN 0 10 IMSI 0 11 IMSI and ESN 1 10 TMSI; IMSI 1 11 TMSI; IMSI and ESN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.PrefMSIDType";
+    }
+    leaf mcc {
+      type uint16 {
+        range "0..1023";
+      }
+      config false;
+      description
+        "Mobile Country Code. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.MCC";
+    }
+    leaf imsi1112 {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "11th and 12th digits of IMSI. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.IMSI1112";
+    }
+    leaf tmsi-zone-len {
+      type uint8 {
+        range "1..8";
+      }
+      config false;
+      description
+        "TMSI zone length. The base station shall set this field to the number of octets included in the TMSI_ZONE. The base station shall set this field to a value in the range 1 to 8 inclusive.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.TMSIZoneLen";
+    }
+    leaf tmsi-zone {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "TMSI zone. The base station shall set this field to the TMSI zone number as specified in {{bibref|3GPP2-N.S0010}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.TMSIZone";
+    }
+    leaf bcast-index {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Broadcast slot cycle index. To enable periodic broadcast paging, the base station shall set this field to and unsigned 3-bit number in the range 1-7, equal to the broadcast slot cycle index. To disable periodic broadcast paging, the base station shall set this field to '000'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.BcastIndex";
+    }
+    leaf imsit-supported {
+      type int64;
+      config false;
+      description
+        "1: IMISI_T is supported, 0: IMSI_T is not supported. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.IMSITSupported";
+    }
+    leaf soft-slope {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "The slope in the inequality criterion for adding a pilot to the Active Set, or dropping a pilot from the Active Set. The base station shall set this field as an unsigned binary number.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.SoftSlope";
+    }
+    leaf add-intercept {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "The intercept in the inequality criterion for adding a pilot to the Active Set. The base station shall set this field as a two's complement signed binary number, in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AddIntercept";
+    }
+    leaf drop-intercept {
+      type uint8 {
+        range "0..63";
+      }
+      units "dB";
+      config false;
+      description
+        "The intercept in the inequality criterion for dropping a pilot from the Active Set. The base station shall set this field as a two's complement signed binary number, in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.DropIntercept";
+    }
+    leaf max-num-alt-so {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Maximum number of alternative service options. The base station shall set this field to the maximum number of alternative service option numbers that the mobile station is allowed to include in the Origination Message or the Page Response Message. For mobile stations with MOB_P_REVs less than seven, the alternative service options are those service options defined in TSB-58B and related to SERVICE_OPTION in Origination Message and the Page Response Message. For mobile stations with MOB_P_REVs equal to or greater than seven, the alternative service options are those service options defined in TSB-58B without service group number assigned and related to SERVICE_OPTION in Origination Message and the Page Response Message. The base station sets this field to a value greater than zero, in addition, the base station shall allow the mobile station with MOB_P_REVs equal to or greater than 7 to include - a 4 or 8-bit service option bitmap in the Origination Message and the Page Response Message; - alternative service option numbers, not limited to MAX_ALT_SO_NUM, in the Enhanced Origination Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.MaxNumAltSo";
+    }
+    leaf reselected-included {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "System reselection parameters included. If the base station is including system reselection parameters, the base station shall set this field to '1'; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.ReselectedIncluded";
+    }
+    leaf ec-thresh {
+      type uint64;
+      units "dBm";
+      config false;
+      description
+        "Pilot power threshold. If RESELECTINCLUDED is set to '1', the base station shall include the field EC_THRESH and set this field to: [ (pilot_power_threshold + 115 ) ] where pilot_power_threshold is the pilot power, Ec, in {{units}}/1.23 MHz, below which the mobile station is to perform system reselection; otherwise, the base station shall omit this field.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.EcThresh";
+    }
+    leaf ec-io-thresh {
+      type uint64;
+      config false;
+      description
+        "Pilot Ec / Io threshold. If RESELECTINCLUDED is set to '1', the base station shall include the field EC_I0_THRESH and set this field to: [ - 20 x log10 (pilot_threshold) ] where pilot_threshold is the pilot Ec/Io below which the mobile station is to perform system reselection; otherwise, the base station shall omit this field.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.EcIoThresh";
+    }
+    leaf pilot-report {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Pilot reporting indicator. The base station shall set this field to '1' if the mobile station is to report the additional pilots which have pilot strength exceeding T_ADD in all Access Channel messages. The base station shall set this field to '0' if the mobile station is to report the additional pilots which have pilot strengths exceeding T_ADD only in the Origination Message and the Page Response Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.PilotReport";
+    }
+    leaf nghbr-set-entry-info {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Neighbor Set access entry handoff information included indicator. If the base station is including information on the Neighbor Set access entry handoff, the base station shall set this field to '1'; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.NghbrSetEntryInfo";
+    }
+    leaf access-ho-order {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access entry handoff permitted indicator. If NghbrSetEntryInfo is set to '1', the base station shall set this field to '1' if the mobile station is permitted to perform an access entry handoff after receiving a message while performing the Mobile Station Order and Message Processing Operation in the Mobile Station Idle State; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccessHOOrder";
+    }
+    leaf nghbr-set-access-info {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Neighbor Set access handoff included indicator. If the base station is including information on the Neighbor Set access handoff or access probe handoff, the base station shall set this field to '1', otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.NghbrSetAccessInfo";
+    }
+    leaf access-ho {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access handoff permitted indicator. If NghbrSetEntryInfo is set to '1', the base station shall set this field to '1' if the mobile station is permitted to perform an access handoff; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccessHO";
+    }
+    leaf access-ho-msg-rsp {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access handoff permitted for message response indicator. If AccessHO is set to '1', the base station shall include this field and set it as described below; otherwise, the base station shall omit this field. The base station shall set this field to '1' if the mobile station is permitted to perform an access handoff after receiving a message and before responding to that message in the System Access State; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccessHOMsgRsp";
+    }
+    leaf access-probe-ho {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access probe handoff permitted indicator. If NghbrSetEntryInfo is set to '1', the base station shall set this field to '1' if the base station is permitted to perform an access probe handoff; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccessProbeHO";
+    }
+    leaf acc-ho-list-upd {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access handoff list update permitted indicator. If AccessProbeHO is included and is set to '1', the base station shall set this field to '1' if the mobile station is permitted to update the access handoff list during an access attempt; otherwise, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccHOListUpd";
+    }
+    leaf acc-probe-ho-other-msg {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Access probe handoff permitted for messages other than the Origination Message and the Page Response Message. If AccessProbeHO is set to '1', the base station shall set this field to '1' if the mobile station is permitted to perform an access probe handoff for messages other than the Origination Message and the Page Response. The base station shall set this field to '0' if the mobile station is permitted to perform an access probe handoff only for the Origination Message and the Page Response Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.AccProbeHOOtherMsg";
+    }
+    leaf max-num-probe-ho {
+      type uint8 {
+        range "0..3";
+      }
+      config false;
+      description
+        "Maximum number of times that mobile station is permitted to perform an access probe handoff. If AccessProbeHO is set to '1', the base station shall set this field to the maximum number of times the mobile station is allowed to perform an access probe handoff within an access attempt minus one.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.MaxNumProbeHO";
+    }
+    leaf brdcast-gps-assit {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "If {{param}} is set to 1, then Braodcast GPS assist is supported. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.BrdcastGPSAssit";
+    }
+    leaf qpch-supported {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Quick Paging Channel Supported Indication. If the base station supports Quick Paging Channel operation, the base station shall set this field to '1'; otherwise the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.QPCHSupported";
+    }
+    leaf num-qpch {
+      type uint8 {
+        range "1..3";
+      }
+      config false;
+      description
+        "Number of Quick Paging Channels. If the base station sets QPCHSUPPORTED to '1', the base station shall include this field and set it as described below; otherwise, the base station shall omit this field. The base station shall set this field to the number of Quick Paging Channels on this CDMA Channel. The base station shall not set this field to '00'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.NumQPCH";
+    }
+    leaf qpch-rate {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Quick Paging Channel indicator rate. See {{bibref|3GPP2-C.S0005}}. {{param}} is set as follows: 0: 4800bps; 1: 9600bps.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.QPCHRate";
+    }
+    leaf qpch-pwr-level-page {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Quick Paging Channel paging indicator transmit power level. {{param}} is set as follows: 0: 5 dB below; 1: 4 dB below; 2: 3 dB below; 3: 2 dB below; 4: 1 dB below; 5: Same; 6: 1 dB above; 7: 2dB above.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.QPCHPwrLevelPage";
+    }
+    leaf qpc-hcci-supported {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Quick Paging Channel configuration change indicator supported. {{param}} is set as follows: if the base station is to support configuration change indicators on the Quick Paging Channel, {{param}} to '1'; otherwise {{param}} is set to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.QPCHcciSupported";
+    }
+    leaf qpch-pwr-level-config {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Quick Paging Channel configuration change indicator CONFIG transmit power level. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.QPCHPwrLevelConfig";
+    }
+    leaf sdb-supported {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Short Data Burst supported indicator. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.SDBSupported";
+    }
+    leaf r-lgain-traffic-pilot {
+      type uint8 {
+        range "0..63";
+      }
+      units "0.125 dB";
+      config false;
+      description
+        "Gain adjustment of the Reverse Traffic Channel relative to the Reverse Pilot Channel for Radio Configurations greater than 2. {{param}} is set to the correction factor to be used by mobile stations in setting the power of a reverse traffic channel, expressed as a two's complement value in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.RLgainTrafficPilot";
+    }
+    leaf rvs-pwr-ctrl-delay-incl {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Reverse Power Control Delay included indicator. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.RvsPwrCtrlDelayIncl";
+    }
+    leaf rvs-pwr-ctrl-delay {
+      type uint8 {
+        range "0..3";
+      }
+      units "1.25 ms";
+      config false;
+      description
+        "The reverse power control delay. {{param}} is setto the closed-loop reverse power control delay minus one (the closed-loop reverse power control delay is the time between the end of a gated-on reverse PCG and the beginning of the Forward Power Control Subchannel in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.RvsPwrCtrlDelay";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ExtendedSystemParameters.";
+  }
+
+  grouping cdma2000-one-x-ran-forward-pwr-ctr-g {
+    description
+      "The object used for configuring extended channel assignment messages for 1x";
+    leaf fpcfch-init-setpt {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "Initial Fundamental Channel outer loop Eb/Nt setpoint in {{units}}. For example, 56 corresponds to 7 dB. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.FPCFCHInitSetpt";
+    }
+    leaf fpc-subchan-gain {
+      type int64;
+      units "0.25 dB";
+      config false;
+      description
+        "Forward power control subchannel relative to fwd traffic channel in {{units}}. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.FPCSubchanGain";
+    }
+    leaf rl-gain-adj {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Reverse Traffic Channel power relative to access power in {{units}}. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.RLGainAdj";
+    }
+    leaf fpcfchfer {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "Fundamental Channel target frame error rate. Refer to table 3.7.3.3.2.25-2 of {{bibref|3GPP2-C.S0005}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.FPCFCHFER";
+    }
+    leaf fpcfch-min-setpt {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "Minimum Fundamental Channel Outer Loop Eb/Nt setpoint in {{units}}. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.FPCFCHMinSetpt";
+    }
+    leaf fpcfch-max-setpt {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "Maximum Fundamental Channel Outer Loop Eb/Nt setpoint in {{units}}. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.FPCFCHMaxSetpt";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.ForwardPwrCtr.";
+  }
+
+  grouping cdma2000-one-x-ran-hard-handoff-g {
+    description
+      "This object provides configurable parameters for 1x Handout";
+    leaf handout-enable {
+      type boolean;
+      config false;
+      description
+        "Enabling handout operation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.HandoutEnable";
+    }
+    leaf ho-pilot-power-thresh {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "Pilot power threshold (in {{units}} relative to the FAP pilot power) for handout declaration";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.HOPilotPowerThresh";
+    }
+    leaf ho-pilot-duration {
+      type uint8 {
+        range "20..50";
+      }
+      units "100ms";
+      config false;
+      description
+        "Timethreshold for handout declaration (in {{units}})";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.HOPilotDuration";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.";
+  }
+
+  grouping cdma2000-one-x-ran-hard-handoff-stats-g {
+    description
+      "This object contains statistics for all Handouts of the 1x FAP.";
+    leaf tx-ho-required {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of Handout Required messages sent to the MSC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.TxHORequired";
+    }
+    leaf rx-ho-command {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of Handout Command messegaes received from the MSC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.RxHOCommand";
+    }
+    leaf ho-required-rejected {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of HO required requests rejected by the MSC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.HORequiredRejected";
+    }
+    leaf ho-required-unanswered {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of HO required requests for which no response received from the MSC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.HORequiredUnanswered";
+    }
+    leaf tx-uhdm {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number UHDMs sent to mobiles";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.TxUHDM";
+    }
+    leaf rx-ns-ack {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of MSAcks received from the mobile in response to UHDM";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.RxNSAck";
+    }
+    leaf ho-failure-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of Handout attempts declared as failure";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.HOFailureCount";
+    }
+    leaf call-drop-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total numer of call drops after a HO attempt. RTC lost without MSack";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.CallDropCount";
+    }
+    leaf tx-ho-commence {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of Handout Commenced messages sent to MSC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.TxHOCommence";
+    }
+    leaf rx-ho-session-clear {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of session clear commands received form the core";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.RxHOSessionClear";
+    }
+    leaf return-on-failure-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of times a Return On Handoff failure was declared";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.ReturnOnFailureCount";
+    }
+    leaf one-pilot-report-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of times only one pilot was reported in HO Required message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.OnePilotReportCount";
+    }
+    leaf two-pilot-report-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of times only two pilot was reported in HO Required message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.TwoPilotReportCount";
+    }
+    leaf three-pilot-report-count {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of times only three pilot was reported in HO Required message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.ThreePilotReportCount";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.HardHandoff.Stats.";
+  }
+
+  grouping cdma2000-one-x-ran-power-control-g {
+    description
+      "Configuration Managed Object for OTA power control attribute.";
+    leaf one-xpcfpc-incl {
+      type int64;
+      config false;
+      description
+        "Whether Forward power control information included in Power Control message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCFPCIncl";
+    }
+    leaf one-xpcfpcfch-min-setpt {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "The value for the minimum Fundamental Channel Outer Loop Eb/Nt setpoint, in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCFPCFCHMinSetpt";
+    }
+    leaf one-xpcfpcfch-max-setpt {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "The value for the maximum Fundamental Channel Outer Loop Eb/Nt setpoint, in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCFPCFCHMaxSetpt";
+    }
+    leaf one-xpcrpc-incl {
+      type int64;
+      config false;
+      description
+        "Whether reverse Power control information included in the Power Control Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCRPCIncl";
+    }
+    leaf one-xpcfch-chan-adj-gain {
+      type int64;
+      units "0.125 dB";
+      config false;
+      description
+        "Channel adjustment gain (in {{units}}) for Reverse Fundamental Channel.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCFCHChanAdjGain";
+    }
+    leaf one-xpc-pwr-rep-thresh {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "The number of bad frames to be received in a measurement period on the channel which carries the Power Control Subchannel before mobile stations are to generate a Power easurement Report Message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCPwrRepThresh";
+    }
+    leaf one-xpc-pwr-rep-frames {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "Power control reporting frame count. Number of frames over which the mobile station measures frame errors. For example, 7 corresponds to 55 frames. Refer to {{bibref|3GPP2-C.S0005}} for mapping between this value and the actual frame count.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCPwrRepFrames";
+    }
+    leaf one-x-pwr-thresh-enable {
+      type int64;
+      config false;
+      description
+        "Threshold report mode indicator. If the mobile station is to generate threshold Power Measurement Report Messages, the base station shall set this field to '1'. If the mobile station is not to generate threshold Power Measurement Report Messages, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPwrThreshEnable";
+    }
+    leaf one-xpc-pwr-period-enable {
+      type int64;
+      config false;
+      description
+        "Periodic report mode indicator. If the mobile station is to generate periodic Power Measurement Report Messages, the base station shall set this field to '1'. If the mobile station is not to generate periodic Power Measurement Report Messages, the base station shall set this field to '0'.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCPwrPeriodEnable";
+    }
+    leaf one-xpc-pwr-rep-delay {
+      type uint8 {
+        range "0..31";
+      }
+      units "4 frames";
+      config false;
+      description
+        "Power report delay. The period that the mobile station waits following a Power Measurement Report Message before restarting frame counting for power control purposes. The base station shall set this field to the power report delay values in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.OneXPCPwrRepDelay";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.PowerControl.";
+  }
+
+  grouping cdma2000-one-x-ran-neighbor-list-g {
+    description
+      "This object contains information common to all neighbors of a sector. This object has only one instance.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.Alias";
+    }
+    leaf pilot-inc {
+      type int64;
+      config false;
+      description
+        "pilot increment policy for this network. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.PilotInc";
+    }
+    leaf one-x-neighbor-index {
+      type int64;
+      description
+        "Macro neighbour index. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OneXNeighborIndex";
+    }
+    leaf neighbor-config {
+      type enumeration {
+        enum "same-config" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborConfig - SameConfig";
+        }
+        enum "same-paging" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborConfig - SamePaging";
+        }
+        enum "diff-paging" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborConfig - DiffPaging";
+        }
+        enum "unknown" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborConfig - Unknown";
+        }
+      }
+      config false;
+      description
+        "Neighbor configuration in terms of number of frequencies having paging channels as defined in Section 3.7.2.3.2 of the {{bibref|3GPP2-C.S0005}} standard";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborConfig";
+    }
+    leaf neighbor-pn {
+      type int64;
+      description
+        "PN offset of the neighbor. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborPN";
+    }
+    leaf search-priority {
+      type enumeration {
+        enum "low" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.SearchPriority - Low";
+        }
+        enum "medium" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.SearchPriority - Medium";
+        }
+        enum "high" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.SearchPriority - High";
+        }
+        enum "very-high" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.SearchPriority - VeryHigh";
+        }
+      }
+      config false;
+      description
+        "priority level for serching this neighbor. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.SearchPriority";
+    }
+    leaf neighbor-band {
+      type enumeration {
+        enum "0" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 0";
+        }
+        enum "1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 1";
+        }
+        enum "2" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 2";
+        }
+        enum "3" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 3";
+        }
+        enum "4" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 4";
+        }
+        enum "5" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 5";
+        }
+        enum "6" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand - 6";
+        }
+      }
+      config false;
+      description
+        "Neighbor band class. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborBand";
+    }
+    leaf neighbor-frequency {
+      type int64;
+      config false;
+      description
+        "frequency of neighbor. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.NeighborFrequency";
+    }
+    leaf frequency-included {
+      type int64;
+      config false;
+      description
+        "Flag to indicate if the channel id included. See {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.FrequencyIncluded";
+    }
+    leaf in-traffic {
+      type int64;
+      config false;
+      description
+        "whether this neighbor can be used for in-traffic neighborlist message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.InTraffic";
+    }
+    leaf overhead-msg {
+      type int64;
+      config false;
+      description
+        "whether this neighbor can be used for overhead neighborlist message";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OverheadMsg";
+    }
+    leaf base-identifier {
+      type int64;
+      config false;
+      description
+        "unique identifire of the neighboring cell (optional)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.BaseIdentifier";
+    }
+    leaf air-interface {
+      type enumeration {
+        enum "one-x" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.AirInterface - OneX";
+        }
+        enum "is95" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.AirInterface - IS95";
+        }
+        enum "hrpd" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.AirInterface - HRPD";
+        }
+        enum "other" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.AirInterface - Other";
+        }
+      }
+      config false;
+      description
+        "Air interface technology of the neighbor.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.AirInterface";
+    }
+    leaf hand-out-capable {
+      type int64;
+      config false;
+      description
+        "Flag to indicate if the handOutCapability is possible.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.HandOutCapable";
+    }
+    leaf one-x-neighbor-longitude {
+      type string {
+        length "0..16";
+      }
+      config false;
+      description
+        "Longitude for this neighbor. Parameter is a string representing a floating point real number (+/- XXX.YY). Where + for East, - for West, XXX.Y ranges between 0.0 and 180.0 .";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OneXNeighborLongitude";
+    }
+    leaf one-x-neighbor-latitude {
+      type string {
+        length "0..16";
+      }
+      config false;
+      description
+        "Lattitude for this neighbor. Parameter is a string representing a floating point number (+/-XX.Y). + for North, - for South, XX.Y ranges between 0.0 and 90.0.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OneXNeighborLatitude";
+    }
+    leaf one-x-neighbor-msc-id {
+      type uint32 {
+        range "0..16777215";
+      }
+      config false;
+      description
+        "IOS MSCID of the neighbors. See {{bibref|3GPP2-A.S0014}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OneXNeighborMSCId";
+    }
+    leaf one-x-neighbor-ios-cell-id {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Cell Identifier of the neighbor (formatted according to Cell Identification Discriminator = '0000 0010', i.e., 12-bit cell value and 4-bit sector value). See {{bibref|3GPP2-A.S0014}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.OneXNeighborIOSCellId";
+    }
+    leaf force-in-overhead {
+      type boolean;
+      config false;
+      description
+        "If {{param}} is set to {{true}}, the FAP SHOULD include this Neighbor List entry in the Neighbor List overhead messages (see {{bibref|3GPP2-C.S0005}}. Otherwise, {{param}} is set to {{false}}, in which case the FAP MAY include this Neighbor List entry in the Neighbor List overhead messages.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.ForceInOverhead";
+    }
+    leaf included-in-overhead {
+      type boolean;
+      description
+        "If {{param}} is set to {{true}}, the FAP is currently including this Neighbor List entry in the Neighbor List overhead messages (see {{bibref|3GPP2-C.S0005}}. Otherwise, {{param}} is set to {{false}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.IncludedInOverhead";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.NeighborList.{i}.";
+  }
+
+  grouping cdma2000-one-x-ran-apidm-g {
+    description
+      "This object can be configured only if {{param|.Capabilities.CDMA2000.OneX.FemtoOverheadMessagesCapable}} is set to {{true}}.";
+    leaf association-type {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "The FAP shall set this field to the value shown in {{bibref|3GPP2-C.S0005}} corresponding to the configuration of the base station.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.AssociationType";
+    }
+    leaf apidlen {
+      type uint8 {
+        range "0..15";
+      }
+      config false;
+      description
+        "The FAP shall set this field to the length of the access point identification in units of 16 bits. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.APIDLEN";
+    }
+    leaf apid {
+      type binary {
+        length "0..16";
+      }
+      config false;
+      description
+        "Access Point Identification. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.APID";
+    }
+    leaf apidmask {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Access Point identification Mask. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.APIDMASK";
+    }
+    leaf iosmscid {
+      type uint32 {
+        range "0..16777215";
+      }
+      config false;
+      description
+        "MSC_ID of the base station. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.IOSMSCID";
+    }
+    leaf ioscellid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "CELL_ID of the base station. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.IOSCELLID";
+    }
+    leaf intrafreqhohysincl {
+      type boolean;
+      config false;
+      description
+        "This field indicates whether the INTRAFREQHOHYS field is valid and included in Access Point Identification message. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTRAFREQHOHYSINCL";
+    }
+    leaf intrafreqhohys {
+      type uint8 {
+        range "0..127";
+      }
+      config false;
+      description
+        "Intra Frequency Handoff Hysteresis. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTRAFREQHOHYS";
+    }
+    leaf intrafreqhoslopeincl {
+      type boolean;
+      config false;
+      description
+        "This field indicates whether the INTRAFREQHOSLOPE field is valid and included in Access Point Identification message. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTRAFREQHOSLOPEINCL";
+    }
+    leaf intrafreqhoslope {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "Intra Frequency Handoff Slope. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTRAFREQHOSLOPE";
+    }
+    leaf interfreqhohysincl {
+      type boolean;
+      config false;
+      description
+        "This field indicates whether the INTERFREQHOHYS field is valid and included in Access Point Identification message. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQHOHYSINCL";
+    }
+    leaf interfreqhohys {
+      type uint8 {
+        range "0..127";
+      }
+      config false;
+      description
+        "Inter frequency handoff hysteresis. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQHOHYS";
+    }
+    leaf interfreqhoslopeincl {
+      type boolean;
+      config false;
+      description
+        "This field indicates whether the INTERFREQHOSLOPE field is valid and included in Access Point Identification message. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQHOSLOPEINCL";
+    }
+    leaf interfreqhoslope {
+      type uint8 {
+        range "0..63";
+      }
+      config false;
+      description
+        "Inter frequency handoff slope. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQHOSLOPE";
+    }
+    leaf interfreqsrchthincl {
+      type boolean;
+      config false;
+      description
+        "This field indicates whether the INTERFREQSRCHTH field is valid and included in Access Point Identification message. Refer {{bibref|3GPP2-C.S0005}} for definition.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQSRCHTHINCL";
+    }
+    leaf interfreqsrchth {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "Inter-frequency search threshold. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.INTERFREQSRCHTH";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDM.";
+  }
+
+  grouping cdma2000-one-x-ran-apidtm-g {
+    description
+      "This object can be configured only if {{param|.Capabilities.CDMA2000.OneX.FemtoOverheadMessagesCapable}} is set to {{true}}.";
+    leaf apidtextcha-ri-len {
+      type uint16 {
+        range "0..256";
+      }
+      config false;
+      description
+        "Access Point identification Text CHARi field Length ({{param|APIDTEXTCHARi}}). Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDTM.APIDTEXTCHARiLEN";
+    }
+    leaf apidtextmsgencoding {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "Access Point identification Text message encoding. Refer {{bibref|3GPP2-C.S0005}} and {{bibref|3GPP2-C.R1001}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDTM.APIDTEXTMSGENCODING";
+    }
+    leaf apidtextcha-ri {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "Access Point Identification Text. Refer {{bibref|3GPP2-C.S0005}} and {{bibref|3GPP2-C.R1001}} for definitions.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDTM.APIDTEXTCHARi";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APIDTM.";
+  }
+
+  grouping cdma2000-one-x-ran-appim-g {
+    description
+      "This object can be configured only if {{param|.Capabilities.CDMA2000.OneX.FemtoOverheadMessagesCapable}} is set to {{true}}.";
+    leaf lifetime {
+      type uint8 {
+        range "0..255";
+      }
+      config false;
+      description
+        "Lifetime of the information in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.LIFETIME";
+    }
+    leaf numappirec {
+      type uint16 {
+        range "0..511";
+      }
+      config false;
+      description
+        "The number of entries for {{object|.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.NUMAPPIREC";
+    }
+    leaf appirec-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIRECNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.";
+  }
+
+  grouping cdma2000-one-x-ran-appim-appirec-g {
+    description
+      "This object can be configured only if {{param|.Capabilities.CDMA2000.OneX.FemtoOverheadMessagesCapable}} is set to {{true}}.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.Alias";
+    }
+    leaf apassntype {
+      type uint8 {
+        range "0..7";
+      }
+      config false;
+      description
+        "Access point association type the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APASSNTYPE";
+    }
+    leaf apsidsameasprevious {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "SID same as previous indicator in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APSIDSAMEASPREVIOUS";
+    }
+    leaf apnidsameasprevious {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "NID same as previous indicator in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APNIDSAMEASPREVIOUS";
+    }
+    leaf apbandsameasprevious {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Bandclass same as previous indicator in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APBANDSAMEASPREVIOUS";
+    }
+    leaf apfreqsameasprevious {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Frequency same as previous indicator in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APFREQSAMEASPREVIOUS";
+    }
+    leaf appnrecsameasprevious {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "PN offset same as previous indicator in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APPNRECSAMEASPREVIOUS";
+    }
+    leaf apsid {
+      type uint16 {
+        range "0..32767";
+      }
+      description
+        "Access point SID in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APSID";
+    }
+    leaf apnid {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Access point NID in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APNID";
+    }
+    leaf apband {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "Access point bandclass in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APBAND";
+    }
+    leaf apfreq {
+      type uint16 {
+        range "0..2047";
+      }
+      description
+        "Access point frequency in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APFREQ";
+    }
+    leaf appnrectype {
+      type uint8 {
+        range "0..7";
+      }
+      description
+        "Access point PN offset in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APPNRECTYPE";
+    }
+    leaf appnreclen {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "Length in octets of the access point PN record ({{param|APPNREC}}) in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APPNRECLEN";
+    }
+    leaf appnrec {
+      type binary {
+        length "0..31";
+      }
+      description
+        "Access point PN Record in the access point pilot information record. Refer {{bibref|3GPP2-C.S0005}} for definitions";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.APPNREC";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.RAN.APPIM.APPIREC.{i}.";
+  }
+
+  grouping cdma2000-one-x-pcf-config-g {
+    description
+      "CDMA2000 1x PCF configuration information.";
+    leaf pcfpdsn-health-monitor-interval {
+      type uint8 {
+        range "0..180";
+      }
+      units "seconds";
+      config false;
+      description
+        "PDSN health check monitor interval in {{units}}. Setting the value to 0 disables the PDSN Health Monitoring Feature. Setting any non-zero value enables the PDSN Health Monitoring Feature and sets that non-zero value as the timer interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPDSNHealthMonitorInterval";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.";
+  }
+
+  grouping cdma2000-one-x-pcf-config-pcf-performance-stats-g {
+    description
+      "This object is used in obtaining the PCF stats";
+    leaf a10-setup-failure-no-reason {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with an unspecified reason (A11 error code : 0x80)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureNoReason";
+    }
+    leaf a10-setup-failure-admin-prohibit {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Admin Prohibited\" (A11 error code : 0x81).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureAdminProhibit";
+    }
+    leaf a10-setup-failure-insuff-resources {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Insufficient Resources\" (A11 error code: 0x82).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureInsuffResources";
+    }
+    leaf a10-setup-failure-failed-auth {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Mobile Node Authentication Failure\" (A11 error code: 0x83).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureFailedAuth";
+    }
+    leaf a10-setup-failure-id-mismatch {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Id Mismatch\" (A11 error code: 0x85)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureIdMismatch";
+    }
+    leaf a10-setup-failure-malformed-req {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Malformed Request\" (A11 error code: 0x86)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureMalformedReq";
+    }
+    leaf a10-setup-failure-unknown-pdsn {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Unknown PDSN\" (A11 error code: 0x88)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureUnknownPDSN";
+    }
+    leaf a10-setup-failure-unsupp-vend-id {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Unsupported Vendor Id\" (A11 error code: 0x89)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10SetupFailureUnsuppVendId";
+    }
+    leaf total-a10-closed-by-rnc {
+      type uint64;
+      description
+        "Number of A10 closed by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10ClosedByRnc";
+    }
+    leaf total-a10-closed-by-pdsn {
+      type uint64;
+      description
+        "Number of A10 closed by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10ClosedByPDSN";
+    }
+    leaf total-a10-success-pages {
+      type uint64;
+      description
+        "Numebr of A10 Pages initiated by PCFsucceeded.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10SuccessPages";
+    }
+    leaf total-a10-failed-pages {
+      type uint64;
+      description
+        "Numebr of A10 Pages initiated by PCF failed.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10FailedPages";
+    }
+    leaf total-a10-ingress-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "Number of {{units}} received from the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10IngressBytes";
+    }
+    leaf total-a10-egress-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "Number of {{units}} transmitted to the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10EgressBytes";
+    }
+    leaf a10-reg-update-received {
+      type uint64;
+      description
+        "Number of A10 Registration updates received by the FAP PCF";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.A10RegUpdateReceived";
+    }
+    leaf total-a10-dropped-pages {
+      type uint64;
+      description
+        "Number of A10 Pages initiated by PCF dropped";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.TotalA10DroppedPages";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFConfig.PCFPerformanceStats.";
+  }
+
+  grouping cdma2000-one-x-batch-pcfpdsn-g {
+    description
+      "The Batch configuration Object used to configure PDSN table using a start and end IP address. The order of the address is used as part of PDSN selection algorithm, e.g., the first element is considered PDSN number 0. (Refer to {{bibref|3GPP2-A.S0013}}). To get individual PDSN entries use the {{object|.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.}}.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.Alias";
+    }
+    leaf batch-table-number {
+      type int64;
+      description
+        "The BatchTable Number should be given only once during the creation of a Batch Table. This is the Key Attribute that uniquely identifies a BatchTable entry. This number indicates the index of this batch to determine the PDSN number in the PDSN selection algorithm ({{bibref|3GPP2-A.S0013}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableNumber";
+    }
+    leaf batch-table-start-ip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "Start IP address of the range of PDSNs.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableStartIPAddress";
+    }
+    leaf batch-table-end-ip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "End IP address of the range of PDSNs.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableEndIPAddress";
+    }
+    leaf batch-table-security-parameter-index {
+      type uint32 {
+        range "0 | 256..4294967295";
+      }
+      config false;
+      description
+        "Security Parameter Index to be used.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableSecurityParameterIndex";
+    }
+    leaf batch-table-secret-key {
+      type binary {
+        length "0..16";
+      }
+      config false;
+      description
+        "Secret key in 32-digit hexidecimal representation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableSecretKey";
+    }
+    leaf batch-table-ios-version {
+      type enumeration {
+        enum "tia-878-ballot" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-ballot";
+        }
+        enum "tia-878-1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-1";
+        }
+        enum "tia-878-a" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-a";
+        }
+        enum "tia-878-legacy" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-legacy";
+        }
+      }
+      config false;
+      description
+        "IOS Version of this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTableIOSVersion";
+    }
+    leaf batch-table-pdsn-admin-status {
+      type int64;
+      config false;
+      description
+        "Administrative status of this PDSN. 0- UP 1-DOWN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.BatchTablePDSNAdminStatus";
+    }
+    leaf pdsn-type {
+      type enumeration {
+        enum "one-x" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.PDSNType - OneX";
+        }
+        enum "hrpd-rev0" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.PDSNType - HRPDRev0";
+        }
+        enum "hrpd-rev-a" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.PDSNType - HRPDRevA";
+        }
+      }
+      config false;
+      description
+        "Indicates the PDSN type for this batch.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.PDSNType";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.";
+  }
+
+  grouping cdma2000-one-x-pcfpdsn-g {
+    description
+      "PCFPDSN Object configured for 1x. {{object|.CellConfig.CDMA2000.OneX.BatchPCFPDSN.{i}.}} table should be used to configure PDSN details.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.Alias";
+    }
+    leaf pdsn-number {
+      type int64;
+      description
+        "Index of this PDSN object in the PCFPDSNCollection array. The index is used as PDSN number in PDSN selection algorithm. ({{bibref|3GPP2-A.S0013}})";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PDSNNumber";
+    }
+    leaf security-parameter-index {
+      type uint32 {
+        range "0 | 256..4294967295";
+      }
+      description
+        "Security Parameter Index used";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.SecurityParameterIndex";
+    }
+    leaf security-key {
+      type binary {
+        length "0..16";
+      }
+      description
+        "Secret key in 32-digit hexidecimal representation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.SecurityKey";
+    }
+    leaf ios-version {
+      type enumeration {
+        enum "tia-878-ballot" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.IOSVersion - TIA-878-ballot";
+        }
+        enum "tia-878-1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.IOSVersion - TIA-878-1";
+        }
+        enum "tia-878-a" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.IOSVersion - TIA-878-a";
+        }
+        enum "tia-878-legacy" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.IOSVersion - TIA-878-legacy";
+        }
+      }
+      config false;
+      description
+        "HRPD IOS Version of this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.IOSVersion";
+    }
+    leaf pds-nadmin-status {
+      type int64;
+      config false;
+      description
+        "Administrative status of this PDSN. 0- UP 1-DOWN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PDSNadminStatus";
+    }
+    leaf pdsn-health-status {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Reachability status of this PDSN. 0-unreachable, 1-reachable.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PDSNHealthStatus";
+    }
+    leaf pdsnip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "IP address of the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PDSNIPAddress";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.";
+  }
+
+  grouping cdma2000-one-x-pcfpdsn-a11-reg-update-stats-g {
+    description
+      "This object is used in obtaining the A11 Registration Update stats for each PDSN";
+    leaf pdsn-number-reg-update-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.PDSNNumberRegUpdatePerf";
+    }
+    leaf pdsnip-address-reg-update-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the A11 Reg Update stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.PDSNIPAddressRegUpdatePerf";
+    }
+    leaf a11-reg-update-received-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-update messages receieved from a PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateReceivedPDSN";
+    }
+    leaf a11-reg-update-id-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages receieved from a PDSN that failed ID validation";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateIDCheckFailPDSN";
+    }
+    leaf a11-reg-update-auth-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN that failed Authentication";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateAuthCheckFailPDSN";
+    }
+    leaf a11-reg-update-for-unknown-psipdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with unknown PSI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateForUnknownPSIPDSN";
+    }
+    leaf a11-reg-update-unspecified-reason-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with unspecified reason code";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUnspecifiedReasonPDSN";
+    }
+    leaf a11-reg-update-ppp-timeout-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PPP Timeout\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePppTimeoutPDSN";
+    }
+    leaf a11-reg-update-registration-timeout-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Registration Timeout\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateRegistrationTimeoutPDSN";
+    }
+    leaf a11-reg-update-pdsn-error-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PDSN Error\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePDSNErrorPDSN";
+    }
+    leaf a11-reg-update-inter-pcf-handoff-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Inter PCF Handoff\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateInterPCFHandoffPDSN";
+    }
+    leaf a11-reg-update-inter-pdsn-handoff-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Inter PDSN Handoff\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateInterPDSNHandoffPDSN";
+    }
+    leaf a11-reg-update-pdsnoamp-intervention-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PDSN OAMP Intervention\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePDSNOAMPInterventionPDSN";
+    }
+    leaf a11-reg-update-accounting-error-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Accounting Error\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateAccountingErrorPDSN";
+    }
+    leaf a11-reg-update-user-failed-authentication-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"User Failed Authentication\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUserFailedAuthenticationPDSN";
+    }
+    leaf a11-reg-update-unknown-cause-code-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with Unknown Cause Code";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUnknownCauseCodePDSN";
+    }
+    leaf a11-reg-update-without-reason-code-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with PDSN Code Not Included";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateWithoutReasonCodePDSN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.A11RegUpdateStats.";
+  }
+
+  grouping cdma2000-one-x-pcfpdsn-pcfpdsn-stats-g {
+    description
+      "This object is used in obtaining the PCF PDSN stats for each PDSN";
+    leaf a10-setup-attempts-pdsn {
+      type uint64;
+      description
+        "Number of attempts the PCF made to establish an A10 connection with PDSN. If PCF fails establishing such a connection on this PDSN and goes on to use another PDSN for that connection, it will be counted as two setup attempts.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10SetupAttemptsPDSN";
+    }
+    leaf a10-setup-successes-pdsn {
+      type uint64;
+      description
+        "Number of times PCF succeeded in establishing an A10 connection with this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10SetupSuccessesPDSN";
+    }
+    leaf a10-setup-blocks-pdsn {
+      type uint64;
+      description
+        "Number of times PCF was blocked in establishing an A10 connection with this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10SetupBlocksPDSN";
+    }
+    leaf a11-reg-req-denied-id-mismatch-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Id Mismatch\" (A11 error code: 0x85) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedIdMismatchPDSN";
+    }
+    leaf a11-reg-req-denied-unknown-pdsnpdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Unknown PDSN\" (A11 error code: 0x88)by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnknownPDSNPDSN";
+    }
+    leaf a11-reg-req-denied-no-reason-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with no reason code by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedNoReasonPDSN";
+    }
+    leaf a11-reg-req-denied-admin-prohibit-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Admin Prohibited\" (A11 error code : 0x81) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedAdminProhibitPDSN";
+    }
+    leaf a11-reg-req-denied-insuff-resources-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Insufficient Resources\" (A11 error code: 0x82) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedInsuffResourcesPDSN";
+    }
+    leaf a11-reg-req-denied-failed-auth-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Mobile Node Authentication Failure\" (A11 error code: 0x83) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedFailedAuthPDSN";
+    }
+    leaf a11-reg-req-denied-malformed-req-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Malformed Request\" (A11 error code: 0x86) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedMalformedReqPDSN";
+    }
+    leaf a11-reg-req-denied-unsupp-vend-id-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Unsupported Vendor Id\" (A11 error code: 0x8D)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnsuppVendIdPDSN";
+    }
+    leaf a11-reg-req-denied-reverse-tunnel-unavailable-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Reverse Tunnel Unavailable\" (A11 error code: 0x89)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedReverseTunnelUnavailablePDSN";
+    }
+    leaf a11-reg-req-denied-reverse-tunnel-tbit-not-set-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Reverse Tunnel Tbit Not Set\" (A11 error code: 0x8A)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedReverseTunnelTbitNotSetPDSN";
+    }
+    leaf a11-reg-req-denied-unknown-error-code-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with an unspecified reason (A11 error code : 0x80) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnknownErrorCodePDSN";
+    }
+    leaf a10-reg-req-for-registration-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 setup";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForRegistrationRetransmissionsPDSN";
+    }
+    leaf a10-reg-req-for-re-registration-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 reregistration";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForReRegistrationRetransmissionsPDSN";
+    }
+    leaf a10-reg-req-for-release-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 realease";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForReleaseRetransmissionsPDSN";
+    }
+    leaf pdsn-number-pdsn-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.PDSNNumberPDSNPerf";
+    }
+    leaf pds-nip-address-pdsn-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the PCF PDSN stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.PDSNipAddressPDSNPerf";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.PCFPDSN.{i}.PCFPDSNStats.";
+  }
+
+  grouping cdma2000-one-x-stats-g {
+    description
+      "This object contains 1x FAP statistics aggregated over all connections of all users over all sectors.";
+    leaf registration-attempts {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of registration attempts";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.RegistrationAttempts";
+    }
+    leaf registration-fails {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of registrations failed";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.RegistrationFails";
+    }
+    leaf registrations-blocked {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Unauthorized registrations blocked by admission control";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.RegistrationsBlocked";
+    }
+    leaf page-attempts {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of attemots to page requests received from the core";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.PageAttempts";
+    }
+    leaf page-fails {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of page requests rejected or not responded";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.PageFails";
+    }
+    leaf voice-call-attempts {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of voice call attempts";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.VoiceCallAttempts";
+    }
+    leaf voice-call-failures {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of voice call attempts which failed for various reasons";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.VoiceCallFailures";
+    }
+    leaf voice-calls-blocked {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of voice calls blocked due to lack of authorization";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.VoiceCallsBlocked";
+    }
+    leaf voice-calls-dropped {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Number of voice calls dropped due to various reasons other than a normal call release";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.VoiceCallsDropped";
+    }
+    leaf data-call-attempts {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of data call attempts";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.DataCallAttempts";
+    }
+    leaf data-call-failures {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of data call attemots failed for various reasons";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.DataCallFailures";
+    }
+    leaf data-calls-blocked {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of data calls failed due to lack of authorization";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.DataCallsBlocked";
+    }
+    leaf data-calls-dropped {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of data calls dropped due to reasons other than a normal release.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.DataCallsDropped";
+    }
+    leaf average-voice-call {
+      type uint32 {
+        range "0..4294967295";
+      }
+      units "milliseconds";
+      description
+        "Average voice call duration in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.AverageVoiceCall";
+    }
+    leaf average-data-call {
+      type uint32 {
+        range "0..4294967295";
+      }
+      units "milliseconds";
+      description
+        "Average data call duration in {{units}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.AverageDataCall";
+    }
+    leaf average-session-in-sec {
+      type uint32 {
+        range "0..4294967295";
+      }
+      units "seconds";
+      description
+        "Average session duration in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.AverageSessionInSec";
+    }
+    leaf total-voice-calls {
+      type uint32 {
+        range "0..4294967295";
+      }
+      units "seconds";
+      description
+        "Total number of successful voice calls";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.TotalVoiceCalls";
+    }
+    leaf total-data-calls {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Total number of successful data calls";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.TotalDataCalls";
+    }
+    leaf fwd-voice-packet-drop-percentage {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Percentage of voice packets dropped in MAC due to signaling";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.FwdVoicePacketDropPercentage";
+    }
+    leaf rev-voice-packet-drop-percentage {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Percentage of voice packets received with bad FQI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.RevVoicePacketDropPercentage";
+    }
+    leaf fwd-avg-data-rate {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Average data rate of the scheduler on the forward link";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.FwdAvgDataRate";
+    }
+    leaf rev-avg-data-rate {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Average data rate of the scheduler on reverse link";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.RevAvgDataRate";
+    }
+    leaf bc-index-zero-to-one-transitions {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Num of times the bcIndex was changed from 0 to 1 in the Extended System Parameters Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.BcIndexZeroToOneTransitions";
+    }
+    leaf bc-index-one-to-zero-transitions {
+      type uint32 {
+        range "0..4294967295";
+      }
+      description
+        "Num of times the bcIndex was changed from 0 to 1 in the Extended System Parameters Message.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.BcIndexOneToZeroTransitions";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Stats.";
+  }
+
+  grouping cdma2000-one-x-redirect-g {
+    description
+      "CDMA2000 1x service redirection parameters.";
+    leaf redirect-channel-number {
+      type uint16 {
+        range "0..2047";
+      }
+      config false;
+      description
+        "The channel number set from ACS that the FAP uses to redirect the MS in case of closed access or when exceeding session capacity. The ACS shall push this if the the operator has provided this information in a configuration file. If this is not configured, the FAP rejects the AT. The supported range is 0..2047.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Redirect.RedirectChannelNumber";
+    }
+    leaf redirect-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "The bandclass set from ACS that the FAP uses to redirect the MS incase of closed access or when exceeding session capacity. The ACS shall push this if the the operator has provided this information in a configuration file. If this is not configured, the FAP rejects the MS. The supported range is 0..9.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Redirect.RedirectBandClass";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.OneX.Redirect.";
+  }
+
+  grouping cdma2000-hrpd-g {
+    description
+      "The object contains attributes related to HRPD.";
+    leaf pcfpdsn-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSNNumberOfEntries";
+    }
+    leaf max-batch-pcfpdsn-entries {
+      type uint64;
+      description
+        "Maximum number of entries in the {{object|.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.MaxBatchPCFPDSNEntries";
+    }
+    leaf batch-pcfpdsn-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSNNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.";
+  }
+
+  grouping cdma2000-hrpd-ran-g {
+    description
+      "The object contains attributes related to HRPD RAN.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.";
+  }
+
+  grouping cdma2000-hrpd-ran-rf-g {
+    description
+      "Contains the details related to HRPD RF";
+    leaf hrpd-car-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "The Band Class this HRPD Carrier object is to operate on. Reference - {{bibref|3GPP2-C.S0057}}, Band Class Specification for CDMA2000 Spread Spectrum Systems.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.HRPDCarBandClass";
+    }
+    leaf-list rfcnfl {
+      type string {
+        length "0..64";
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a FL Radio Frequency Channel Number (RFCN). Self-configuration for RFCNFL is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.RFCNFLConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.RFCNFLSelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for RFCNFL is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for {{param|RFCNFLInUse}}. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. If multiple items are specified, they are done in the order of preference.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RFCNFL";
+    }
+    leaf rfcnfl-in-use {
+      type uint64;
+      description
+        "The FL RFCN being used by the FAP. Self-configuration for RFCNFL is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.RFCNFLConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.RFCNFLSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|RFCNFL}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first value in {{param|RFCNFL}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RFCNFLInUse";
+    }
+    leaf-list pilot-pn {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "{{list}} (maximum length 32) (minimum 1 items) of strings. Each item is a pilot PN offset in units of 64 PN chips. Self-configuration for pilot PN is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.PilotPNConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.PilotPNSelfConfigEnable}} from an enabled perspective. If the FAP's self-configuration capability for Pilot PN Offset is available and enabled, this parameter MAY contain more than one item and the FAP is expected to select one from the list for {{param|PilotPNInUse}}. If the self-configuration capability is not available or not enabled, then this parameter SHOULD contain only a single item. The multiplicity of the PN offsets values can also be expressed by defining a range using \"..\" (two periods) between two values. In this case, the combination of two values defines the lower-bound and upper-bound of the range inclusive. The order of the items has no significance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.PilotPN";
+    }
+    leaf pilot-pn-in-use {
+      type uint64;
+      config false;
+      description
+        "The Pilot PN Offset being used by the FAP. Self-configuration for Pilot PN Offset is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.PilotPNConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.PilotPNSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the choices provided in {{param|PilotPN}}. If the self-configuration capability is not available or not enabled, then this parameter contains the first value in {{param|PilotPN}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.PilotPNInUse";
+    }
+    leaf maxfap-tx-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Defines the maximum transmission power allowed on the FAP. {{param}} is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<;Pmax_low>..<;Pmax_high>\". {{param}} identifies the limits between which the FAP can self-configure its maximum transmit power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerSelfConfigEnable}} from an enabled perspective. <;Pmax_low> and <;Pmax_high> are measured in dBm and have a range of -40.0 to 20.0 incremented by 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.MaxFAPTxPower";
+    }
+    leaf maxfap-tx-power-in-use {
+      type int64;
+      units "0.1 dBm";
+      config false;
+      description
+        "The maximum transmission power measured in {{units}} currently used by the FAP. Actual values of the maximum transmission power are -40.0 dBm to 20.0 dBm in steps of {{units}}. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power. Self-configuration for maximum transmission power is controlled by {{param|.Capabilities.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.HRPD.SelfConfig.MaxFAPTxPowerSelfConfigEnable}} from an enabled perspective. If the self-configuration capability is available and enabled, this parameter indicates the value selected by the FAP among the range provided in {{param|MaxFAPTxPower}}. If the self-configuration capability is not available or not enabled, then this parameter contains a value selected by the ACS.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.MaxFAPTxPowerInUse";
+    }
+    leaf control-channel-rate {
+      type int64;
+      config false;
+      description
+        "The data rate of the Control Channel of this HRPD SectorElement object. Reference - {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification, section-10.4.1.3.2.4";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ControlChannelRate";
+    }
+    leaf sync-capsule-offset {
+      type int64;
+      config false;
+      description
+        "The offset from the control channel cycle boundary at which the synchronous capsules are to be transmitted for this HRPD SectorElement object. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification, section-9.2.6.1.4.1.2";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.SyncCapsuleOffset";
+    }
+    leaf rab-length {
+      type int64;
+      config false;
+      description
+        "The Reverse Activity Bit (RAB) length measured in slots for this HRPD SectorElement object. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification, section-7.8.6.2.2, Table 9.7.6.2-2.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RabLength";
+    }
+    leaf rab-offset {
+      type int64;
+      config false;
+      description
+        "The Reverse Activity Bit (RAB) offset for this HRPD SectorElement object. Reference - {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification, section-7.8.6.2.2.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RabOffset";
+    }
+    leaf sector-id {
+      type binary {
+        length "16";
+      }
+      config false;
+      description
+        "The 128 bit Sector ID for this HRPD SectorElement object. The Sector ID is used in the computation of the long code mask. See {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.SectorID";
+    }
+    leaf color-code {
+      type int64;
+      config false;
+      description
+        "The HRPD color code associated with this sector-element. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ColorCode";
+    }
+    leaf subnet-mask-length {
+      type int64;
+      units "bits";
+      config false;
+      description
+        "{{param}} is the length of the HRPD SubnetMask in {{units}}. See {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.SubnetMaskLength";
+    }
+    leaf hrpd-sec-el-reverse-link-silence-duration {
+      type int64;
+      units "frames";
+      config false;
+      description
+        "Duration of the Reverse Link Silence Interval in units of {{units}}. The duration of the silence interval to be maintained on the reverse link. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.1.4.1.1.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.HRPDSecElReverseLinkSilenceDuration";
+    }
+    leaf hrpd-sec-el-reverse-link-silence-period {
+      type int64;
+      units "frames";
+      config false;
+      description
+        "The Reverse Link Silence Interval is defined as the time interval of duration ReverseLinkSilenceDuration frames that starts at times T where T is the CDMA System Time in units of {{units}} and it satisfies the following equation: T mod (2048 x 2^(ReverseLinkSilencePeriod) - 1) = 0. The period in the access cycle duration for which the silence interval shall be maintained on the reverse link. {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.1.4.1.1.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.HRPDSecElReverseLinkSilencePeriod";
+    }
+    leaf open-loop-adjust {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "The open loop adjustment (in {{units}}) for the access parameters of this sector-element. FAP sets this field to the negative of the nominal power to be used by ATs in the open loop power estimate, expressed as an unsigned value in units of 1 dB. The value used by the AT is -1 times the value of this field. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.2.6";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.OpenLoopAdjust";
+    }
+    leaf probe-initial-adjust {
+      type int64;
+      units "dB";
+      config false;
+      description
+        "The probe initial adjustment (in {{units}}) for the access parameters of this sector-element. FAP sets this field to the correction factor to be used by ATs in the open loop power estimate for the initial transmission on the Access Channel, expressed as a two's complement value in units of 1 dB. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.2.6";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ProbeInitialAdjust";
+    }
+    leaf probe-num-steps {
+      type int64;
+      config false;
+      description
+        "The number of power level steps for access probes for the access parameters of this sector-element. FAP sets this field to the maximum number of access probes ATs are to transmit in a single access probe sequence. The access network shall set this field to a value in the range [1 ... 15]. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.2.6";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ProbeNumSteps";
+    }
+    leaf probe-power-step {
+      type int64;
+      units "0.5 dB";
+      config false;
+      description
+        "The power step size (in {{units}}) applied to successive probes on the access channel associated with this sector-element. Probe power increase step. FAPsets this field to the increase in power between probes, in resolution of 0.5 dB. Reference -{{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.2.6";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ProbePowerStep";
+    }
+    leaf a-persistence {
+      type string {
+        length "0..16";
+      }
+      config false;
+      description
+        "The A-Persistence vector, as per HRPD specification, for controlling contention access on the access channel associated with this sector-element. Reference - {{bibref|3GPP2-C.S0024-B}}, CDMA2000 High Rate Packet Data Air Interface Specification. Section-9.4.6.2.6. Format is \"0xAABBCCDD\", where AA, BB, CC, DD are in the range \"01\" through \"3F\" hex.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.APersistence";
+    }
+    leaf rssirab-threshold {
+      type int64;
+      units "0.125 dBm";
+      config false;
+      description
+        "RAB threshold for RSSI based RAB algorithm.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RSSIRABThreshold";
+    }
+    leaf load-rab-threshold {
+      type uint16 {
+        range "0..480";
+      }
+      units "0.125 dB";
+      config false;
+      description
+        "RAB threshold for Load based RAB algorithm in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.LoadRABThreshold";
+    }
+    leaf connection-rate-limit {
+      type uint8 {
+        range "0..3";
+      }
+      config false;
+      description
+        "4 different configurations.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.ConnectionRateLimit";
+    }
+    leaf rfe-rl-balance-ratio {
+      type uint8 {
+        range "1..20";
+      }
+      config false;
+      description
+        "Config Parameter for DRC based rate control";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.RfeRLBalanceRatio";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RAN.RF.";
+  }
+
+  grouping cdma2000-hrpd-pcf-config-g {
+    description
+      "CDMA2000 HRPD PCF configuration parameters.";
+    leaf pcfpdsn-health-monitor-interval {
+      type uint8 {
+        range "0..180";
+      }
+      units "seconds";
+      config false;
+      description
+        "PDSN health check monitor interval in {{units}}. Setting the value to 0 disables the PDSN Health Monitoring Feature. Setting any non-zero value enables the PDSN Health Monitoring Feature and sets that non-zero value as the timer interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPDSNHealthMonitorInterval";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.";
+  }
+
+  grouping cdma2000-hrpd-pcf-config-pcf-performance-stats-g {
+    description
+      "This object is used in obtaining the PCF stats";
+    leaf a10-setup-failure-no-reason {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with an unspecified reason (A11 error code : 0x80)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureNoReason";
+    }
+    leaf a10-setup-failure-admin-prohibit {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Admin Prohibited\" (A11 error code : 0x81).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureAdminProhibit";
+    }
+    leaf a10-setup-failure-insuff-resources {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Insufficient Resources\" (A11 error code: 0x82).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureInsuffResources";
+    }
+    leaf a10-setup-failure-failed-auth {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Mobile Node Authentication Failure\" (A11 error code: 0x83).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureFailedAuth";
+    }
+    leaf a10-setup-failure-id-mismatch {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Id Mismatch\" (A11 error code: 0x85)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureIdMismatch";
+    }
+    leaf a10-setup-failure-malformed-req {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Malformed Request\" (A11 error code: 0x86)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureMalformedReq";
+    }
+    leaf a10-setup-failure-unknown-pdsn {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Unknown PDSN\" (A11 error code: 0x88)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureUnknownPDSN";
+    }
+    leaf a10-setup-failure-unsupp-vend-id {
+      type uint64;
+      description
+        "Number of times the PCF was refused an A10 connection with a reason \"Unsupported Vendor Id\" (A11 error code: 0x89)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10SetupFailureUnsuppVendId";
+    }
+    leaf total-a10-closed-by-rnc {
+      type uint64;
+      description
+        "Number of A10 closed by the FAP RNC";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10ClosedByRnc";
+    }
+    leaf total-a10-closed-by-pdsn {
+      type uint64;
+      description
+        "Number of A10 closed by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10ClosedByPDSN";
+    }
+    leaf total-a10-success-pages {
+      type uint64;
+      description
+        "Numebr of A10 Pages initiated by PCFsucceeded";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10SuccessPages";
+    }
+    leaf total-a10-failed-pages {
+      type uint64;
+      description
+        "Numebr of A10 Pages initiated by PCF failed";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10FailedPages";
+    }
+    leaf total-a10-ingress-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "Number of {{units}} received from the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10IngressBytes";
+    }
+    leaf total-a10-egress-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "Number of {{units}} transmitted to the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10EgressBytes";
+    }
+    leaf a10-reg-update-received {
+      type uint64;
+      description
+        "Number of A10 Registration updates received by the FAP PCF";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.A10RegUpdateReceived";
+    }
+    leaf total-a10-dropped-pages {
+      type uint64;
+      description
+        "Number of A10 Pages initiated by PCF dropped";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.TotalA10DroppedPages";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFConfig.PCFPerformanceStats.";
+  }
+
+  grouping cdma2000-hrpd-batch-pcfpdsn-g {
+    description
+      "The Batch configuration Object used to configure PDSN table using a start and end IP address. The order of the address is used as part of PDSN selection algorithm, e.g., the first element is considered PDSN number 0 (refer to {{bibref|3GPP2-A.S0008}} and {{bibref|3GPP2-A.S0009}}). To get individual PDSN entries use the {{object|.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.}}.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.Alias";
+    }
+    leaf batch-table-number {
+      type int64;
+      description
+        "The BatchTable Number should be given only once during the creation of a Batch Table. This is the Key Attribute that uniquely identifies a BatchTable entry";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableNumber";
+    }
+    leaf batch-table-start-ip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "Start IP address of the range of PDSNs";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableStartIPAddress";
+    }
+    leaf batch-table-end-ip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "End IP address of the range of PDSNs";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableEndIPAddress";
+    }
+    leaf batch-table-security-parameter-index {
+      type uint32 {
+        range "0 | 256..4294967295";
+      }
+      description
+        "Security Parameter Index to be used";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableSecurityParameterIndex";
+    }
+    leaf batch-table-secret-key {
+      type binary {
+        length "0..16";
+      }
+      description
+        "Secret key in 32-digit hexidecimal representation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableSecretKey";
+    }
+    leaf batch-table-ios-version {
+      type enumeration {
+        enum "tia-878-ballot" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-ballot";
+        }
+        enum "tia-878-1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-1";
+        }
+        enum "tia-878-a" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-a";
+        }
+        enum "tia-878-legacy" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableIOSVersion - TIA-878-legacy";
+        }
+      }
+      config false;
+      description
+        "HRPD IOS Version of this PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTableIOSVersion";
+    }
+    leaf batch-table-pdsn-admin-status {
+      type int64;
+      config false;
+      description
+        "Administrative status of this PDSN. 0- UP 1-DOWN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.BatchTablePDSNAdminStatus";
+    }
+    leaf pdsn-type {
+      type string {
+        length "0..32";
+      }
+      config false;
+      description
+        "Indicates the PDSN type for this batch.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.PDSNType";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.";
+  }
+
+  grouping cdma2000-hrpd-pcfpdsn-g {
+    description
+      "PCFPDSN Object configured for HRPD. {{object|.CellConfig.CDMA2000.HRPD.BatchPCFPDSN.{i}.}} table should be used to configure PDSN details.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.Alias";
+    }
+    leaf pdsn-number {
+      type int64;
+      description
+        "Index of this PDSN object in the PCFPDSNCollection array. The index is used as PDSN number in PDSN selection algorithm (refer to {{bibref|3GPP2-A.S0008}} and {{bibref|3GPP2-A.S0009}})";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PDSNNumber";
+    }
+    leaf security-parameter-index {
+      type uint32 {
+        range "256..4294967295";
+      }
+      description
+        "Security Parameter Index used";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.SecurityParameterIndex";
+    }
+    leaf security-key {
+      type binary {
+        length "0..16";
+      }
+      description
+        "Secret key in 32-digit hexidecimal representation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.SecurityKey";
+    }
+    leaf ios-version {
+      type enumeration {
+        enum "tia-878-ballot" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.IOSVersion - TIA-878-ballot";
+        }
+        enum "tia-878-1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.IOSVersion - TIA-878-1";
+        }
+        enum "tia-878-a" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.IOSVersion - TIA-878-a";
+        }
+        enum "tia-878-legacy" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.IOSVersion - TIA-878-legacy";
+        }
+      }
+      config false;
+      description
+        "HRPD IOS Version of this PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.IOSVersion";
+    }
+    leaf pds-nadmin-status {
+      type int64;
+      config false;
+      description
+        "Administrative status of this PDSN. 0- UP 1-DOWN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PDSNadminStatus";
+    }
+    leaf pdsn-health-status {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Reachability status of this PDSN. 0-unreachable, 1-reachable.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PDSNHealthStatus";
+    }
+    leaf pdsnip-address {
+      type inet:ip-address;
+      config false;
+      description
+        "IP address of the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PDSNIPAddress";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.";
+  }
+
+  grouping cdma2000-hrpd-pcfpdsn-a11-session-update-stats-g {
+    description
+      "This object is used in obtaining the A11 Session Update stats for each PDSN";
+    leaf pdsn-number-session-update-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.PDSNNumberSessionUpdatePerf";
+    }
+    leaf pdsnip-address-session-update-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the A11 Session Update stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.PDSNIPAddressSessionUpdatePerf";
+    }
+    leaf a11-session-update-received-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from a PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateReceivedPDSN";
+    }
+    leaf a11-session-update-accepted-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates accepted for a PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateAcceptedPDSN";
+    }
+    leaf a11-session-update-extended-apipdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN that contained extended API";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateExtendedAPIPDSN";
+    }
+    leaf a11-session-update-for-unknown-psipdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN that conatained unknown PSI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateForUnknownPSIPDSN";
+    }
+    leaf a11-session-update-denied-id-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"ID Check Failed \"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedIDCheckFailPDSN";
+    }
+    leaf a11-session-update-denied-auth-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code\"Auth Check Failed\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedAuthCheckFailPDSN";
+    }
+    leaf a11-session-update-denied-reason-unspecified-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"Unspecified Reason\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedReasonUnspecifiedPDSN";
+    }
+    leaf a11-session-update-denied-poorly-formed-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"Poorly Formed\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedPoorlyFormedPDSN";
+    }
+    leaf a11-session-update-denied-session-params-not-updated-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"Parameters Not Updated\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedSessionParamsNotUpdatedPDSN";
+    }
+    leaf a11-session-update-denied-qo-s-profile-id-not-supported-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"QoS Profile Id Not Updated\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedQoSProfileIdNotSupportedPDSN";
+    }
+    leaf a11-session-update-denied-insufficient-resources-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code \"Insufficient Resources\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedInsufficientResourcesPDSN";
+    }
+    leaf a11-session-update-denied-handoff-in-progress-pdsn {
+      type uint64;
+      description
+        "Number of A11 Session Updates received from this PDSN denied due to reason code\"Handoff In Progress\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.A11SessionUpdateDeniedHandoffInProgressPDSN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11SessionUpdateStats.";
+  }
+
+  grouping cdma2000-hrpd-pcfpdsn-a11-reg-update-stats-g {
+    description
+      "This object is used in obtaining the A11 Registration Update stats for each PDSN.";
+    leaf pdsn-number-reg-update-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.PDSNNumberRegUpdatePerf";
+    }
+    leaf pdsnip-address-reg-update-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the A11 Reg Update stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.PDSNIPAddressRegUpdatePerf";
+    }
+    leaf a11-reg-update-received-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-update messages receieved from a PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateReceivedPDSN";
+    }
+    leaf a11-reg-update-id-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages receieved from a PDSN that failed ID validation";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateIDCheckFailPDSN";
+    }
+    leaf a11-reg-update-auth-check-fail-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN that failed Authentication";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateAuthCheckFailPDSN";
+    }
+    leaf a11-reg-update-for-unknown-psipdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with unknown PSI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateForUnknownPSIPDSN";
+    }
+    leaf a11-reg-update-unspecified-reason-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with unspecified reason code";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUnspecifiedReasonPDSN";
+    }
+    leaf a11-reg-update-ppp-timeout-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PPP Timeout\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePppTimeoutPDSN";
+    }
+    leaf a11-reg-update-registration-timeout-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Registration Timeout\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateRegistrationTimeoutPDSN";
+    }
+    leaf a11-reg-update-pdsn-error-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PDSN Error\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePDSNErrorPDSN";
+    }
+    leaf a11-reg-update-inter-pcf-handoff-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Inter PCF Handoff\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateInterPCFHandoffPDSN";
+    }
+    leaf a11-reg-update-inter-pdsn-handoff-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Inter PDSN Handoff\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateInterPDSNHandoffPDSN";
+    }
+    leaf a11-reg-update-pdsnoamp-intervention-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"PDSN OAMP Intervention\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdatePDSNOAMPInterventionPDSN";
+    }
+    leaf a11-reg-update-accounting-error-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"Accounting Error\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateAccountingErrorPDSN";
+    }
+    leaf a11-reg-update-user-failed-authentication-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with reason code \"User Failed Authentication\"";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUserFailedAuthenticationPDSN";
+    }
+    leaf a11-reg-update-unknown-cause-code-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with Unknown Cause Code";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateUnknownCauseCodePDSN";
+    }
+    leaf a11-reg-update-without-reason-code-pdsn {
+      type uint64;
+      description
+        "Number of A10 Reg-Update messages received from a PDSN with PDSN Code Not Included";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.A11RegUpdateWithoutReasonCodePDSN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.A11RegUpdateStats.";
+  }
+
+  grouping cdma2000-hrpd-pcfpdsn-aux-a10-stats-g {
+    description
+      "This object is used in obtaining the Auxillary A10 Connection stats for each PDSN";
+    leaf pdsn-number-aux-a10-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.PDSNNumberAuxA10Perf";
+    }
+    leaf pdsnip-address-aux-a10-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the PCF PDSN stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.PDSNIPAddressAuxA10Perf";
+    }
+    leaf aux-a10-connections-created-in-first-reg-req-pdsn {
+      type uint64;
+      description
+        "Number of Auxillary A10 Connections Created in the First Registration Request Message to the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.AuxA10ConnectionsCreatedInFirstRegReqPDSN";
+    }
+    leaf aux-a10-connections-created-in-subsequent-reg-req-pdsn {
+      type uint64;
+      description
+        "Number of Auxillary A10 Connections Created in Subsequent Registration Request Messages to the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.AuxA10ConnectionsCreatedInSubsequentRegReqPDSN";
+    }
+    leaf aux-a10-fwd-ip-flows-created-pdsn {
+      type uint64;
+      description
+        "Number of Forward IP Flows created with this PDSN for the Auxillary A10s";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.AuxA10FwdIpFlowsCreatedPDSN";
+    }
+    leaf aux-a10-rev-ip-flows-created-pdsn {
+      type uint64;
+      description
+        "Number of Forward IP Flows created with this PDSN for the Auxillary A10s";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.AuxA10RevIpFlowsCreatedPDSN";
+    }
+    leaf aux-a10-ip-flow-accounting-reg-requests-pdsn {
+      type uint64;
+      description
+        "Number of IP flow Accounting Reg Requests sent to the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.AuxA10IpFlowAccountingRegRequestsPDSN";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.AuxA10Stats.";
+  }
+
+  grouping cdma2000-hrpd-pcfpdsn-pcfpdsn-stats-g {
+    description
+      "This object is used in obtaining the PCF PDSN stats for each PDSN";
+    leaf a10-setup-attempts-pdsn {
+      type uint64;
+      description
+        "Number of attempts the PCF made to establish an A10 connection with PDSN. If PCF fails establishing such a connection on this PDSN and goes on to use another PDSN for that connection, it will be counted as two setup attempts.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10SetupAttemptsPDSN";
+    }
+    leaf a10-setup-successes-pdsn {
+      type uint64;
+      description
+        "Number of times PCF succeeded in establishing an A10 connection with this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10SetupSuccessesPDSN";
+    }
+    leaf a10-setup-blocks-pdsn {
+      type uint64;
+      description
+        "Number of times PCF was blocked in establishing an A10 connection with this PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10SetupBlocksPDSN";
+    }
+    leaf a11-reg-req-denied-id-mismatch-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Id Mismatch\" (A11 error code: 0x85) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedIdMismatchPDSN";
+    }
+    leaf a11-reg-req-denied-unknown-pdsnpdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Unknown PDSN\" (A11 error code: 0x88)by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnknownPDSNPDSN";
+    }
+    leaf a11-reg-req-denied-no-reason-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with no reason code by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedNoReasonPDSN";
+    }
+    leaf a11-reg-req-denied-admin-prohibit-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Admin Prohibited\" (A11 error code : 0x81) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedAdminProhibitPDSN";
+    }
+    leaf a11-reg-req-denied-insuff-resources-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Insufficient Resources\" (A11 error code: 0x82) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedInsuffResourcesPDSN";
+    }
+    leaf a11-reg-req-denied-failed-auth-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Mobile Node Authentication Failure\" (A11 error code: 0x83) by the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedFailedAuthPDSN";
+    }
+    leaf a11-reg-req-denied-malformed-req-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with a reason \"Malformed Request\" (A11 error code: 0x86) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedMalformedReqPDSN";
+    }
+    leaf a11-reg-req-denied-unsupp-vend-id-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Unsupported Vendor Id\" (A11 error code: 0x8D)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnsuppVendIdPDSN";
+    }
+    leaf a11-reg-req-denied-reverse-tunnel-unavailable-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Reverse Tunnel Unavailable\" (A11 error code: 0x89)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedReverseTunnelUnavailablePDSN";
+    }
+    leaf a11-reg-req-denied-reverse-tunnel-tbit-not-set-pdsn {
+      type uint64;
+      description
+        "Number ofA11 Registration Request denied with a reason \"Reverse Tunnel Tbit Not Set\" (A11 error code: 0x8A)by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedReverseTunnelTbitNotSetPDSN";
+    }
+    leaf a11-reg-req-denied-unknown-error-code-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Request denied with an unspecified reason (A11 error code : 0x80) by the PDSN";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A11RegReqDeniedUnknownErrorCodePDSN";
+    }
+    leaf a10-reg-req-for-registration-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 setup";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForRegistrationRetransmissionsPDSN";
+    }
+    leaf a10-reg-req-for-re-registration-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 reregistration";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForReRegistrationRetransmissionsPDSN";
+    }
+    leaf a10-reg-req-for-release-retransmissions-pdsn {
+      type uint64;
+      description
+        "Number of A11 Registration Requests retransmitted during A10 realease";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.A10RegReqForReleaseRetransmissionsPDSN";
+    }
+    leaf pdsn-number-pdsn-perf {
+      type int64;
+      description
+        "The PDSN Number";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.PDSNNumberPDSNPerf";
+    }
+    leaf pds-nip-address-pdsn-perf {
+      type inet:ip-address;
+      description
+        "The IP Address of the PDSN for which the PCF PDSN stats is obtained";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.PDSNipAddressPDSNPerf";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.PCFPDSN.{i}.PCFPDSNStats.";
+  }
+
+  grouping cdma2000-hrpd-redirect-g {
+    description
+      "CDMA2000 HRPD service redirection parameters.";
+    leaf redirect-channel-number {
+      type uint16 {
+        range "0..2047";
+      }
+      config false;
+      description
+        "The channel number set from ACS that the FAP uses to redirect the AT in case of closed access or when exceeding session capacity. The ACS shall push this if the the operator has provided this information in a configuration file. If this is not configured, the FAP rejects the AT. The supported range is 0..2047.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.Redirect.RedirectChannelNumber";
+    }
+    leaf redirect-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "The bandclass set from ACS that the FAP uses to redirect the AT incase of closed access or when exceeding session capacity. The ACS shall push this if the the operator has provided this information in a configuration file. If this is not configured, the FAP rejects the AT. The supported range is 0..9.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.Redirect.RedirectBandClass";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.Redirect.";
+  }
+
+  grouping cdma2000-hrpd-call-control-stats-g {
+    description
+      "Details on call control stats";
+    leaf num-session-setup-attempts {
+      type uint64;
+      description
+        "This parameter is a counter for the total number of session instances that are created on a specific FAP when a regular session setup attempt is initiated with an unknown RATI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumSessionSetupAttempts";
+    }
+    leaf num-session-setup-successful {
+      type uint64;
+      description
+        "This parameter is a counter for the total number of successful regular session setup attempts that are initiated with an unknown RATI";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumSessionSetupSuccessful";
+    }
+    leaf num-current-sessions-established {
+      type uint64;
+      description
+        "This parameter is a counter for the total number of successfully established HRPD Sessions that exists on a specific picasso";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumCurrentSessionsEstablished";
+    }
+    leaf num-page-messages-to-at {
+      type uint64;
+      description
+        "The number of times a Page Message was sent to the AT to facilitate the setup of a connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumPageMessagesToAt";
+    }
+    leaf num-pages-succeeded {
+      type uint64;
+      description
+        "The total number of pages succeeded";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumPagesSucceeded";
+    }
+    leaf num-connections-opened {
+      type uint64;
+      description
+        "Total HRPD Connections Opened";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumConnectionsOpened";
+    }
+    leaf num-session-setups-failed-to-term-auth {
+      type uint64;
+      description
+        "This parameter is a counter for the total number of HRPD session setups that are aborted due to various failure reasons";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumSessionSetupsFailedToTermAuth";
+    }
+    leaf num-forward-rlp-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "Number of HRPD packets(bytes) sent from PDSN to AT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumForwardRLPBytes";
+    }
+    leaf num-reverse-rlp-bytes {
+      type uint64;
+      units "bytes";
+      description
+        "No. of HRPD packets(bytes) sent from AT to PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumReverseRLPBytes";
+    }
+    leaf average-session-setup-time {
+      type uint64;
+      units "10 ms";
+      description
+        "This parameter maintains a record of the average session setup time for all successfully setup sessions on a specific FAP. The average session setup time is in units of {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.AverageSessionSetupTime";
+    }
+    leaf average-page-setup-time {
+      type uint64;
+      description
+        "The average connection setup time in response to a FAP initiated page. The time is from initiation of Page to the time the connection is declared open";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.AveragePageSetupTime";
+    }
+    leaf num-conn-setups-aborted {
+      type uint64;
+      description
+        "The number of connection setups that were aborted";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumConnSetupsAborted";
+    }
+    leaf num-forward-pre-rlp-dropped-pkts {
+      type uint64;
+      description
+        "Number of packets dropped at Pre-RLP queue due to overflow in forward direction. This counter will also be written to the performance log.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.NumForwardPreRLPDroppedPkts";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.CallControlStats.";
+  }
+
+  grouping cdma2000-hrpd-qo-s-stats-g {
+    description
+      "This object is used in obtaining the QoS Common Performance stats";
+    leaf num-qo-s-subscriber-profile-updates-rcvd {
+      type uint64;
+      description
+        "Number of subscriber QoS profile updates received from the PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumQoSSubscriberProfileUpdatesRcvd";
+    }
+    leaf num-pdsnip-flow-updates-msg-rcvd {
+      type uint64;
+      description
+        "Number of PDSN IP flow update messages received from PDSN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumPDSNIPFlowUpdatesMsgRcvd";
+    }
+    leaf num-pdsnip-flow-updates-msg-failed {
+      type uint64;
+      description
+        "Number of PDSN IP Flow updates messages that failed per RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumPDSNIPFlowUpdatesMsgFailed";
+    }
+    leaf num-qo-s-setup-requests-received {
+      type uint64;
+      description
+        "Number of QoS setup requests received from the AT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumQoSSetupRequestsReceived";
+    }
+    leaf num-qo-s-setup-requests-accepted {
+      type uint64;
+      description
+        "Number of QoS setup requests received from the AT that the FAP RNC accepted.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumQoSSetupRequestsAccepted";
+    }
+    leaf num-qo-s-setup-requests-rejected {
+      type uint64;
+      description
+        "Number of QoS setup requests from the AT that the FAP RNC rejected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumQoSSetupRequestsRejected";
+    }
+    leaf num-reservation-on-requests-received {
+      type uint64;
+      description
+        "Number of ReservationOnRequest messages received from the AT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOnRequestsReceived";
+    }
+    leaf num-reservation-on-requests-accepted {
+      type uint64;
+      description
+        "Number of ReservationOnRequest messages received from the AT that the FAP RNC accepted.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOnRequestsAccepted";
+    }
+    leaf num-reservation-on-requests-rejected {
+      type uint64;
+      description
+        "Number of ReservationOnRequest message received from the AT that the FAP RNC rejected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOnRequestsRejected";
+    }
+    leaf num-reservation-on-requests-failed {
+      type uint64;
+      description
+        "Number of ReservationOnRequest message received from the AT that the FAP RNC failed.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOnRequestsFailed";
+    }
+    leaf num-fwd-reservation-on-messages-sent {
+      type uint64;
+      description
+        "Number of times the FAP RNC sent a FwdReservationOn message to the AT to activate a forward Reservation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumFwdReservationOnMessagesSent";
+    }
+    leaf num-rev-reservation-on-messages-sent {
+      type uint64;
+      description
+        "Number of times the FAP RNC sent a RevReservationOn message to the AT to activate a reverse Reservation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumRevReservationOnMessagesSent";
+    }
+    leaf num-reservation-off-requests-received {
+      type uint64;
+      description
+        "Number of ReservationOffRequest message is received from the AT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOffRequestsReceived";
+    }
+    leaf num-reservation-off-requests-accepted {
+      type uint64;
+      description
+        "Number of ReservationOffRequest messages received from the AT that the FAP RNC accepted.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOffRequestsAccepted";
+    }
+    leaf num-reservation-off-requests-rejected {
+      type uint64;
+      description
+        "Number of ReservationOffRequest messages received from the AT that the FAP RNC rejected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumReservationOffRequestsRejected";
+    }
+    leaf num-fwd-reservation-off-messages-sent {
+      type uint64;
+      description
+        "Number of times the FAP RNC sent a FwdReservationOff message to the AT to deactivate a forward Reservation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumFwdReservationOffMessagesSent";
+    }
+    leaf num-rev-reservation-off-messages-sent {
+      type uint64;
+      description
+        "Number of times the FAP RNC sent a RevReservationOff message to the AT to deactivate a reverse Reservation.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumRevReservationOffMessagesSent";
+    }
+    leaf num-qo-s-release-requests-received {
+      type uint64;
+      description
+        "Number of QoS release requests received from the AT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumQoSReleaseRequestsReceived";
+    }
+    leaf num-connection-close-initiated-no-ran-rsr {
+      type uint64;
+      description
+        "Number of times FAP RNC initiated a connection close in response to the ReservationOnRequest because it did not have the RAN resources to satisfy one or more Reservations included in the request.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.NumConnectionCloseInitiatedNoRANRsr";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.QoSStats.";
+  }
+
+  grouping cdma2000-hrpd-rnc-sig-apps-stats-g {
+    description
+      "Stats for HRPD RNC signaling procedures.";
+    leaf c-num-page-requests {
+      type uint64;
+      description
+        "Number of HRPD Page requests made after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumPageRequests";
+    }
+    leaf s-num-page-requests {
+      type uint64;
+      description
+        "Number of HRPD Page requests made before data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumPageRequests";
+    }
+    leaf s-num-connection-setup-attempts {
+      type uint64;
+      description
+        "Number of HRPD Connection setups attempted before data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumConnectionSetupAttempts";
+    }
+    leaf c-num-connection-setup-attempts {
+      type uint64;
+      description
+        "Number of HRPD Connection setups attempted after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumConnectionSetupAttempts";
+    }
+    leaf s-num-connection-setup-success {
+      type uint64;
+      description
+        "Number of HRPD Connection setups succeeded before data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumConnectionSetupSuccess";
+    }
+    leaf c-num-connection-setup-success {
+      type uint64;
+      description
+        "Number of HRPD Connection setups succeeded after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumConnectionSetupSuccess";
+    }
+    leaf s-num-normal-connection-closes {
+      type uint64;
+      description
+        "The number of HRPD connections that were closed normally before data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumNormalConnectionCloses";
+    }
+    leaf c-num-normal-connection-closes {
+      type uint64;
+      description
+        "The number of HRPD connections that were closed normally after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumNormalConnectionCloses";
+    }
+    leaf s-num-total-connection-closes {
+      type uint64;
+      description
+        "The total number of HRPD connections closed, normally or abnormally, data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumTotalConnectionCloses";
+    }
+    leaf c-num-total-connection-closes {
+      type uint64;
+      description
+        "The total number of HRPD connections closed, normally or abnormally, after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumTotalConnectionCloses";
+    }
+    leaf s-num-rf-related-drops {
+      type uint64;
+      description
+        "Number of HRPD connection close because of RTC loss or No FTC before data has flowed on the A10 connection";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumRFRelatedDrops";
+    }
+    leaf c-num-rf-related-drops {
+      type uint64;
+      description
+        "Number of HRPD connection close because of RTC loss or No FTC after data has flowed on the A10 connection";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumRFRelatedDrops";
+    }
+    leaf s-num-page-responses {
+      type uint64;
+      description
+        "Total number of successful responses to HRPD page requests that were received from the AT before the final page timeout and before data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumPageResponses";
+    }
+    leaf c-num-page-responses {
+      type uint64;
+      description
+        "Total number of successful responses to HRPD page requests that were received from the AT before the final page timeout and after data has flowed on the A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumPageResponses";
+    }
+    leaf s-num-rf-related-drops-rtc-lost {
+      type uint64;
+      description
+        "This statistic counts the number of times the HRPD connection was dropped before data has flowed on the A10 connection because a Reverse Traffic Channel (RTC) lost indication was received, and as a result, no reverse link for the connection were available.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumRFRelatedDropsRTCLost";
+    }
+    leaf c-num-rf-related-drops-rtc-lost {
+      type uint64;
+      description
+        "This statistic counts the number of times the HRPD connection was dropped after data has flowed on the A10 connection because a Reverse Traffic Channel (RTC) lost indication was received, and as a result, no reverse link for the connection were available.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumRFRelatedDropsRTCLost";
+    }
+    leaf s-num-rf-related-drops-no-ftc {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped before data has flowed on the A10 connection because of indications that there is no active Forward Traffic Channel (FTC) available.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumRFRelatedDropsNoFTC";
+    }
+    leaf c-num-rf-related-drops-no-ftc {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped after data has flowed on the A10 connection because of indications that there is no active Forward Traffic Channel (FTC) available.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumRFRelatedDropsNoFTC";
+    }
+    leaf s-num-network-error-drops {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were closed before data has flowed on the A10 connection because the FAP closed the open A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumNetworkErrorDrops";
+    }
+    leaf c-num-network-error-drops {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were closed after data has flowed on the A10 connection because the FAP closed the open A10 connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumNetworkErrorDrops";
+    }
+    leaf s-num-network-error-drops-rnc-internal {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed before data has flowed on the A10 connection because the FAP closed the A10 connection due to internal failures.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumNetworkErrorDropsRNCInternal";
+    }
+    leaf c-num-network-error-drops-rnc-internal {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed after data has flowed on the A10 connection because the FAP closed the A10 connection due to internal failures.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumNetworkErrorDropsRNCInternal";
+    }
+    leaf s-num-network-error-drops-rnc-external {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed before data has flowed on the A10 connection because the FAP closed the A10 connection due to the PDSN unreachablity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumNetworkErrorDropsRNCExternal";
+    }
+    leaf c-num-network-error-drops-rnc-external {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed after data has flowed on the A10 connection because the FAP closed the A10 connection due to the PDSN unreachablity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumNetworkErrorDropsRNCExternal";
+    }
+    leaf s-num-network-error-drops-a10-setup-fail {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed before data has flowed on the A10 connection because there was failure in the A10 connection set-up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumNetworkErrorDropsA10SetupFail";
+    }
+    leaf c-num-network-error-drops-a10-setup-fail {
+      type uint64;
+      description
+        "This statistic counts the number of open HRPD connections that were closed after data has flowed on the A10 connection because there was failure in the A10 connection set-up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumNetworkErrorDropsA10SetupFail";
+    }
+    leaf s-num-misc-drops-sector-down {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped before data has flowed on the A10 connection because there is only one pilot available for the connection and a sector down indication has been received for that pilot.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumMiscDropsSectorDown";
+    }
+    leaf c-num-misc-drops-sector-down {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped after data has flowed on the A10 connection because there is only one pilot available for the connection and a sector down indication has been received for that pilot.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumMiscDropsSectorDown";
+    }
+    leaf s-num-misc-drops-internal-error {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped before data has flowed on the A10 connection due to internal software errors.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumMiscDropsInternalError";
+    }
+    leaf c-num-misc-drops-internal-error {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped after data has flowed on the A10 connection due to internal software errors.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumMiscDropsInternalError";
+    }
+    leaf c-num-misc-drops-state-mismatch {
+      type uint64;
+      description
+        "This statistic counts the number of HRPD connections that were dropped after data has flowed on the A10 connection when the FAP finds a state mismatch between itself andthe AT. Such a mismatch is found when a connection request message is received from the AT, and the connection is already open as perceived by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumMiscDropsStateMismatch";
+    }
+    leaf s-num-misc-drops-state-mismatch {
+      type uint64;
+      description
+        "This statistic counts the number of connections that were dropped before the demarcation point when the FAP finds a state mismatch between itself and the AT. Such a mismatch is found when a connection request message is received from the AT, and the connection is already open as perceived by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumMiscDropsStateMismatch";
+    }
+    leaf s-num-misc-drops-due-to-rlp {
+      type uint64;
+      description
+        "This statistic counts the number of times the HRPD connection was dropped before data has flowed on the A10 connection at the request of the Radio Link Protocol. This request is generated when the HDR Fast Path component finds that the reset acknowledgment timeout has expired for the connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.SNumMiscDropsDueToRLP";
+    }
+    leaf c-num-misc-drops-due-to-rlp {
+      type uint64;
+      description
+        "This statistic counts the number of times the HRPD connection was dropped after data has flowed on the A10 connection at the request of the Radio Link Protocol. This request is generated when the HDR Fast Path component finds that the reset acknowledgment timeout has expired for the connection.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.CNumMiscDropsDueToRLP";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.RNCSigAppsStats.";
+  }
+
+  grouping cdma2000-hrpd-access-auth-config-g {
+    description
+      "HRPD A12-related service stats.";
+    leaf a12-access-authentication-enable {
+      type int64;
+      config false;
+      description
+        "Flag to enable/Disable HRPD Access Authentication. {{true}} - Enabled, {{false}} - Disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthConfig.A12AccessAuthenticationEnable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthConfig.";
+  }
+
+  grouping cdma2000-hrpd-access-auth-stats-g {
+    description
+      "This object is used in obtaining the Access Authentication related stats.";
+    leaf an-ppp-authentication-attempts-by-node {
+      type uint64;
+      description
+        "Number of AnPppAuthentications attempted by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.AnPppAuthenticationAttemptsByNode";
+    }
+    leaf a12-requests-sent-from-node {
+      type uint64;
+      description
+        "Number of A12 Access Requests Sent from the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12RequestsSentFromNode";
+    }
+    leaf a12-rejects-received-by-node {
+      type uint64;
+      description
+        "Number of A12 Access Rejects received from the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12RejectsReceivedByNode";
+    }
+    leaf a12-accepts-received-by-node {
+      type uint64;
+      description
+        "Number of A12 Access Accepts received by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12AcceptsReceivedByNode";
+    }
+    leaf a12-access-challenges-received-by-node {
+      type uint64;
+      description
+        "Number of A12 Access Challenges received by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12AccessChallengesReceivedByNode";
+    }
+    leaf a12-retransmits-sent-from-node {
+      type uint64;
+      description
+        "Number of A12 Access Requests retransmitted from the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12RetransmitsSentFromNode";
+    }
+    leaf a12-timeouts-events-for-node {
+      type uint64;
+      description
+        "Number of A12 Timeout events occurred at the FAP due to unreachability of the AAA server/ no response from the AAA server.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TimeoutsEventsForNode";
+    }
+    leaf a12-malformedresponse-received-by-node {
+      type uint64;
+      description
+        "Number of Malformed A12 Access Response received by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12MalformedresponseReceivedByNode";
+    }
+    leaf a12-bad-authenticator-received-by-node {
+      type uint64;
+      description
+        "Number of A12 Access Response with Bad Authenticator received by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12BadAuthenticatorReceivedByNode";
+    }
+    leaf a12-unknown-type-received-by-node {
+      type uint64;
+      description
+        "Number of A12 Packet of unknown type received by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12UnknownTypeReceivedByNode";
+    }
+    leaf a12-unknown-pkt-received-by-node {
+      type uint64;
+      description
+        "Number of unknown A12 packets received by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12UnknownPktReceivedByNode";
+    }
+    leaf a12-unknown-server-received-by-node {
+      type uint64;
+      description
+        "Number of A12 packets received from unknown AAA server by the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12UnknownServerReceivedByNode";
+    }
+    leaf a12-other-failure-occurences-in-node {
+      type uint64;
+      description
+        "Number of A12 packets failed due to other failure occurences in the AAA server.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12OtherFailureOccurencesInNode";
+    }
+    leaf a12-by-pass-num-ats-with-unknown-mfr-code-by-node {
+      type uint64;
+      description
+        "Number of ATs with UnknowMfrCode detected in the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12ByPassNumAtsWithUnknownMfrCodeByNode";
+    }
+    leaf a12-tx-path-fail-due-to-an-ppp-error-by-node {
+      type uint64;
+      description
+        "Number of times sending of A12 packet failed in Tx Path in the FAP RNC due to \"AnPPP Error\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TxPathFailDueToAnPppErrorByNode";
+    }
+    leaf a12-tx-path-fail-due-to-no-server-available-by-node {
+      type uint64;
+      description
+        "Number of times sending of A12 packet failed in Tx Path in the FAP RNC due to \"No Server Available\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TxPathFailDueToNoServerAvailableByNode";
+    }
+    leaf a12-tx-path-fail-due-to-internal-error-by-node {
+      type uint64;
+      description
+        "Number of times sending of A12 packet failed in Tx Path in the FAP RNC due to \"internal error\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TxPathFailDueToInternalErrorByNode";
+    }
+    leaf a12-tx-path-fail-due-to-no-packet-id-available-by-node {
+      type uint64;
+      description
+        "Number of times sending of A12 packet failed in Tx Path in the FAP RNC due to \"No packet id available\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TxPathFailDueToNoPacketIdAvailableByNode";
+    }
+    leaf a12-tx-path-fail-due-to-transmit-error-by-node {
+      type uint64;
+      description
+        "Number of times sending of A12 packet failed in Tx Path in the FAP RNC due to \"Transmit Error\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12TxPathFailDueToTransmitErrorByNode";
+    }
+    leaf a12-svr-timeouts-for-node {
+      type uint64;
+      description
+        "Number of A12 server timeouts happened in the FAP RNC.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12SvrTimeoutsForNode";
+    }
+    leaf a12-enh-ta-bypass-lcp-timeout-by-node {
+      type uint64;
+      description
+        "Number of LCP timeouts happened in the FAP RNC when Enhanced TA A12Bypass mode is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12EnhTaBypassLcpTimeoutByNode";
+    }
+    leaf a12-enh-ta-bypass-chap-timeout-by-node {
+      type uint64;
+      description
+        "Number of CHAP timeouts happened in the FAP RNC when Enhanced TA A12Bypass mode is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12EnhTaBypassChapTimeoutByNode";
+    }
+    leaf a12-enh-ta-bypass-chap-invalid-by-node {
+      type uint64;
+      description
+        "Number of CHAP Challenge response received from the AT when Enhanced TA A12Bypass mode is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12EnhTaBypassChapInvalidByNode";
+    }
+    leaf a12-enh-ta-bypass-chap-nai-matches-a12-bypass-list-by-node {
+      type uint64;
+      description
+        "Number of times the CHAP NAI received from the AT matches with A12Bypass List in the FAP RNC when Enhanced TA A12Bypass mode is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12EnhTaBypassChapNaiMatchesA12BypassListByNode";
+    }
+    leaf a12-session-ta-timeout-by-node {
+      type uint64;
+      description
+        "Number of times Session timeouts occurred due to TA.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.A12SessionTaTimeoutByNode";
+    }
+    leaf access-auth-failed-due-to-session-close-total {
+      type uint64;
+      description
+        "Number of times the Access Authenticaiton failed due to Sesion close.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.AccessAuthFailedDueToSessionCloseTotal";
+    }
+    leaf access-auth-succeeded {
+      type uint64;
+      description
+        "Number of times the Access Authenticaiton succeeded.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.AccessAuthSucceeded";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.HRPD.AccessAuthStats.";
+  }
+
+  grouping cdma2000-beacon-g {
+    description
+      "This object models the attributes to control the generalized beacon. The beacon is modeled as a beacon frame composed of multiple beacon intervals. The beacon frame start is time-aligned to the instant when 1x 80ms paging frames and HRPD control channel frames align (occurs once every 1.28s).";
+    leaf beacon-admin-status {
+      type enumeration {
+        enum "locked" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconAdminStatus - Locked";
+        }
+        enum "unlocked" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconAdminStatus - Unlocked";
+        }
+      }
+      config false;
+      description
+        "Allows administrative control of beacon.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconAdminStatus";
+    }
+    leaf beacon-oper-status {
+      type enumeration {
+        enum "locked" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconOperStatus - Locked";
+        }
+        enum "unlocked" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconOperStatus - Unlocked";
+        }
+        enum "fault" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconOperStatus - Fault";
+        }
+      }
+      description
+        "Reports operational status of beacon.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconOperStatus";
+    }
+    leaf hrpd-beacon-enable {
+      type boolean;
+      config false;
+      description
+        "If set to {{true}} the HRPD-specific beacon described by {{object|HRPDBeaconList}} object is enabled. If set to {{false}}, all HRPD beacons (if any) are contained in the BeaconList object.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconEnable";
+    }
+    leaf period {
+      type uint16 {
+        range "0..32767";
+      }
+      units "80 ms slots";
+      config false;
+      description
+        "Length and periodicity of the beacon frame in {{units}}. Reference - {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.Period";
+    }
+    leaf maxfap-beacon-tx-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Maximum transmission power allowed on the FAP Beacon frequencies. {{param}} is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<;Pmax_low>..<;Pmax_high>\". {{param}} identifies the limits between which the FAP can self-configure its maximum beacon transmit power. Self-configuration for maximum beacon transmission power is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerSelfConfigEnable}} from an enabled perspective. <;Pmax_low> and <;Pmax_high> are measured in dBm and have a range of -40.0 to 20.0 incremented by 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPower";
+    }
+    leaf maxfap-beacon-tx-power-in-use {
+      type int64;
+      units "0.1 dBm";
+      description
+        "Maximum beacon transmission power measured in {{units}} currently used by the FAP on any beacon frequency. Actual values of the maximum transmission power are -40.0 dBm to 20.0 dBm in steps of 0.1 dB. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxFAPBeaconTxPowerInUse";
+    }
+    leaf beacon-pch-pwr-percentage {
+      type int64;
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Paging Channel (expressed in {{units}}). For example, 93333 means 93.333% of the max sector power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconPchPwrPercentage";
+    }
+    leaf max-hrpd-beacon-tx-power {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Maximum transmission power allowed on the dedicated HRPD beacon. {{param}} is expressed as a range of allowed maximum power levels with \"..\" (two periods) between the upper and lower values, i.e. \"<Pmax_low>..<Pmax_high>\". MaxHRPDBeaconTxPower identifies the limits between which the FAP can self-configure its maximum beacon transmit power. Self-configuration for maximum beacon transmission power is controlled by {{param|.Capabilities.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerConfig}} from an availability perspective and {{param|.FAPControl.CDMA2000.OneX.SelfConfig.MaxFAPBeaconTxPowerSelfConfigEnable}} from an enabled perspective. <Pmax_low> and <Pmax_high> are measured in dBm and have a range of -40.0 to 20.0 incremented by 0.1 dB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxHRPDBeaconTxPower";
+    }
+    leaf max-hrpd-beacon-tx-power-in-use {
+      type int64;
+      units "0.1 dBm";
+      description
+        "Maximum beacon transmission power measured in dBm currently used by the FAP on any beacon frequency. Actual values of the maximum transmission power are -40.0 dBm to 20.0 in units of {{units}}. The value of {{param}} divided by 10 yields the actual value of the maximum transmission power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxHRPDBeaconTxPowerInUse";
+    }
+    leaf beacon-pilot-pwr-percentage {
+      type int64;
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Pilot Channel (expressed in {{units}}). For example, 19950 means 19.950% of total.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconPilotPwrPercentage";
+    }
+    leaf beacon-sync-pwr-percentage {
+      type int64;
+      units "0.001 percent";
+      config false;
+      description
+        "Percentage of Max Sector Power Used By Sync Channel (expressed in {{units}}). For example, 23458 means 23.458% of the max sector power.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconSyncPwrPercentage";
+    }
+    leaf max-beacon-list-entries {
+      type uint64;
+      description
+        "Maximum number of entries in the {{object|.CellConfig.CDMA2000.Beacon.BeaconList.{i}.}} object.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxBeaconListEntries";
+    }
+    leaf beacon-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconListNumberOfEntries";
+    }
+    leaf max-hrpd-beacon-list-entries {
+      type uint64;
+      description
+        "Maximum number of entries in the {{object|.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.}} object.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.MaxHRPDBeaconListEntries";
+    }
+    leaf hrpd-beacon-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconListNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.";
+  }
+
+  grouping cdma2000-beacon-beacon-list-g {
+    description
+      "This object models an individual beacon intervals. It may be used to model both 1x and HRPD beacons with offset from start of beacon frame measured in 80ms slots.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.Alias";
+    }
+    leaf beacon-index {
+      type int64;
+      description
+        "Instance identifier for this beacon interval. Allowed range is 0..(BeaconListNumberOfEntries-1).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconIndex";
+    }
+    leaf offset {
+      type uint16 {
+        range "0..32767";
+      }
+      config false;
+      description
+        "Offset from the start of the beacon frame in 80ms slots.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.Offset";
+    }
+    leaf duration {
+      type uint16 {
+        range "0..32767";
+      }
+      units "80 ms slots";
+      config false;
+      description
+        "Duration of this beacon interval in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.Duration";
+    }
+    leaf transmission-format {
+      type enumeration {
+        enum "0" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.TransmissionFormat - 0";
+        }
+        enum "1" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.TransmissionFormat - 1";
+        }
+      }
+      config false;
+      description
+        "Determines if this beacon interval shall transmit HRPD (HRPD) or CDMA2000 1x.{HRPD=\"0\", 1x=\"1\"}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.TransmissionFormat";
+    }
+    leaf beacon-band-class {
+      type int64;
+      config false;
+      description
+        "Band class for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconBandClass";
+    }
+    leaf beacon-channel-freq {
+      type uint16 {
+        range "0..2016";
+      }
+      config false;
+      description
+        "Channel number for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconChannelFreq";
+    }
+    leaf-list beacon-pn-offset {
+      type string {
+        length "0..32";
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a pilot PN offset of the pilot beacon for this channel in units of 64 PN chips. If this parameter contains more than one item, then the FAP is expected to select one from the list as the PilotPN to be used for this channel. If the self-configuration capability is not to be used, then this parameter SHALL contain only a single item.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconPNOffset";
+    }
+    leaf tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "TX power for the beacon interval (in {{units}}). If self-configuration of the Beacon Tx Power is enabled, then this value is determined by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.TxPower";
+    }
+    leaf beacon-sid {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "SID for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconSID";
+    }
+    leaf beacon-nid {
+      type uint16 {
+        range "0..32767";
+      }
+      config false;
+      description
+        "NID for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconNID";
+    }
+    leaf beacon-pzid {
+      type uint64;
+      config false;
+      description
+        "PZID for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.BeaconPZID";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.BeaconList.{i}.";
+  }
+
+  grouping cdma2000-beacon-hrpd-beacon-list-g {
+    description
+      "This object models individual HRPD beacon intervals where the beacon start is expressed as a number of HRPD control channel slots from the start of the beacon frame.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.Alias";
+    }
+    leaf beacon-index {
+      type int64;
+      description
+        "Instance identifier for this beacon interval. Allowed range is 0..(HRPDBeaconListNumberOfEntries-1).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.BeaconIndex";
+    }
+    leaf c-coffset {
+      type uint16 {
+        range "0..2048";
+      }
+      config false;
+      description
+        "Offset of the current beacon interval from the start of the beacon frame, in Control Channel cycles. The HRPDBeaconList interval SHOULD not overlap in time with any beacon interval for the same channel defined in the BeaconList object.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.CCoffset";
+    }
+    leaf offset {
+      type int64;
+      config false;
+      description
+        "Start of beacon transmission with respect to the Control Channel boundary.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.Offset";
+    }
+    leaf duration {
+      type uint16 {
+        range "0..256";
+      }
+      config false;
+      description
+        "Duration of the beacon transmission within a Control Channel cycle, in slots. Beacon is transmitted starting offset from the CC boundary for duration. Transmission restarts offset from the next CC boundary, given that beacon interval spans more than 1 CC cycles.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.Duration";
+    }
+    leaf num-c-ccycles {
+      type uint8 {
+        range "0..48";
+      }
+      config false;
+      description
+        "Number of Control Channel Cycles this beacon interval spans.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.NumCCcycles";
+    }
+    leaf beacon-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      config false;
+      description
+        "Band class for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.BeaconBandClass";
+    }
+    leaf beacon-channel-freq {
+      type uint16 {
+        range "0..2016";
+      }
+      config false;
+      description
+        "Channel number for this beacon interval.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.BeaconChannelFreq";
+    }
+    leaf-list beacon-pn-offset {
+      type string {
+        length "0..256";
+      }
+      config false;
+      min-elements 1;
+      description
+        "{{list}} Each item is a pilot PN offset of the pilot beacon for this channel in units of 64 PN chips. If this parameter contains more than one item, then the FAP is expected to select one from the list as the PilotPN to be used for this channel. If the self-configuration capability is not to be used, then this parameter SHALL contain only a single item.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.BeaconPNOffset";
+    }
+    leaf tx-power {
+      type int64;
+      units "dBm";
+      config false;
+      description
+        "TX power for the beacon interval. If self-configuration of the HRPD Beacon Tx Power is enabled, then this value is determined by the FAP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.TxPower";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.CellConfig.CDMA2000.Beacon.HRPDBeaconList.{i}.";
+  }
+
+  grouping rem-g {
+    description
+      "This object contains parameters relating to REM (Radio Environment Measurement).";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.";
+  }
+
+  grouping rem-umts-g {
+    description
+      "This object contains Radio Environment Measurement parameters for UMTS FAP.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.";
+  }
+
+  grouping rem-umts-wcdma-g {
+    description
+      "This object contains parameters relating to radio environment measurement capabilities for the UMTS system.";
+    leaf in-service-handling {
+      type enumeration {
+        enum "immediate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.InServiceHandling - Immediate";
+        }
+        enum "delayed" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.InServiceHandling - Delayed";
+        }
+      }
+      default "immediate";
+      config false;
+      description
+        "FAP REM behavior with respect to ongoing active connections.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.InServiceHandling";
+    }
+    leaf scan-on-boot {
+      type boolean;
+      default "true";
+      config false;
+      description
+        "Enables or disables Radio Environment Measurement during the FAP start up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanOnBoot";
+    }
+    leaf scan-periodically {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enable Periodic Radio Environment Measurement on all enabled RAT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanPeriodically";
+    }
+    leaf periodic-interval {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "When {{param|ScanPeriodically}} is {{true}}, this value indicates the interval in {{units}} which REM is performed while the FAP service is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.PeriodicInterval";
+    }
+    leaf periodic-time {
+      type yang:date-and-time;
+      config false;
+      description
+        "An absolute time reference in UTC to determine when the CPE will initiate the periodic REM. Each REM MUST occur at (or as soon as possible after) this reference time plus or minus an integer multiple of the {{param|PeriodicInterval}}. {{param}} is used only to set the \"phase\" of the REM. The actual value of {{param}} can be arbitrarily far into the past or future. For example, if {{param|PeriodicInterval}} is 86400 (a day) and if {{param}} is set to UTC midnight on some day (in the past, present, or future) then periodic REMs will occur every day at UTC midnight. These MUST begin on the very next midnight, even if {{param}} refers to a day in the future. The Unknown Time value defined in {{bibref|TR-106a2|Section 3.2}} indicates that no particular time reference is specified. That is, the CPE MAY locally choose the time reference, and needs only to adhere to the specified PeriodicInformInterval. If absolute time is not available to the CPE, its periodic REM behavior MUST be the same as if {{param}} parameter was set to the Unknown Time value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.PeriodicTime";
+    }
+    leaf-list remplmn-list {
+      type string;
+      config false;
+      max-elements "32";
+      description
+        "{{list}} Each item is a PLMN ID to measure. PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. If {{empty}}, then no specific PLMN ID is provided, meaning that the FAP is required to scan all available PLMN IDs.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.REMPLMNList";
+    }
+    leaf-list rem-band-list {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "{{list}} Each item is a UMTS Band to measure. Each band is identified in by a roman numeral {{bibref|3GPP-TS.25.104}}. If {{empty}} then no specific UMTS band is provided, meaning that the FAP is required to scan all available bands. The order of the band indicator has no significance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.REMBandList";
+    }
+    leaf-list uarfcndl-list {
+      type string;
+      config false;
+      max-elements "64";
+      description
+        "{{list}} Each entry is a UARFCN in the DL direction to measure. If {{empty}}, then no specific UARFCN is provided, meaning that the FAP is required to scan all UARFCNs that it is aware of.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.UARFCNDLList";
+    }
+    leaf scan-timeout {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Specifies the time-out value in {{units}}, measured from the start of the REM scan, before the REM scan will time out.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanTimeout";
+    }
+    leaf scan-status {
+      type enumeration {
+        enum "indeterminate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus - Indeterminate";
+        }
+        enum "in-progress" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus - InProgress";
+        }
+        enum "success" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus - Success";
+        }
+        enum "error" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus - Error";
+        }
+        enum "error-timeout" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus - Error_TIMEOUT";
+        }
+      }
+      description
+        "Indicates the current status of this scan.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ScanStatus";
+    }
+    leaf error-details {
+      type string {
+        length "0..256";
+      }
+      description
+        "Provides more detail when the {{param|ScanStatus}} is either {{enum|Error|ScanStatus}} or {{enum|Error_TIMEOUT|ScanStatus}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.ErrorDetails";
+    }
+    leaf last-scan-time {
+      type yang:date-and-time;
+      description
+        "The time of the last UMTS system radio environment measurement.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.LastScanTime";
+    }
+    leaf max-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.UMTS.WCDMA.Cell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.MaxCellEntries";
+    }
+    leaf cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.CellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.";
+  }
+
+  grouping rem-umts-wcdma-cell-g {
+    leaf rem-umts-wcdma-cell-key {
+      type string;
+      description
+        "Key value for this object, which could be an item of a list.";
+    }
+    description
+      "Table indicating the components of the discovered cells.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.";
+  }
+
+  grouping rem-umts-wcdma-cell-rf-g {
+    description
+      "Table indicating the RF aspect of the discovered cells.";
+    leaf uarfcndl {
+      type uint16 {
+        range "0..16383";
+      }
+      description
+        "The UTRA Absolute Radio Frequency Channel Number (UARFCN) in the DL direction of an FDD mode cell. {{bibref|3GPP-TS.25.433}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.UARFCNDL";
+    }
+    leaf cpichrscp {
+      type int64;
+      units "dBm";
+      description
+        "Received signal level in {{units}} of the CPICH channel. (Ref. 3GPP TS 25.133)";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.CPICHRSCP";
+    }
+    leaf cpich-ec-no {
+      type int64;
+      units "dB";
+      description
+        "Measured EcNo. (energy per chip to interference power density) in {{units}} received in the downlink pilot channel. Actual values of the range are -24.0 {{units}} to 0.0 {{units}} in steps of 0.5 {{units}}. The value of {{param}} divided by 2 yields the actual value of the range. {{bibref|3GPP-TS.25.133|Section 9.1.2.3}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.CPICHEcNo";
+    }
+    leaf rssi {
+      type int64;
+      units "dBm";
+      description
+        "This measurement is for Inter-frequency handover evaluation, measured in total {{units}} in the band. {{bibref|3GPP-TS.25.133|Section9.1.3}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.RSSI";
+    }
+    leaf primary-scrambling-code {
+      type uint16 {
+        range "0..511";
+      }
+      description
+        "Primary scrambling code.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.PrimaryScramblingCode";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.RF.";
+  }
+
+  grouping rem-umts-wcdma-cell-bcch-g {
+    description
+      "Table containing the system information broadcast in the BCCH logical channel.";
+    leaf plmn-type {
+      type enumeration {
+        enum "gsm-map" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.PLMNType - GSM-MAP";
+        }
+        enum "ansi-41" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.PLMNType - ANSI-41";
+        }
+      }
+      description
+        "Type of Public Land Mobile Network (PLMN).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.PLMNType";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Location Area Code (LAC) as defined in SIB 1 {{bibref|3GPP-TS.25.331}}. The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the LAI (Location Area ID) {{bibref|3GPP-TS.23.003}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "Routing Area Code (RAC) as defined in SIB 1 {{bibref|3GPP-TS.25.331}}. The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the RAI (Routing Area ID) {{bibref|3GPP-TS.23.003}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.RAC";
+    }
+    leaf cell-id {
+      type uint32 {
+        range "0..268435455";
+      }
+      description
+        "Cell Identity as defined in SIB3 {{bibref|3GPP-TS.25.331|Section10.3.2.2}}. {{bibref|3GPP-TS.24.008}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CellID";
+    }
+    leaf pcpich-tx-power {
+      type int64;
+      description
+        "Primary Common Pilot Channel (CPICH) power level on SIB 5/6 {{bibref|3GPP-TS.25.331|Section10.3.6.55}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.PCPICHTxPower";
+    }
+    leaf csg-indicator {
+      type boolean;
+      description
+        "The CSG-indicator Information Element (IE) in the Master Information Block reflects the access mode of the CSG cell. It is hence dependent on the value of {{param|.AccessMgmt.UMTS.AccessMode}}. If {{true}} the CSG-indicator IE is present, reflecting closed access to the CSG cell. If {{false}} the CSG-indicator IE is absent, reflecting the access mode as \"not a closed-access\". {{bibref|3GPP-TS.25.331|Section 10.2.48.8.1}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGIndicator";
+    }
+    leaf csgid {
+      type uint32 {
+        range "0..134217727";
+      }
+      description
+        "Defines the Closed Subscriber Group of the Access Control List. FAP broadcasts this CSG ID in SIB3 {{bibref|3GPP-TS.25.331|Section10.3.2.8}} depending on the AccessMode.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGID";
+    }
+    leaf-list uarfcndl-list {
+      type uint16 {
+        range "0..16383";
+      }
+      max-elements "128";
+      description
+        "{{list}} Each item is a UTRA Absolute Radio Frequency Channel Number (UARFCN} in the DL direction dedicated to the CSG cells. {{param}} is broadcast in SIB 11bis {{bibref|3GPP-TS.25.331|Section 10.2.48.8.14a}}. The corresponding UTRA Absolute Radio Frequency Channel Number (UARFCN} in the UL direction is derived based on the fixed offset applicable for the frequency band.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.UARFCNDLList";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.";
+  }
+
+  grouping rem-umts-wcdma-cell-bcch-csgpsc-split-info-g {
+    description
+      "This object contains parameters relating to the Primary Scambling Code (PSC) split information for the CSG. Defined in SIB3/11bis {{bibref|3GPP-TS.25.331|Section 10.3.2.8 and 10.3.2.9}}.";
+    leaf start-psc-range1-coefficient {
+      type uint8 {
+        range "0..63";
+      }
+      description
+        "The value of this Information Element (IE) multiplied by 8 specifies the start PSC value of the first PSC range as specified in {{bibref|3GPP-TS.25.331|Section 8.6.2.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.StartPSCRange1Coefficient";
+    }
+    leaf number-of-ps-cs {
+      type enumeration {
+        enum "5" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 5";
+        }
+        enum "10" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 10";
+        }
+        enum "15" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 15";
+        }
+        enum "20" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 20";
+        }
+        enum "30" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 30";
+        }
+        enum "40" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 40";
+        }
+        enum "50" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 50";
+        }
+        enum "64" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 64";
+        }
+        enum "80" {
+          value 9;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 80";
+        }
+        enum "120" {
+          value 10;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 120";
+        }
+        enum "160" {
+          value 11;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 160";
+        }
+        enum "256" {
+          value 12;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - 256";
+        }
+        enum "alltherest" {
+          value 13;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - alltherest";
+        }
+        enum "spare3" {
+          value 14;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - spare3";
+        }
+        enum "spare2" {
+          value 15;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - spare2";
+        }
+        enum "spare1" {
+          value 16;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs - spare1";
+        }
+      }
+      description
+        "This Information Element (IE) specifies the number of PSCs reserved for CSG cells in each PSC range.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.NumberOfPSCs";
+    }
+    leaf psc-range2-offset {
+      type uint8 {
+        range "0..63";
+      }
+      description
+        "If this Information Element (IE) is included, the UE shall calculate the second PSC range as specified in {{bibref|3GPP-TS.25.331|Section 8.6.2.4}}. If this Information Element (IE) is not included, the UE shall consider the second PSC range to be not present.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.PSCRange2Offset";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.CSGPSCSplitInfo.";
+  }
+
+  grouping rem-umts-wcdma-cell-bcch-reference-position-g {
+    description
+      "This object defines parameters related to the surface point of the ellipsoid. {{bibref|3GPP-TS.23.032|Section 5}} It is characterized by the co-ordinates of an ellipsoid point with altitude, distances, and an angle of orientation. This information is used to refer to a point on the Earth's surface, or close to the Earth's surface, with the same longitude and latitude.";
+    leaf latitude {
+      type int64;
+      description
+        "This parameter specifies the latitude of the device's position in degrees, multiplied by 1 million. The positive value signifies the direction, north of the equator. The negative value signifies the direction, south of the equator. Range is from: 90.00.00' South (-90,000,000) to 90.00.00' North (90,000,000). Example: A latitude of 13.19.43' N would be represented as 13,323,833, derived as (13*1,000,000)+((19.43*1,000,000)/60). Latitude of 50.00.00' S would be represented as value -50,000,000. If 0 then SIB15 is not detected in the specific cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.Latitude";
+    }
+    leaf longitude {
+      type int64;
+      description
+        "This parameter specifies the longitude of the device's position in degrees, multiplied by 1 million. The positive value signifies the direction, east of the prime meridian. The negative value signifies the direction, west of the prime meridian. Range is from: 180.00.00' West (-180,000,000) to 180.00.00' East (180,000,000). Example: A longitude of 13.19.43' E would be represented as 13,323,833, derived as (13*1,000,000)+((19.43*1,000,000)/60). A longitude of 50.00'0'' W would be represented as value -50,000,000. If 0 then SIB15 is not detected in the specific cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.Longitude";
+    }
+    leaf uncertainty-semi-major {
+      type uint8 {
+        range "0..127";
+      }
+      description
+        "The uncertainty r is derived from the \"uncertainty code\" k by r = 10 x ( 1.1 <power> (k-1) ) {{bibref|3GPP-TS.23.032|Section6.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.UncertaintySemiMajor";
+    }
+    leaf uncertainty-semi-minor {
+      type uint8 {
+        range "0..127";
+      }
+      description
+        "The uncertainty r is derived from the \"uncertainty code\" k by r = 10 x ( 1.1 <power> (k-1) ) {{bibref|3GPP-TS.23.032|Section6.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.UncertaintySemiMinor";
+    }
+    leaf orientation-of-major-axis {
+      type uint8 {
+        range "0..89";
+      }
+      description
+        "The Information Element (IE) value 'N' is derived by this formula: 2N <= a < 2(N+1) Where 'a' is the orientation in degrees (0..179).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.OrientationOfMajorAxis";
+    }
+    leaf confidence {
+      type uint8 {
+        range "0..100";
+      }
+      units "percent";
+      description
+        "The degree of confidence in the ellipsoid's points expressed in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.Confidence";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.WCDMA.Cell.{i}.BCCH.ReferencePosition.";
+  }
+
+  grouping rem-umts-gsm-g {
+    description
+      "This object contains parameters relating to GSM REM capabilities.";
+    leaf in-service-handling {
+      type enumeration {
+        enum "immediate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.InServiceHandling - Immediate";
+        }
+        enum "delayed" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.InServiceHandling - Delayed";
+        }
+      }
+      default "immediate";
+      config false;
+      description
+        "FAP REM behavior with respect to ongoing active connections.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.InServiceHandling";
+    }
+    leaf scan-on-boot {
+      type boolean;
+      default "true";
+      config false;
+      description
+        "Enables or disables Radio Environment Measurement during the FAP start up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanOnBoot";
+    }
+    leaf scan-periodically {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enable Periodic Radio Environment Measurement on all enabled RAT.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanPeriodically";
+    }
+    leaf periodic-interval {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "When {{param|ScanPeriodically}} is {{true}}, this value indicates the interval in {{units}} which REM is performed while the FAP service is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.PeriodicInterval";
+    }
+    leaf periodic-time {
+      type yang:date-and-time;
+      config false;
+      description
+        "An absolute time reference in UTC to determine when the CPE will initiate the periodic REM. Each REM MUST occur at (or as soon as possible after) this reference time plus or minus an integer multiple of the {{param|PeriodicInterval}}. {{param}} is used only to set the \"phase\" of the REM. The actual value of {{param}} can be arbitrarily far into the past or future. For example, if {{param|PeriodicInterval}} is 86400 (a day) and if {{param}} is set to UTC midnight on some day (in the past, present, or future) then periodic REMs will occur every day at UTC midnight. These MUST begin on the very next midnight, even if {{param}} refers to a day in the future. The Unknown Time value defined in {{bibref|TR-106a2|Section 3.2}} indicates that no particular time reference is specified. That is, the CPE MAY locally choose the time reference, and needs only to adhere to the specified PeriodicInformInterval. If absolute time is not available to the CPE, its periodic REM behavior MUST be the same as if {{param}} parameter was set to the Unknown Time value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.PeriodicTime";
+    }
+    leaf-list remplmn-list {
+      type string {
+        length "0..6";
+      }
+      config false;
+      description
+        "{{list}} Each item is a PLMNID. PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of the PLMNID is 5. If {{empty}} no specific PLMN ID is provided, meaning that the FAP is required to report all available PLMN IDs. If a list is provided, the FAP is expected to limit the REM measurement to the PLMN(s) specified in this list only and ignore others even if they are detected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMPLMNList";
+    }
+    leaf-list rem-band-list {
+      type enumeration {
+        enum "t-gsm380" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - T-GSM380";
+        }
+        enum "t-gsm410" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - T-GSM410";
+        }
+        enum "gsm450" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - GSM450";
+        }
+        enum "gsm480" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - GSM480";
+        }
+        enum "gsm710" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - GSM710";
+        }
+        enum "gsm750" {
+          value 6;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - GSM750";
+        }
+        enum "t-gsm810" {
+          value 7;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - T-GSM810";
+        }
+        enum "gsm850" {
+          value 8;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - GSM850";
+        }
+        enum "p-gsm900" {
+          value 9;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - P-GSM900";
+        }
+        enum "e-gsm900" {
+          value 10;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - E-GSM900";
+        }
+        enum "r-gsm900" {
+          value 11;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - R-GSM900";
+        }
+        enum "t-gsm900" {
+          value 12;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - T-GSM900";
+        }
+        enum "dcs1800" {
+          value 13;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - DCS1800";
+        }
+        enum "pcs1900" {
+          value 14;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList - PCS1900";
+        }
+      }
+      config false;
+      description
+        "{{list}} Each item is a GSM Band to measure. {{enum}} If {{empty}} then no specific GSM band is provided, meaning that the FAP MUST scan all bands. If a list is provided, the FAP is expected to limit the REM measurement to the band(s) specified in this list only and ignore others even if they are detected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.REMBandList";
+    }
+    leaf-list arfcn-list {
+      type string;
+      config false;
+      max-elements "64";
+      description
+        "{{list}} Each item is a GSM ARFCN to measure. If {{empty}} then no specific ARFCN is provided, meaning that the FAP is required to scan all ARFCNs. If a list is provided, the FAP is expected to limit the REM measurement to the ARFCN(s) specified in this list only and ignore others even if they are detected.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ARFCNList";
+    }
+    leaf scan-timeout {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Specifies the time-out value in {{units}}, measured from the start of the REM scan, before the REM scan will time out.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanTimeout";
+    }
+    leaf scan-status {
+      type enumeration {
+        enum "indeterminate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus - Indeterminate";
+        }
+        enum "in-progress" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus - InProgress";
+        }
+        enum "success" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus - Success";
+        }
+        enum "error" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus - Error";
+        }
+        enum "error-timeout" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus - Error_TIMEOUT";
+        }
+      }
+      description
+        "Indicates the current status of this scan.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ScanStatus";
+    }
+    leaf error-details {
+      type string {
+        length "0..256";
+      }
+      description
+        "Provides more detail when the {{param|ScanStatus}} is either {{enum|Error|ScanStatus}} or {{enum|Error_TIMEOUT|ScanStatus}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.ErrorDetails";
+    }
+    leaf last-scan-time {
+      type yang:date-and-time;
+      description
+        "The time of the last GSM radio environment measurement.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.LastScanTime";
+    }
+    leaf max-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries allowed in the {{object|.REM.UMTS.GSM.Cell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.MaxCellEntries";
+    }
+    leaf cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.CellNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.";
+  }
+
+  grouping rem-umts-gsm-cell-g {
+    description
+      "Table indicating the components of the discovered cells.";
+    leaf band-indicator {
+      type enumeration {
+        enum "gsm 850" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BandIndicator - GSM 850";
+        }
+        enum "gsm 900" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BandIndicator - GSM 900";
+        }
+        enum "dcs 1800" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BandIndicator - DCS 1800";
+        }
+        enum "pcs 1900" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BandIndicator - PCS 1900";
+        }
+      }
+      description
+        "Indicates how to interpret the BCCH ARFCN.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BandIndicator";
+    }
+    leaf arfcn {
+      type uint16 {
+        range "0..1023";
+      }
+      description
+        "Absolute Radio Frequency Channel Number (ARFCN) {{bibref|3GPP-TS.05.05}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.ARFCN";
+    }
+    leaf bsic {
+      type uint8 {
+        range "0..63";
+      }
+      description
+        "Base Station Identity Code {{bibref|3GPP-TS.03.03}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.BSIC";
+    }
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of the PLMNID is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.PLMNID";
+    }
+    leaf lac {
+      type uint16 {
+        range "1..65535";
+      }
+      description
+        "Location Area Code (LAC) as defined in SIB1 {{bibref|3GPP-TS.25.331}}. The concatenation of PLMN ID (MCC+MNC) and LAC uniquely identifies the LAI (Location Area ID) {{bibref|3GPP-TS.23.003}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.LAC";
+    }
+    leaf rac {
+      type uint8 {
+        range "0..255";
+      }
+      description
+        "Routing Area Code (RAC) consists of up to 3 numerical characters. The concatenation of PLMN ID (MCC+MNC), LAC, and RAC uniquely identifies the Routing Area ID (RAI). {{bibref|3GPP-TS.23.003|Section 4.2}} {{bibref|3GPP-TS.25.413|Section 9.2.3.7}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.RAC";
+    }
+    leaf ci {
+      type uint16 {
+        range "0..63535";
+      }
+      description
+        "Cell Identity. {{bibref|3GPP-TS.25.331|Section 10.3.2.2}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.CI";
+    }
+    leaf rssi {
+      type int64;
+      units "dBm";
+      description
+        "Received signal level in {{units}} of the BCCH carrier.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.RSSI";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.UMTS.GSM.Cell.{i}.";
+  }
+
+  grouping rem-lte-g {
+    description
+      "This object contains parameters relating to radio environment measurement capabilities for the LTE system.";
+    leaf in-service-handling {
+      type enumeration {
+        enum "immediate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.InServiceHandling - Immediate";
+        }
+        enum "delayed" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.InServiceHandling - Delayed";
+        }
+      }
+      default "immediate";
+      config false;
+      description
+        "FAP REM behavior with respect to ongoing active connections.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.InServiceHandling";
+    }
+    leaf scan-on-boot {
+      type boolean;
+      default "true";
+      config false;
+      description
+        "Enables or disables Radio Environment Measurement during the FAP start up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanOnBoot";
+    }
+    leaf scan-periodically {
+      type boolean;
+      default "false";
+      config false;
+      description
+        "Enable Periodic Radio Environment Measurement on LTE EUTRAN bands.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanPeriodically";
+    }
+    leaf periodic-interval {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "When {{param|ScanPeriodically}} is {{true}}, this value indicates the interval in {{units}} which REM is performed while the FAP service is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.PeriodicInterval";
+    }
+    leaf periodic-time {
+      type yang:date-and-time;
+      config false;
+      description
+        "An absolute time reference in UTC to determine when the CPE will initiate the periodic REM. Each REM MUST occur at (or as soon as possible after) this reference time plus or minus an integer multiple of the {{param|PeriodicInterval}}. {{param}} is used only to set the \"phase\" of the REM. The actual value of {{param}} can be arbitrarily far into the past or future. For example, if {{param|PeriodicInterval}} is 86400 (a day) and if {{param}} is set to UTC midnight on some day (in the past, present, or future) then periodic REMs will occur every day at UTC midnight. These MUST begin on the very next midnight, even if {{param}} refers to a day in the future. The Unknown Time value defined in {{bibref|TR-106a2|Section 3.2}} indicates that no particular time reference is specified. That is, the CPE MAY locally choose the time reference, and needs only to adhere to the specified PeriodicInformInterval. If absolute time is not available to the CPE, its periodic REM behavior MUST be the same as if {{param}} parameter was set to the Unknown Time value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.PeriodicTime";
+    }
+    leaf-list remplmn-list {
+      type string;
+      config false;
+      max-elements "32";
+      description
+        "{{list}} Each item is a PLMN ID to measure. PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. If {{empty}}, then no specific PLMN ID is provided, meaning that the FAP is required to scan all available PLMN IDs.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.REMPLMNList";
+    }
+    leaf-list rem-band-list {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "{{list}} Each item is a LTE Band to measure. Corresponds to frequency band indicator defined in {{bibref|3GPP-TS.36.101|Table 5.5-1}}. If {{empty}} then no specific LTE band is provided, meaning that the FAP is required to scan all available bands. The order of the band indicator has no significance.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.REMBandList";
+    }
+    leaf-list eutra-carrier-arfcndl-list {
+      type string;
+      config false;
+      max-elements "64";
+      description
+        "{{list}} Each entry is a EUTRA ARFCN in the DL direction to measure. Corrsponds to the parameter NDL in {{bibref|3GPP-TS.36.101|Section 5.7.3}}. If {{empty}}, then no specific EUTRA ARFCN is provided, meaning that the FAP is required to scan all ARFCNs that it is aware of.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.EUTRACarrierARFCNDLList";
+    }
+    leaf scan-timeout {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Specifies the time-out value in {{units}}, measured from the start of the REM scan, before the REM scan will time out.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanTimeout";
+    }
+    leaf scan-status {
+      type enumeration {
+        enum "indeterminate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus - Indeterminate";
+        }
+        enum "in-progress" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus - InProgress";
+        }
+        enum "success" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus - Success";
+        }
+        enum "error" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus - Error";
+        }
+        enum "error-timeout" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus - Error_TIMEOUT";
+        }
+      }
+      description
+        "Indicates the current status of this scan.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ScanStatus";
+    }
+    leaf error-details {
+      type string {
+        length "0..256";
+      }
+      description
+        "Provides more detail when the {{param|ScanStatus}} is either {{enum|Error|ScanStatus}} or {{enum|Error_TIMEOUT|ScanStatus}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.ErrorDetails";
+    }
+    leaf last-scan-time {
+      type yang:date-and-time;
+      description
+        "The time of the last LTE system radio environment measurement.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.LastScanTime";
+    }
+    leaf max-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.LTE.Cell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.MaxCellEntries";
+    }
+    leaf cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CellNumberOfEntries";
+    }
+    leaf max-carrier-meas-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.LTE.CarrierMeas.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.MaxCarrierMeasEntries";
+    }
+    leaf carrier-meas-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeasNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.";
+  }
+
+  grouping rem-lte-cell-g {
+    leaf rem-lte-cell-key {
+      type string;
+      description
+        "Key value for this object, which could be an item of a list.";
+    }
+    description
+      "Table indicating the components of the discovered cells.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.";
+  }
+
+  grouping rem-lte-cell-rf-g {
+    description
+      "Table indicating the RF aspect of the discovered cells.";
+    leaf eutra-carrier-arfcn {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Indicates the ARFCN of this carrier frequency. Corresponds to parameter dl-CarrierFreq in SIB5 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}, and parameter NDL in {{bibref|3GPP-TS.36.101|Section 5.7.3}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.EUTRACarrierARFCN";
+    }
+    leaf phy-cell-id {
+      type uint16 {
+        range "0..503";
+      }
+      description
+        "Physical cell ID of the detected EUTRAN cell, as specified in {{bibref|3GPP-TS.36.101|Section 5.6}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.PhyCellID";
+    }
+    leaf rsrp {
+      type int64;
+      units "dBm";
+      description
+        "Received RSRP level of the detected EUTRA cell, specified in {{units}}, as specified in {{bibref|3GPP-TS.36.214|Section 5.1.1}}. The reporting range is specified in {{bibref|3GPP-TS.36.133|Section 9.1.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.RSRP";
+    }
+    leaf rsrq {
+      type int64;
+      units "dB";
+      description
+        "Received RSRQ level of the detected EUTRA cell, specified in {{units}}, as specified in {{bibref|3GPP-TS.36.214|Section 5.1.3}}. Actual measured values range between -24.0 {{units}} and 0.0 {{units}} in steps of 0.5 {{units}}. The value of {{param}} divided by 10 yields the actual measured value. Only values in multiple of 5 are valid.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.RSRQ";
+    }
+    leaf rssi {
+      type int64;
+      units "dBm";
+      description
+        "E-UTRA Carrier Received Signal Strength Indicator (RSSI), specified in {{units}}, as specified in {{bibref|3GPP-TS.36.214|Section 5.1.3}}. It comprises the linear average of the total received power (in [W]) observed only in OFDM symbols containing reference symbols for antenna port 0, in the measurement bandwidth, over N number of resource blocks by the UE from all sources, including co-channel serving and non-serving cells, adjacent channel interference, thermal noise etc.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.RSSI";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.RF.";
+  }
+
+  grouping rem-lte-cell-bcch-g {
+    description
+      "Table containing the system information broadcast in the BCCH logical channel.";
+    leaf dl-bandwidth {
+      type uint8 {
+        range "6 | 15 | 25 | 50 | 75 | 100";
+      }
+      units "resource blocks";
+      description
+        "Downlink transmission bandwidth, specified in number of {{units}}. Corresponds to parameter dl_Bandwidth in Master Information Block in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. and to parameter NRB in {{bibref|3GPP-TS.36.101|Table 5.6-1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.DLBandwidth";
+    }
+    leaf ul-bandwidth {
+      type uint8 {
+        range "6 | 15 | 25 | 50 | 75 | 100";
+      }
+      units "resource blocks";
+      description
+        "Uplink transmission bandwidth, specified in number of {{units}}. Corresponds to parameter ul_Bandwidth in SIB2 in {{bibref|3GPP-TS.36.331|Section 6.3.1}}. and to parameter NRB in {{bibref|3GPP-TS.36.101|Table 5.6-1}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.ULBandwidth";
+    }
+    leaf rs-tx-power {
+      type int64;
+      units "dBm";
+      description
+        "The downlink reference-signal transmit power, specified in {{units}}. Defined as the linear average over the power contributions (in W) of all resource elements that carry cell-specific reference signals within the operating system bandwidth. Corresponds to parameter referenceSignalPower in SIB4 as a part of PDSCH-Config IE in {{bibref|3GPP-TS.36.331|Section 6.3.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.RSTxPower";
+    }
+    leaf tac {
+      type uint16 {
+        range "0..65535";
+      }
+      description
+        "Tracking Area Code that is common for all the PLMNs listed. Corresponds to trackingAreaCode as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.TAC";
+    }
+    leaf cell-id {
+      type uint32 {
+        range "0..268435455";
+      }
+      description
+        "Defines the cell identify, defines as a 28-bit binary number. Corresponds to cellIdentity as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2 and Section 6.3.4}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.CellID";
+    }
+    leaf cell-barred {
+      type boolean;
+      description
+        "Indicates whether the cell is barred or not. If {{true}}, the cell is barred. If {{false}}, the cell is not barred. Corresponds to cellBarred as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}} and {{bibref|3GPP-TS.36.304}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.CellBarred";
+    }
+    leaf csg-indication {
+      type boolean;
+      description
+        "Indicates whether CSG is used in this cell or not. If {{true}}, the UE is only allowed to access the cell if the CSG identity matches an entry in the allowed CSG list that the UE has stored. Corresponds to csg-Indication as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.CSGIndication";
+    }
+    leaf csg-identity {
+      type uint32 {
+        range "0..134217727";
+      }
+      description
+        "Defines the CSG ID value if {{param|CSGIndication}} parameter indicates that CSG is used in this cell. Corresponds to csg-Identity as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.CSGIdentity";
+    }
+    leaf max-plmn-list-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.LTE.Cell.{i}.BCCH.PLMNList.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.MaxPLMNListEntries";
+    }
+    leaf plmn-list-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.PLMNListNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.";
+  }
+
+  grouping rem-lte-cell-bcch-plmn-list-g {
+    description
+      "Table containing the PLMN list in the system information broadcast in the BCCH logical channel. Correspnds to plmn-IdentityList as specified in SIB1 in {{bibref|3GPP-TS.36.331|Section 6.2.2}}. Each instance in this object is a PLMN-IdentityInfo which consists of plmn-Identity and cellReservedForOperatorUse IEs.";
+    leaf plmnid {
+      type string {
+        length "0..6";
+      }
+      description
+        "PLMN ID consists of Mobile Country Code (MCC) and Mobile Network Code (MNC) {{bibref|3GPP-TS.23.003}}, {{bibref|3GPP-TS.24.008}}. Mobile Country Code consists of three digits and uniquely identifies the country of domicile of the subscriber. Mobile Network Code consists of two or three digits and identifies the Home PLMN within a country. For a 2-digit MNC the total string length of {{param}} is 5.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.PLMNList.{i}.PLMNID";
+    }
+    leaf cell-reserved-for-operator-use {
+      type boolean;
+      description
+        "Indicates whether the cell is reserved for operator use or not. If {{true}}, it is reserved. If {{false}}, it is not reserved. Corresponds to \"reserved\" \"notReserved\" respectively as defined in PLMN-IdentityInfo in {{bibref|3GPP-TS.36.331|Section 6.2.2}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.PLMNList.{i}.CellReservedForOperatorUse";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.Cell.{i}.BCCH.PLMNList.{i}.";
+  }
+
+  grouping rem-lte-carrier-meas-g {
+    description
+      "Table indicating the measurement of the discovered carrier. The information stored in this object is strictly in the physical layer level and may not necessarily be associated with any particular E-UTRAN cell (e.g. interference level generated by sources other than E-UTRAN cell).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the CarrierMeas entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.Alias";
+    }
+    leaf carrier-arfcndl {
+      type int64;
+      units "MHz";
+      description
+        "Lower bound of the EUTRA ARFCN as specified in {{bibref|3GPP-TS.36.101|Section 5.7.3}} in the DL direction that is requested to measure. Unit in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.CarrierARFCNDL";
+    }
+    leaf carrier-ch-width {
+      type int64;
+      units "ARFCN";
+      description
+        "Number of {{units}} in DL direction, as specified in {{bibref|3GPP-TS.36.101|Section 5.6}}, that is requested to measure. The range bounded by {{param|CarrierARFCNDL}} as the lower bound and the value of ({{param|CarrierARFCNDL}} + {{param}}) as the upper bound expresses the total carrier frequency range to be measured.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.CarrierChWidth";
+    }
+    leaf carrier-rssi {
+      type int64;
+      units "ARFCN";
+      description
+        "Received Signal Strength Indicator (RSSI) as specified in {{bibref|3GPP-TS.36.214|Sec 5.1.3}} over the carrier frequency range from {{param|CarrierARFCNDL}} as the lower bound and the value of ({{param|CarrierARFCNDL}} + {{param|CarrierChWidth}}) as the upper bound.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.CarrierRSSI";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.LTE.CarrierMeas.{i}.";
+  }
+
+  grouping rem-cdma2000-g {
+    description
+      "This object contains parameters relating to radio environment measurement capabilities for the CDMA2000 system.";
+    leaf in-service-handling {
+      type enumeration {
+        enum "immediate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.InServiceHandling - Immediate";
+        }
+        enum "delayed" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.InServiceHandling - Delayed";
+        }
+      }
+      config false;
+      description
+        "FAP REM behavior with respect to ongoing active connections. {{enum}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.InServiceHandling";
+    }
+    leaf scan-on-boot {
+      type boolean;
+      config false;
+      description
+        "Enables or disables Radio Environment Measurement during the FAP start up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanOnBoot";
+    }
+    leaf scan-now {
+      type boolean;
+      config false;
+      description
+        "Directs FAP to perform radio environment measurements immediately (but respecting the setting of {{param|InServiceHandling}}) and report back. After performing the action, the FAP resets the ScanNow value to \"0\" ({{false}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanNow";
+    }
+    leaf return-timer {
+      type uint64 {
+        range "1..max";
+      }
+      units "seconds";
+      config false;
+      description
+        "Time in {{units}} within which the action should be performed by the FAP. Only applies if {{param|InServiceHandling}} is set to Delayed.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReturnTimer";
+    }
+    leaf scan-periodically {
+      type boolean;
+      config false;
+      description
+        "Enables periodic reporting of radio environment measurements.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanPeriodically";
+    }
+    leaf periodic-interval {
+      type uint64 {
+        range "1..max";
+      }
+      units "seconds";
+      config false;
+      description
+        "When {{param|ScanPeriodically}} is {{true}}, this value indicates the interval in {{units}} which REM is performed while the FAP service is enabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.PeriodicInterval";
+    }
+    leaf periodic-time {
+      type yang:date-and-time;
+      config false;
+      description
+        "An absolute time reference in UTC to determine when the CPE will initiate the periodic REM. Each REM MUST occur at (or as soon as possible after) this reference time plus or minus an integer multiple of the {{param|PeriodicInterval}}. {{param}} is used only to set the \"phase\" of the REM. The actual value of {{param}} can be arbitrarily far into the past or future. For example, if {{param|PeriodicInterval}} is 86400 (a day) and if {{param}} is set to UTC midnight on some day (in the past, present, or future) then periodic REMs will occur every day at UTC midnight. These MUST begin on the very next midnight, even if {{param}} refers to a day in the future. The Unknown Time value defined in {{bibref|TR-106a2|Section 3.2}} indicates that no particular time reference is specified. That is, the CPE MAY locally choose the time reference, and needs only to adhere to the specified PeriodicInformInterval. If absolute time is not available to the CPE, its periodic REM behavior MUST be the same as if {{param}} parameter was set to the Unknown Time value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.PeriodicTime";
+    }
+    leaf report-overheads {
+      type enumeration {
+        enum "all" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReportOverheads - All";
+        }
+        enum "one-x" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReportOverheads - OneX";
+        }
+        enum "hrpd" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReportOverheads - HRPD";
+        }
+        enum "none" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReportOverheads - None";
+        }
+      }
+      config false;
+      description
+        "If {{param}} is set to {{enum|All}}, the FAP shall report the overheads from the sectors as well.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ReportOverheads";
+    }
+    leaf scan-timeout {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Specifies the time-out value in {{units}}, measured from the start of the REM scan, before the REM scan will time out.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanTimeout";
+    }
+    leaf scan-status {
+      type enumeration {
+        enum "indeterminate" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus - Indeterminate";
+        }
+        enum "in-progress" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus - InProgress";
+        }
+        enum "success" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus - Success";
+        }
+        enum "error" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus - Error";
+        }
+        enum "error-timeout" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus - Error_TIMEOUT";
+        }
+      }
+      description
+        "Indicates the current status of this scan.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ScanStatus";
+    }
+    leaf error-details {
+      type string {
+        length "0..256";
+      }
+      description
+        "Provides more detail when the {{param|ScanStatus}} is either \"Error\" or \"Error_TIMEOUT\".";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.ErrorDetails";
+    }
+    leaf last-scan-time {
+      type yang:date-and-time;
+      description
+        "The time of the last system radio environment measurement.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.LastScanTime";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.";
+  }
+
+  grouping rem-cdma2000-one-x-g {
+    description
+      "This object contains parameters relating to radio environment measurement capabilities for the 1x system.";
+    leaf max-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.CDMA2000.OneX.Cell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.MaxCellEntries";
+    }
+    leaf cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.CellNumberOfEntries";
+    }
+    leaf max-channel-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.CDMA2000.OneX.Channel.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.MaxChannelEntries";
+    }
+    leaf channel-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.ChannelNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.";
+  }
+
+  grouping rem-cdma2000-one-x-channel-g {
+    description
+      "REM specific configuration and reporting.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.Alias";
+    }
+    leaf sniffing-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "Config parameter to set band class. Reference - {{bibref|3GPP2-C.S0057}}, Band Class Specification for CDMA2000 Spread Spectrum Systems.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.SniffingBandClass";
+    }
+    leaf sniffing-channel-number {
+      type uint16 {
+        range "0..2016";
+      }
+      description
+        "The Radio Frequency Channel Number (RFCN) in the forward direction.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.SniffingChannelNumber";
+    }
+    leaf-list pn-list {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Each item is a (single value) PN offset in units of 64 PN chips or PNrange expressed in the following format: <Start-value>\"..\"<End-value>:<Increment> If an empty string, then no specific PNList is provided, meaning that the FAP is required to pick a PN list to scan on its own.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.PNList";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Channel.{i}.";
+  }
+
+  grouping rem-cdma2000-one-x-cell-g {
+    leaf rem-cdma2000-one-x-cell-key {
+      type string;
+      description
+        "Key value for this object, which could be an item of a list.";
+    }
+    description
+      "Table indicating the components of the discovered cells.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.";
+  }
+
+  grouping rem-cdma2000-one-x-cell-rf-g {
+    description
+      "RF REM results for each detected cell.";
+    leaf band {
+      type int64;
+      description
+        "CDMA band for the reported cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.Band";
+    }
+    leaf rfcnfl {
+      type uint16 {
+        range "0..2016";
+      }
+      description
+        "The Radio Frequency Channel Number (RFCN) in the FL direction for the reported cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.RFCNFL";
+    }
+    leaf io {
+      type int64;
+      units "dBm";
+      description
+        "The total received power spectral density in {{units}}, including signal and interference.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.Io";
+    }
+    leaf p-ilot-pn {
+      type uint16 {
+        range "0..511";
+      }
+      units "64 PN chips";
+      description
+        "Pilot PN Offset (in units of {{units}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.PIlotPN";
+    }
+    leaf p-ilot-pn-phase {
+      type uint64;
+      units "chips";
+      description
+        "Pilot PN phase in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.PIlotPNPhase";
+    }
+    leaf pilot-strength-ecp {
+      type int64;
+      units "dBm";
+      description
+        "The strength estimate of the received pilot energy per chip, Ecp, in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.PilotStrengthEcp";
+    }
+    leaf pilot-strength-ecp-io {
+      type int64;
+      units "dB";
+      description
+        "The strength estimate of the received pilot energy per chip, Ecp, to total received spectral density, Io (signal and noise) in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.PilotStrengthEcpIo";
+    }
+    leaf overheads-available {
+      type boolean;
+      description
+        "If set to {{true}}, the overhead messages for this particular cell is included in {{object|.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.OverheadsAvailable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.RF.";
+  }
+
+  grouping rem-cdma2000-one-x-cell-control-channel-g {
+    description
+      "Table containing information broadcast on control channel.";
+    leaf sid {
+      type int64;
+      description
+        "System identification. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.SID";
+    }
+    leaf nid {
+      type int64;
+      description
+        "Network identification. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.NID";
+    }
+    leaf regzone {
+      type int64;
+      description
+        "Registration Zone. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.REGZONE";
+    }
+    leaf baselat {
+      type int64;
+      description
+        "Basestation latitude. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.BASELAT";
+    }
+    leaf baselong {
+      type int64;
+      description
+        "Basestation longtitude. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.BASELONG";
+    }
+    leaf mcc {
+      type int64;
+      description
+        "Mobile Country Code. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.MCC";
+    }
+    leaf mncimsi1112 {
+      type int64;
+      description
+        "the 11th and 12th digits of IMSI, i.e., Mobile Network Code. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.MNCIMSI1112";
+    }
+    leaf baseid {
+      type int64;
+      description
+        "Basestation identification. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.BASEID";
+    }
+    leaf apid {
+      type string {
+        length "0..32";
+      }
+      description
+        "Access Point Identification. Set to empty string if not available. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.APID";
+    }
+    leaf apidmask {
+      type int64;
+      description
+        "Access Point Identification Mask. Set to zero if not available. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.APIDMASK";
+    }
+    leaf apidtext {
+      type string {
+        length "0..256";
+      }
+      description
+        "Access Point Identification Text. Set to empty string if not available. Refer to {{bibref|3GPP2-C.S0005}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.APIDTEXT";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.OneX.Cell.{i}.ControlChannel.";
+  }
+
+  grouping rem-cdma2000-hrpd-g {
+    description
+      "This object contains parameters relating to radio environment measurement capabilities for the HRPD system.";
+    leaf max-cell-entries {
+      type uint64;
+      description
+        "The maximum number of entries available in the {{object|.REM.CDMA2000.HRPD.Cell.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.MaxCellEntries";
+    }
+    leaf cell-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.CellNumberOfEntries";
+    }
+    leaf max-channel-entries {
+      type uint64;
+      description
+        "The maximum number of entries in {{object|.REM.CDMA2000.HRPD.Channel.{i}.}} table.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.MaxChannelEntries";
+    }
+    leaf channel-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.ChannelNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.";
+  }
+
+  grouping rem-cdma2000-hrpd-channel-g {
+    description
+      "REM specific configuration and reporting.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.Alias";
+    }
+    leaf sniffing-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "Config parameter to set band class. Reference - {{bibref|3GPP2-C.S0057}}, Band Class Specification for CDMA2000 Spread Spectrum Systems.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.SniffingBandClass";
+    }
+    leaf sniffing-channel-number {
+      type uint16 {
+        range "0..2016";
+      }
+      description
+        "The Radio Frequency Channel Number (RFCN) in the FL direction.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.SniffingChannelNumber";
+    }
+    leaf-list pn-list {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Each item is a (single value) PN offset in units of 64 PN chips or PNrange expressed in the following format: <Start-value>\"..\"<End-value>:<Increment>. If an empty string, then no specific PNList is provided, meaning that the FAP is required to pick a PN list to scan on its own.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.PNList";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Channel.{i}.";
+  }
+
+  grouping rem-cdma2000-hrpd-cell-g {
+    leaf rem-cdma2000-hrpd-cell-key {
+      type string;
+      description
+        "Key value for this object, which could be an item of a list.";
+    }
+    description
+      "Table indicating the components of the discovered cells.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.";
+  }
+
+  grouping rem-cdma2000-hrpd-cell-rf-g {
+    description
+      "RF REM results for each detected cell.";
+    leaf band {
+      type int64;
+      description
+        "CDMA band for the reported cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.Band";
+    }
+    leaf rfcnfl {
+      type uint16 {
+        range "0..2016";
+      }
+      description
+        "The Radio Frequency Channel Number (RFCN) in the FL direction for the reported cell.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.RFCNFL";
+    }
+    leaf io {
+      type int64;
+      units "dBm";
+      description
+        "The total received power spectral density in {{units}}, including signal and interference.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.Io";
+    }
+    leaf p-ilot-pn {
+      type uint16 {
+        range "0..511";
+      }
+      units "64 PN chips";
+      description
+        "Pilot PN Offset (in units of {{units}}).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.PIlotPN";
+    }
+    leaf p-ilot-pn-phase {
+      type uint64;
+      units "chips";
+      description
+        "Pilot PN phase in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.PIlotPNPhase";
+    }
+    leaf pilot-strength-ecp {
+      type int64;
+      units "dBm";
+      description
+        "The strength estimate of the received pilot energy per chip in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.PilotStrengthEcp";
+    }
+    leaf pilot-strength-ecp-io {
+      type int64;
+      units "dB";
+      description
+        "The strength estimate of the received pilot energy per chip, Ecp, to total received spectral density, Io (signal and noise) in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.PilotStrengthEcpIo";
+    }
+    leaf overheads-available {
+      type boolean;
+      description
+        "If set to {{true}}, the overhead messages for this particular cell is included in {{object|.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.OverheadsAvailable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.RF.";
+  }
+
+  grouping rem-cdma2000-hrpd-cell-control-channel-g {
+    description
+      "Table containing information braodcast on control channel.";
+    leaf color-code {
+      type int64;
+      description
+        "The color code of the measured sector as defined in {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.ColorCode";
+    }
+    leaf sector-id {
+      type binary {
+        length "16";
+      }
+      description
+        "The sector ID of the measured sector as defined in {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.SectorID";
+    }
+    leaf subnet-mask {
+      type int64;
+      units "bits";
+      description
+        "The length of the subnet mask in {{units}} for the measured sector as defined in {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.SubnetMask";
+    }
+    leaf country-code {
+      type int64;
+      description
+        "The country code of the measured sector as defined in {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.CountryCode";
+    }
+    leaf latitude {
+      type int64;
+      units "0.25 arc seconds";
+      description
+        "The reported lattitude of the cell in units of {{units}}, expressed as a two's complement signed number with positive numbers signifying North latitudes in the range -1296000 to 1296000 inclusive corresponding to a range of -90 to +90) Refer to {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.Latitude";
+    }
+    leaf longitude {
+      type int64;
+      units "0.25 arc seconds";
+      description
+        "The reported longitude of the cell in units of {{units}}, expressed as a two's complement signed number with positive numbers signifying East longitude in the range -2592000 to 2592000 inclusive (corresponding to a range of -180 to +180). Refer to {{bibref|3GPP2-C.S0024}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.Longitude";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.HRPD.Cell.{i}.ControlChannel.";
+  }
+
+  grouping rem-cdma2000-macro-timing-g {
+    description
+      "Parameters for controlling CDMA2000 system timing derived from macro system sniffing.";
+    leaf admin-state {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "This is the Admin State of Macro Timing. Lock means MacroTiming feature is Enabled. Unlock means MacroTiming feature is disabled. 0 - Lock (Enabled), 1 - Unlock (Disabled).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.AdminState";
+    }
+    leaf tracking-channel-number {
+      type uint64;
+      description
+        "Channel number of Macro Base Station currently used for MacroTiming.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.TrackingChannelNumber";
+    }
+    leaf tracking-band-class {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "BandClass of Macro Base Station currently used for MacroTiming.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.TrackingBandClass";
+    }
+    leaf-list tracking-pn-offset {
+      type string {
+        length "0..256";
+      }
+      description
+        "{{list}} Each item is a (single value) PN offset in units of 64 PN chips of a Macro Base Station currently used for MacroTiming.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.TrackingPNOffset";
+    }
+    leaf timing-source {
+      type uint8 {
+        range "0..1";
+      }
+      description
+        "This parameter indicates the timing source for the FAP: 0 - GPS 1 - Macro Timing The other read-only parameters in this object only have valid values when timingsource is set to 1.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.TimingSource";
+    }
+    leaf channel-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.ChannelNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.";
+  }
+
+  grouping rem-cdma2000-macro-timing-channel-g {
+    description
+      "Object used to configure list of channels to be used for Macto Timing.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the {{object}} entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.Enable";
+    }
+    leaf alias {
+      type string {
+        length "1..64";
+      }
+      description
+        "{{datatype|expand}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.Alias";
+    }
+    leaf air-interface-type {
+      type uint8 {
+        range "0..1";
+      }
+      config false;
+      description
+        "Air interface type of the configured Band class and Channel. 0 - 1x, 1 - HRPD.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.AirInterfaceType";
+    }
+    leaf band-class {
+      type uint8 {
+        range "0..31";
+      }
+      description
+        "Bandclass of the Macro timing channel.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.BandClass";
+    }
+    leaf channel-number {
+      type uint64;
+      description
+        "Macro timing acquisition channel.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.ChannelNumber";
+    }
+    leaf priority {
+      type uint64;
+      config false;
+      description
+        "Priority of the channle to use for acquisition. FAP should prioritize lower values over higher.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.Priority";
+    }
+    leaf-list pn-list {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "{{list}} Each item is a (single value) PN offset in units of 64 PN chips or PNrange expressed in the following format: <Start-value>\"..\"<End-value>:<Increment> If an empty string, then no specific PNList is provided, meaning that the FAP is required to pick a PN list to scan on its own.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.PNList";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.REM.CDMA2000.MacroTiming.Channel.{i}.";
+  }
+
+  grouping transport-g {
+    description
+      "This object contains parameters relating to the transport.";
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.";
+  }
+
+  grouping transport-sip-g {
+    description
+      "This object contains parameters relating to SIP as a transport protocol. SIP is defined in {{bibref|RFC3261}}.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the whole SIP object and allows the setup or release of SIP associations and their related streams.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.Enable";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.";
+  }
+
+  grouping transport-sip-fcs-g {
+    description
+      "This object models SIP Femtocell Convergence Server (FCS) parameters.";
+    leaf fcsuri {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The request URI for MESSAGE method sent to Femtocell Convergence Server (FCS). The string MUST contain a URI as defined in {{bibref|RFC3986}}. The device MUST support SIP URI and MAY support other URI schemes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.FCSURI";
+    }
+    leaf out-going-proxy-uri {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The request URI for Outgoing Proxy. The string MUST contain a URI as defined in {{bibref|RFC3986}}. The device MUST support SIP URI and MAY support other URI schemes.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.OutGoingProxyURI";
+    }
+    leaf p-access-net-info-header {
+      type string {
+        length "0..256";
+      }
+      description
+        "This string will be populated as the value for P-Access-Network-Info header. This header is generated by the device. See {{bibref|3GPP2-X.S0059}} and {{bibref|RFC3455}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.PAccessNetInfoHeader";
+    }
+    leaf realm {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "The FQDN or IP Address representing the Home Domain of the device. The request URI for REGISTER will be formed by prefixing \"sip:\" to this value.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.Realm";
+    }
+    leaf impu {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The \"IP Multimedia Public User\" (IMPU) Identity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.IMPU";
+    }
+    leaf impi {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "The \"IP Multimedia Private Identity\" (IMPI). This value is ignored when {{param|SIPAuthMethod}} is set to {{enum|TNA|SIPAuthMethod}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.IMPI";
+    }
+    leaf sip-password {
+      type string {
+        length "0..32";
+      }
+      config false;
+      description
+        "Password to Authenticate the IMS core. This value is ignored when {{param|SIPAuthMethod}} is set to {{enum|TNA|SIPAuthMethod}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPPassword";
+    }
+    leaf-list sip-auth-capability {
+      type enumeration {
+        enum "tna" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPAuthCapability - TNA";
+        }
+        enum "sip-digest" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPAuthCapability - SIPDigest";
+        }
+      }
+      description
+        "Represents the SIP authentication mechanisms supported by this device.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPAuthCapability";
+    }
+    leaf sip-auth-method {
+      type string {
+        length "0..256";
+      }
+      config false;
+      description
+        "Represents the authentication method used by this device for SIP registration. If value is {{enum|SIPDigest}}, the {{param|SIPPassword}} MUST not be {{empty}}. If value is {{enum|TNA}}, {{param|SIPPassword}} and {{param|IMPI}} are ignored.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPAuthMethod";
+    }
+    leaf sip-local-port {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "Local port number for initiating SIP traffic.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPLocalPort";
+    }
+    leaf rtp-port-low-limit {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "The low limit of port number for originating and receiving RTP/RTCP traffic.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.RTPPortLowLimit";
+    }
+    leaf rtp-port-high-limit {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description
+        "The high limit of port number for originating and receiving RTP/RTCP traffic.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.RTPPortHighLimit";
+    }
+    leaf sip-reg-expiry {
+      type uint64;
+      config false;
+      description
+        "SIP registration expiry value, as defined in {{bibref|RFC3261}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPRegExpiry";
+    }
+    leaf sip-session-expiry {
+      type uint64 {
+        range "90..max";
+      }
+      units "seconds";
+      default "1800";
+      config false;
+      description
+        "SIP session timer expiry value, in {{units}}, as defined in {{bibref|RFC4028}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.SIPSessionExpiry";
+    }
+    leaf-list emergency-numbers-list {
+      type string {
+        length "0..64";
+      }
+      config false;
+      description
+        "Indicates the dialed digit pattern matching strings used to determine if the call is an emergency call that MAY bypass access control and receive priority treatment.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.EmergencyNumbersList";
+    }
+    leaf timer-t1 {
+      type uint64 {
+        range "1..max";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Value of SIP timer T1, in {{units}}, as defined in {{bibref|RFC3261}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.TimerT1";
+    }
+    leaf timer-t2 {
+      type uint64 {
+        range "1..max";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Value of SIP timer T2, in {{units}}, as defined in {{bibref|RFC3261}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.TimerT2";
+    }
+    leaf timer-t4 {
+      type uint64 {
+        range "1..max";
+      }
+      units "milliseconds";
+      config false;
+      description
+        "Value of SIP timer T4, in {{units}}, as defined in {{bibref|RFC3261}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.TimerT4";
+    }
+    leaf t3210 {
+      type uint8 {
+        range "1..20";
+      }
+      units "seconds";
+      config false;
+      description
+        "This value specifies how much time to wait, in {{units}}, before time out on location update accept/reject. See {{bibref|3GPP2-A.S0014}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.T3210";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SIP.FCS.";
+  }
+
+  grouping transport-sctp-g {
+    description
+      "This object contains parameters relating to SCTP as a transport protocol. SCTP is defined in {{bibref|RFC4960}} and {{bibref|RFC3873}}.";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enables or disables the whole SCTP object and allows the setup or release of SCTP associations and their related streams.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Enable";
+    }
+    leaf hb-interval {
+      type uint64 {
+        range "1..max";
+      }
+      units "seconds";
+      default "30";
+      config false;
+      description
+        "Heartbeat interval in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.HBInterval";
+    }
+    leaf max-association-retransmits {
+      type uint64;
+      default "10";
+      config false;
+      description
+        "Maximum number of consecutive retransmissions to a peer before an endpoint considers that the peer is unreachable and closes the association.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.MaxAssociationRetransmits";
+    }
+    leaf max-init-retransmits {
+      type uint64;
+      default "8";
+      config false;
+      description
+        "Number of retransmission per connection-attempt.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.MaxInitRetransmits";
+    }
+    leaf max-path-retransmits {
+      type uint64;
+      default "5";
+      config false;
+      description
+        "Maximum retransmission per destination address.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.MaxPathRetransmits";
+    }
+    leaf rto-initial {
+      type uint64;
+      units "milliseconds";
+      default "3000";
+      config false;
+      description
+        "Initial value for Retransmit timeout in {{units}}. A retransmission time value of zero means immediate retransmission.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.RTOInitial";
+    }
+    leaf rto-max {
+      type uint64;
+      units "milliseconds";
+      default "6000";
+      config false;
+      description
+        "Maximum value for Retransmit timeout in {{units}}. A retransmission time value of zero means immediate retransmission.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.RTOMax";
+    }
+    leaf rto-min {
+      type uint64;
+      units "milliseconds";
+      default "1000";
+      config false;
+      description
+        "Minimum value for Retransmit timeout in {{units}}. A retransmission time value of zero means immediate retransmission. The value of this parameter MUST be lower than or equal to {{param|RTOMax}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.RTOMin";
+    }
+    leaf val-cookie-life {
+      type uint64;
+      units "milliseconds";
+      default "60000";
+      config false;
+      description
+        "Valid cookie life in the 4-way start-up handshake procedure in {{units}}.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.ValCookieLife";
+    }
+    leaf out-of-blues {
+      type uint64;
+      description
+        "The number of correctly formed SCTP packets, including the proper checksum, but for which the receiver was unable to identify an appropriate association.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.OutOfBlues";
+    }
+    leaf checksum-errors {
+      type uint64;
+      description
+        "The number of SCTP packets received with an invalid checksum.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.ChecksumErrors";
+    }
+    leaf out-ctrl-chunks {
+      type uint64;
+      description
+        "The number of SCTP control chunks sent (retransmissions are not included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.OutCtrlChunks";
+    }
+    leaf out-order-chunks {
+      type uint64;
+      description
+        "The number of SCTP ordered data chunks sent (retransmissions are not included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.OutOrderChunks";
+    }
+    leaf out-unorder-chunks {
+      type uint64;
+      description
+        "The number of SCTP unordered chunks (data chunks in which the U bit is set to 1) sent (retransmissions are not included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.OutUnorderChunks";
+    }
+    leaf in-ctrl-chunks {
+      type uint64;
+      description
+        "The number of SCTP control chunks received (no duplicate chunks included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.InCtrlChunks";
+    }
+    leaf in-order-chunks {
+      type uint64;
+      description
+        "The number of SCTP ordered data chunks received (no duplicate chunks included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.InOrderChunks";
+    }
+    leaf in-unorder-chunks {
+      type uint64;
+      description
+        "The number of SCTP unordered chunks (data chunks in which the U bit is set to 1) received (no duplicate chunks included).";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.InUnorderChunks";
+    }
+    leaf frag-usr-msgs {
+      type uint64;
+      description
+        "The number of user messages that have been sent fragmented.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.FragUsrMsgs";
+    }
+    leaf reasm-usr-msgs {
+      type uint64;
+      description
+        "The number of user messages that have been received fragmented and submitted to the reassembly process.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.ReasmUsrMsgs";
+    }
+    leaf out-sctp-packs {
+      type uint64;
+      description
+        "The number of SCTP packets sent. Retransmitted DATA chunks are included.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.OutSCTPPacks";
+    }
+    leaf in-sctp-packs {
+      type uint64;
+      description
+        "The number of SCTP packets received. Duplicates are included.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.InSCTPPacks";
+    }
+    leaf discontinuity {
+      type yang:date-and-time;
+      description
+        "The time of the last discontinuity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Discontinuity";
+    }
+    leaf assoc-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.AssocNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.";
+  }
+
+  grouping transport-sctp-assoc-g {
+    description
+      "SCTP Association Table";
+    leaf status {
+      type enumeration {
+        enum "disabled" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status - Disabled";
+        }
+        enum "active" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status - Active";
+        }
+        enum "progressing" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status - Progressing";
+        }
+        enum "shutting-down" {
+          value 4;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status - ShuttingDown";
+        }
+        enum "error" {
+          value 5;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status - Error";
+        }
+      }
+      description
+        "The status of this SCTP association entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Status";
+    }
+    leaf primary-peer-address {
+      type inet:ip-address;
+      description
+        "The primary IP address of the peer SCTP association entity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.PrimaryPeerAddress";
+    }
+    leaf local-port {
+      type uint16 {
+        range "0..63999";
+      }
+      description
+        "The local SCTP port number used for this SCTP association.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.LocalPort";
+    }
+    leaf in-streams {
+      type uint64;
+      description
+        "The number of Inbound Streams according to the negotiation at association start-up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.InStreams";
+    }
+    leaf out-streams {
+      type uint64;
+      description
+        "The number of Outbound Streams according to the negotiation at association start-up.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.OutStreams";
+    }
+    leaf start-time {
+      type yang:date-and-time;
+      description
+        "The start Time for the present SCTP association.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.StartTime";
+    }
+    leaf discontinuity {
+      type yang:date-and-time;
+      description
+        "The time of the last discontinuity.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.Discontinuity";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.SCTP.Assoc.{i}.";
+  }
+
+  grouping transport-real-time-g {
+    description
+      "This object contains parameters relating to Real Time Transport using RTP.";
+    leaf rtcp-enable {
+      type boolean;
+      config false;
+      description
+        "Enable or disable RTCP.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.RTCPEnable";
+    }
+    leaf sent-packets {
+      type uint64;
+      description
+        "The number of sent RTP packets.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.SentPackets";
+    }
+    leaf rcv-packets {
+      type uint64;
+      description
+        "The number of received RTP packets.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.RcvPackets";
+    }
+    leaf bytes-sent {
+      type uint64;
+      description
+        "Total number of RTP payload bytes sent.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.BytesSent";
+    }
+    leaf bytes-received {
+      type uint64;
+      description
+        "Total number of RTP payload bytes received.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.BytesReceived";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.";
+  }
+
+  grouping transport-real-time-perf-g {
+    description
+      "This object contains performances relating to Real Time Transport using RTP.";
+    leaf lost-rcv-packets {
+      type uint64;
+      description
+        "The number of Lost RTP packets in reception.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.LostRcvPackets";
+    }
+    leaf lost-far-end-packets {
+      type uint64;
+      description
+        "The number of Far End Lost RTP packets.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.LostFarEndPackets";
+    }
+    leaf overruns {
+      type uint64;
+      description
+        "Total number of times the receive jitter buffer has overrun.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.Overruns";
+    }
+    leaf underruns {
+      type uint64;
+      description
+        "Total number of times the receive jitter buffer has underrun for a CS-domain RAB.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.Underruns";
+    }
+    leaf mean-rtt {
+      type uint64;
+      units "microseconds";
+      description
+        "The mean Round Trip Time in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MeanRTT";
+    }
+    leaf max-rtt {
+      type uint64;
+      units "microseconds";
+      description
+        "The maximum Round Trip Time in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MaxRTT";
+    }
+    leaf mean-receive-jitter {
+      type uint64;
+      units "microseconds";
+      description
+        "The mean receive jitter in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MeanReceiveJitter";
+    }
+    leaf max-receive-jitter {
+      type uint64;
+      units "microseconds";
+      description
+        "The maximum receive jitter in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MaxReceiveJitter";
+    }
+    leaf mean-far-end-jitter {
+      type uint64;
+      units "microseconds";
+      description
+        "The mean far end jitter in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MeanFarEndJitter";
+    }
+    leaf max-far-end-jitter {
+      type uint64;
+      units "microseconds";
+      description
+        "The maximum far end jitter in {{units}} as computed by the source. {{bibref|RFC3550}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.MaxFarEndJitter";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.RealTime.Perf.";
+  }
+
+  grouping transport-packet-g {
+    description
+      "This object contains parameters relating to Packet Transport using GTP-U.";
+    leaf echo-interval {
+      type uint64;
+      units "seconds";
+      config false;
+      description
+        "Echo interval in {{units}}. An Echo interval value of zero means echo is disabled.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Packet.EchoInterval";
+    }
+    leaf sent-packets {
+      type uint64;
+      description
+        "The number of sent GTP-U packets.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Packet.SentPackets";
+    }
+    leaf rcv-packets {
+      type uint64;
+      description
+        "The number of received GTP-U packets.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Packet.RcvPackets";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Packet.";
+  }
+
+  grouping transport-security-g {
+    description
+      "This object contains parameters relating to Security.";
+    leaf secret-number-of-entries {
+      type uint64;
+      description
+        "{{numentries}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.SecretNumberOfEntries";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.";
+  }
+
+  grouping transport-security-secret-g {
+    description
+      "Shared Secret Table. This table gathers information about all types of shared secret-based credentials (UICC).";
+    leaf enable {
+      type boolean;
+      config false;
+      description
+        "Enable or disable this Shared Secret entry";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Enable";
+    }
+    leaf type {
+      type enumeration {
+        enum "sim" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Type - SIM";
+        }
+        enum "usim" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Type - USIM";
+        }
+      }
+      description
+        "The type of this Shared Secret entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Type";
+    }
+    leaf status {
+      type enumeration {
+        enum "present" {
+          value 1;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Status - Present";
+        }
+        enum "not-present" {
+          value 2;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Status - Not_present";
+        }
+        enum "error" {
+          value 3;
+          description
+            "none";
+          reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Status - Error";
+        }
+      }
+      description
+        "The status of this Shared Secret entry.";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.Status";
+    }
+    leaf uicc-card-id {
+      type string {
+        length "0..19";
+      }
+      description
+        "The UICC Card Identifier (UICCID), only numeric values are allowed. {{bibref|ITU-E.118}}";
+      reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.UICCCardID";
+    }
+    reference "BBF TR-196 2.0.3 full - FAPService.{i}.Transport.Security.Secret.{i}.";
+  }
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/core-model@2017-03-20.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/core-model@2017-03-20.yang
new file mode 100644
index 000000000..134062817
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/core-model@2017-03-20.yang
@@ -0,0 +1,1700 @@
+module core-model {
+    namespace "urn:onf:params:xml:ns:yang:core-model";
+    prefix core-model;
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             WG Chair: Giorgio Cazzaniga
+                       <mailto:giorgio.cazzaniga@sm-optics.com>
+             Editors:  Thorsten Heinze
+                       <mailto:thorsten.heinze@telefonica.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This module contains a collection of YANG definitions for managing wireless networks.";
+    revision 2017-03-20 {
+        description "Initial version";
+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";
+    }
+    /***********************
+    * package core-network-model
+    **********************/ 
+        /***********************
+        * package type-definitions
+        **********************/ 
+            /***********************
+            * package resilience
+            **********************/ 
+                typedef protection-reason {
+                    type enumeration {
+                        enum wait-to-revert {
+                            description "removed";
+                        }
+                        enum signal-degrade {
+                            description "removed";
+                        }
+                        enum signal-fail {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef route-selection-control {
+                    type enumeration {
+                        enum normal {
+                            description "removed";
+                        }
+                        enum manual {
+                            description "removed";
+                        }
+                        enum forced {
+                            description "removed";
+                        }
+                        enum lock-out {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef route-selection-reason {
+                    type enumeration {
+                        enum wait-to-revert {
+                            description "removed";
+                        }
+                        enum signal-degrade {
+                            description "removed";
+                        }
+                        enum signal-fail {
+                            description "removed";
+                        }
+                        enum normal {
+                            description "removed";
+                        }
+                        enum manual {
+                            description "removed";
+                        }
+                        enum forced {
+                            description "removed";
+                        }
+                        enum lock-out {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef switch-control {
+                    type enumeration {
+                        enum normal {
+                            description "removed";
+                        }
+                        enum manual {
+                            description "removed";
+                        }
+                        enum forced {
+                            description "removed";
+                        }
+                    }
+                    description "none";
+                }
+                typedef switch-state-reason {
+                    type enumeration {
+                        enum wait-to-revert {
+                            description "removed";
+                        }
+                        enum signal-degrade {
+                            description "removed";
+                        }
+                        enum signal-fail {
+                            description "removed";
+                        }
+                        enum normal {
+                            description "removed";
+                        }
+                        enum manual {
+                            description "removed";
+                        }
+                        enum forced {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef reversion-mode {
+                    type enumeration {
+                        enum revertive {
+                            description "removed";
+                        }
+                        enum non-revertive {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                grouping global-pac-g {
+                    uses global-class-g;
+                    description "removed";
+                }
+                grouping local-pac-g {
+                    uses local-class-g;
+                    description "removed";
+                }
+                typedef protection-type {
+                    type string;
+                    description "removed";
+                }
+
+            typedef layer-protocol-name {
+                type string;
+                description "removed";
+            }
+            typedef port-role {
+                type string;
+                description "removed";
+            }
+            typedef port-direction {
+                type enumeration {
+                    enum bidirectional {
+                        description "removed";
+                    }
+                    enum input {
+                        description "removed";
+                    }
+                    enum output {
+                        description "removed";
+                    }
+                    enum unidentified-or-unknown {
+                        description "removed";
+                    }
+                }
+                description "removed";
+            }
+            typedef forwarding-direction {
+                type enumeration {
+                    enum bidirectional {
+                        description "removed";
+                    }
+                    enum unidirectional {
+                        description "removed";
+                    }
+                    enum undefined-or-unknown {
+                        description "removed";
+                    }
+                }
+                description "removed";
+            }
+            typedef termination-direction {
+                type enumeration {
+                    enum bidirectional {
+                        description "removed";
+                    }
+                    enum sink {
+                        description "removed";
+                    }
+                    enum source {
+                        description "removed";
+                    }
+                    enum undefined-or-unknown {
+                        description "removed";
+                    }
+                }
+                description "removed";
+            }
+            typedef extended-termination-direction {
+                type enumeration {
+                    enum bidirectional {
+                        description "removed";
+                    }
+                    enum sink {
+                        description "removed";
+                    }
+                    enum source {
+                        description "removed";
+                    }
+                    enum undefined-or-unknown {
+                        description "removed";
+                    }
+                    enum contra-direction-sink {
+                        description "removed";
+                    }
+                    enum contra-direction-source {
+                        description "removed";
+                    }
+                }
+                description "removed";
+            }
+            typedef termination-state {
+                type enumeration {
+                    enum lp-can-never-terminate {
+                        description "removed";
+                    }
+                    enum lt-not-terminated {
+                        description "removed";
+                    }
+                    enum terminated-server-to-client-flow {
+                        description "removed";
+                    }
+                    enum terminated-client-to-server-flow {
+                        description "removed";
+                    }
+                    enum terminated-bidirectional {
+                        description "removed";
+                    }
+                    enum lt-permenantly-terminated {
+                        description "removed";
+                    }
+                    enum termination-state-unknown {
+                        description "removed";
+                    }
+                }
+                description "removed";
+            }
+
+        /***********************
+        * package object-classes
+        **********************/ 
+            /***********************
+            * package resilience
+            **********************/ 
+                grouping configuration-and-switch-controller-g {
+                    leaf switch-rule {
+                        type to-be-defined;
+                        description "removed";
+                    }
+                    leaf-list fc-switch {
+                        type leafref {
+                            path '/forwarding-construct/fc-switch/uuid';
+                        }
+                        description "removed";
+                    }
+                    container control-parameters {
+                        uses control-parameters-pac-g;
+                        description "removed";
+                    }
+                    leaf-list profile-proxy {
+                        type string;
+                        description "removed";
+                    }
+                    container local-pac {
+                        uses local-pac-g;
+                        description "none";
+                    }
+                    container global-pac {
+                        uses global-pac-g;
+                        description "none";
+                    }
+                    leaf is-frozen {
+                        type boolean;
+                        description "removed";
+                    }
+                    leaf is-coordinated-switching-both-ends {
+                        type boolean;
+                        description "removed";
+                    }
+                    leaf-list subordinate-controller {
+                        type leafref {
+                            path '/network-element/ltp/lp/config-and-switch-controller/switch-rule';
+                        }
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping control-parameters-pac-g {
+                    leaf reversion-mode {
+                        type reversion-mode;
+                        description "removed";
+                    }
+                    leaf wait-to-revert-time {
+                        type int64;
+                        default 15;
+                        description "removed";
+                    }
+                    leaf prot-type {
+                        type protection-type;
+                        description "removed";
+                    }
+                    leaf hold-off-time {
+                        type int64;
+                        description "removed";
+                    }
+                    leaf network-scheme-specification {
+                        type string;
+                        description "none";
+                    }
+                    description "removed";
+                }
+                grouping fc-switch-g {
+                    leaf hold-off-time {
+                        type int64;
+                        description "removed";
+                    }
+                    leaf prot-type {
+                        type protection-type;
+                        description "removed";
+                    }
+                    leaf reversion-mode {
+                        type reversion-mode;
+                        description "removed";
+                    }
+                    leaf-list selected-fc-port {
+                        type leafref {
+                            path '/forwarding-construct/fc-port/uuid';
+                        }
+                        description "removed";
+                    }
+                    leaf-list profile-proxy {
+                        type string;
+                        description "removed";
+                    }
+                    container internal-configuration-and-switch-control {
+                        uses configuration-and-switch-controller-g;
+                        description "removed";
+                    }
+                    leaf switch-control {
+                        type switch-control;
+                        description "removed";
+                    }
+                    leaf switch-selects-ports {
+                        type port-direction;
+                        description "removed";
+                    }
+                    leaf switch-selection-reason {
+                        type switch-state-reason;
+                        config false;
+                        description "removed";
+                    }
+                    container control-parameters {
+                        uses control-parameters-pac-g;
+                        description "none";
+                    }
+                    leaf wait-to-restore-time {
+                        type int64;
+                        description "removed";
+                    }
+                    uses local-class-g;
+                    description "removed";
+                }
+
+            grouping forwarding-domain-g {
+                leaf-list layer-protocol-name {
+                    type layer-protocol-name;
+                    min-elements 1;
+                    description "removed";
+                }
+                leaf-list lower-level-fd {
+                    type leafref {
+                        path '/network-element/fd/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list fc {
+                    type leafref {
+                        path '/forwarding-construct/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list lower-level-link {
+                    type string;
+                    description "removed";
+                }
+                uses global-class-g;
+                description "removed";
+            }
+            grouping forwarding-construct-g {
+                leaf layer-protocol-name {
+                    type layer-protocol-name;
+                    description "removed";
+                }
+                leaf-list lower-level-fc {
+                    type leafref {
+                        path '/forwarding-construct/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list fc-route {
+                    type string;
+                    description "removed";
+                }
+                list fc-port {
+                    key 'uuid';
+                    min-elements 2;
+                    uses fc-port-g;
+                    description "removed";
+                }
+                list fc-switch {
+                    key 'uuid';
+                    uses fc-switch-g;
+                    description "removed";
+                }
+                leaf forwarding-direction {
+                    type forwarding-direction;
+                    description "removed";
+                }
+                leaf is-protection-lock-out {
+                    if-feature protection-exclude-server;
+                    type boolean;
+                    description "removed";
+                }
+                leaf service-priority {
+                    type int64;
+                    description "removed";
+                }
+                leaf-list supported-link {
+                    type string;
+                    description "removed";
+                }
+                uses global-class-g;
+                description "removed";
+            }
+            container network-element {
+                presence  "";
+                list fd {
+                    key 'uuid';
+                    uses forwarding-domain-g;
+                    description "removed";
+                }
+                list ltp {
+                    key 'uuid';
+                    uses logical-termination-point-g;
+                    description "removed";
+                }
+                uses global-class-g;
+                description "removed";
+            }
+            list forwarding-construct {
+                key 'uuid';
+                uses forwarding-construct-g;
+                description "none";
+            }
+            grouping fc-port-g {
+                leaf-list ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    max-elements 2;
+                    description "removed";
+                }
+                leaf role {
+                    type port-role;
+                    description "removed";
+                }
+                leaf fc-port-direction {
+                    type port-direction;
+                    description "removed";
+                }
+                leaf is-protection-lock-out {
+                    if-feature protection-exclude-fc-port;
+                    type boolean;
+                    description "removed";
+                }
+                leaf selection-priority {
+                    type int64;
+                    description "removed";
+                }
+                leaf is-internal-port {
+                    type boolean;
+                    config false;
+                    description "removed";
+                }
+                leaf-list fc-route-feeds-fc-port-egress {
+                    type string;
+                    description "removed";
+                }
+                uses local-class-g;
+                description "removed";
+            }
+            grouping layer-protocol-g {
+                leaf layer-protocol-name {
+                    type layer-protocol-name;
+                    description "removed";
+                }
+                leaf configured-client-capacity {
+                    type to-be-defined;
+                    description "removed";
+                }
+                leaf lp-direction {
+                    type termination-direction;
+                    description "removed";
+                }
+                leaf termination-state {
+                    type termination-state;
+                    description "removed";
+                }
+                list config-and-switch-controller {
+                    key 'switch-rule';
+                    uses configuration-and-switch-controller-g;
+                    description "removed";
+                }
+                leaf is-protection-lock-out {
+                    if-feature protection-exclude-ltp;
+                    type boolean;
+                    description "removed";
+                }
+                leaf fc-blocks-signal-to-lp {
+                    type string;
+                    description "none";
+                }
+                uses local-class-g;
+                description "removed";
+            }
+            grouping logical-termination-point-g {
+                leaf-list server-ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list client-ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                list lp {
+                    key 'uuid';
+                    min-elements 1;
+                    uses layer-protocol-g;
+                    description "removed";
+                }
+                leaf connected-ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                leaf peer-ltp {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                leaf-list physical-port-reference {
+                    type string;
+                    description "removed";
+                }
+                leaf-list ltp-in-other-view {
+                    type leafref {
+                        path '/network-element/ltp/uuid';
+                    }
+                    description "removed";
+                }
+                leaf ltp-direction {
+                    type termination-direction;
+                    description "removed";
+                }
+                uses global-class-g;
+                description "removed";
+            }
+            feature protection-exclude-server {
+                description "In protection context if server of protection where entire server is to be excluded from use for protection.";
+            }
+            feature protection-exclude-fc-port {
+                description "In protection context where the FcPort is to be excluded from use for protection.";
+            }
+            feature protection-exclude-ltp {
+                description "In protection context if LTP of protection where entire LTP is to be excluded from use for protection.";
+            }
+
+        /***********************
+        * package diagrams
+        **********************/ 
+
+        /***********************
+        * package associations
+        **********************/ 
+
+
+    /***********************
+    * package core-foundation-model
+    **********************/ 
+        /***********************
+        * package type-definitions
+        **********************/ 
+            typedef date-and-time {
+                type string;
+                description "removed";
+            }
+            typedef bit-string {
+                type string;
+                description "removed";
+            }
+            typedef real {
+                type string;
+                description "removed";
+            }
+            typedef printable-string {
+                type string;
+                description "removed";
+            }
+            typedef to-be-defined {
+                type string;
+                description "removed";
+            }
+
+        /***********************
+        * package super-classes-and-common-packages
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping name-g {
+                    list name {
+                        key 'value-name';
+                        min-elements 1;
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping global-class-g {
+                    list local-id {
+                        key 'value-name';
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    leaf uuid {
+                        type universal-id;
+                        description "removed";
+                    }
+                    uses name-g;
+                    uses label-g;
+                    uses extension-g;
+                    uses state-pac-g;
+                    description "removed";
+                }
+                grouping local-class-g {
+                    list local-id {
+                        key 'value-name';
+                        min-elements 1;
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    leaf uuid {
+                        type universal-id;
+                        description "A global identifier for the LocalClass, which is used as reference.";
+                    }
+                    uses name-g;
+                    uses label-g;
+                    uses extension-g;
+                    uses state-pac-g;
+                    description "removed";
+                }
+                grouping label-g {
+                    list label {
+                        key 'value-name';
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping extension-g {
+                    list extension {
+                        key 'value-name';
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping universal-id-authority-g {
+                    leaf uuid {
+                        type universal-id;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping name-and-value-authority-g {
+                    leaf uuid {
+                        type universal-id;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping conditional-package-g {
+                    uses extension-g;
+                    uses label-g;
+                    description "removed";
+                }
+
+            /***********************
+            * package type-definitions
+            **********************/ 
+                grouping name-and-value-g {
+                    leaf value-name {
+                        type string;
+                        description "removed";
+                    }
+                    leaf value {
+                        type string;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                typedef universal-id {
+                    type string;
+                    description "removed";
+                }
+                grouping address-g {
+                    leaf address-name {
+                        type string;
+                        description "removed";
+                    }
+                    list address-element {
+                        key 'uuid';
+                        uses address-element-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping local-id-and-class-g {
+                    leaf class-of-instance {
+                        type string;
+                        description "removed";
+                    }
+                    container local-id {
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping name-and-class-g {
+                    leaf class-of-instance {
+                        type string;
+                        description "removed";
+                    }
+                    container name {
+                        uses name-and-value-g;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+                grouping address-element-g {
+                    leaf address-element-name {
+                        type string;
+                        description "removed";
+                    }
+                    container local-id {
+                        uses local-id-and-class-g;
+                        description "removed";
+                    }
+                    leaf uuid {
+                        type universal-id;
+                        description "removed";
+                    }
+                    container name {
+                        uses name-and-class-g;
+                        description "removed";
+                    }
+                    leaf arbitrary-element {
+                        type string;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+
+
+        /***********************
+        * package state-model
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping state-pac-g {
+                    leaf operational-state {
+                        type operational-state;
+                        config false;
+                        description "removed";
+                    }
+                    leaf administrative-control {
+                        type administrative-control;
+                        description "removed";
+                    }
+                    leaf administrative-state {
+                        type administrative-state;
+                        config false;
+                        description "removed";
+                    }
+                    leaf lifecycle-state {
+                        type lifecycle-state;
+                        description "removed";
+                    }
+                    description "removed";
+                }
+
+            /***********************
+            * package type-definitions
+            **********************/ 
+                typedef operational-state {
+                    type enumeration {
+                        enum disabled {
+                            description "removed";
+                        }
+                        enum enabled {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef administrative-state {
+                    type enumeration {
+                        enum locked {
+                            description "removed";
+                        }
+                        enum unlocked {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef administrative-control {
+                    type enumeration {
+                        enum unlock {
+                            description "removed";
+                        }
+                        enum lock-passive {
+                            description "removed";
+                        }
+                        enum lock-active {
+                            description "removed";
+                        }
+                        enum lock-immediate {
+                            description "removed";
+                        }
+                    }
+                    description "removed
+                        removed";
+                }
+                typedef extended-admin-state {
+                    type enumeration {
+                        enum locked {
+                            description "removed";
+                        }
+                        enum unlocked {
+                            description "removed";
+                        }
+                        enum shutting-down-active {
+                            description "removed";
+                        }
+                        enum shutting-down-passive {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef lifecycle-state {
+                    type enumeration {
+                        enum planned {
+                            description "removed";
+                        }
+                        enum potential {
+                            description "removed";
+                        }
+                        enum installed {
+                            description "removed";
+                        }
+                        enum pending-removal {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+
+
+
+    /***********************
+    * package core-operations-model
+    **********************/ 
+        /***********************
+        * package pattern
+        **********************/ 
+            /***********************
+            * package data-types
+            **********************/ 
+                typedef action-verbs {
+                    type enumeration {
+                        enum create-post-add {
+                            description "none";
+                        }
+                        enum set-update-put-modify-write-add {
+                            description "none";
+                        }
+                        enum get-read {
+                            description "none";
+                        }
+                        enum delete-remove {
+                            description "none";
+                        }
+                    }
+                    description "none";
+                }
+                typedef test-type {
+                    type string;
+                    description "none";
+                }
+                typedef activity-directive {
+                    type enumeration {
+                        enum structure-is-not {
+                            description "none";
+                        }
+                        enum new-structure-and-values {
+                            description "none";
+                        }
+                        enum incremental-structure-and-values {
+                            description "none";
+                        }
+                        enum only-values-in-existing-structure {
+                            description "none";
+                        }
+                        enum defined-by-verb {
+                            description "none";
+                        }
+                    }
+                    description "none";
+                }
+
+            /***********************
+            * package diagrams
+            **********************/ 
+                typedef action-effort {
+                    type enumeration {
+                        enum best-effort {
+                            description "none";
+                        }
+                        enum exact-match {
+                            description "none";
+                        }
+                    }
+                    description "none";
+                }
+                typedef pause-resume-rule {
+                    type enumeration {
+                        enum no-pause-possible {
+                            description "none";
+                        }
+                    }
+                    description "none";
+                }
+
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping general-directives-g {
+                    description "none";
+                }
+                grouping necessary-initial-condition-constraints-g {
+                    leaf is-not {
+                        type boolean;
+                        description "none";
+                    }
+                    description "none";
+                }
+                grouping operation-details-g {
+                    leaf action-verb {
+                        type action-verbs;
+                        description "none";
+                    }
+                    list necessary-initialcondition-constraints {
+                        key 'is-not';
+                        uses necessary-initial-condition-constraints-g;
+                        description "none";
+                    }
+                    description "none";
+                }
+                container operation-envelope {
+                    presence  "";
+                    list operation-set {
+                        key 'effort-and-action';
+                        min-elements 1;
+                        uses operation-set-g;
+                        description "none";
+                    }
+                    container generaldirectives {
+                        uses general-directives-g;
+                        description "none";
+                    }
+                    container operationidentifiers {
+                        uses operation-identifiers-g;
+                        description "none";
+                    }
+                    description "none";
+                }
+                grouping operation-identifiers-g {
+                    description "none";
+                }
+                grouping operation-set-g {
+                    leaf-list after-operation-set {
+                        type action-effort;
+                        description "none";
+                    }
+                    leaf-list before-operation-set {
+                        type action-effort;
+                        description "none";
+                    }
+                    leaf effort-and-action {
+                        type action-effort;
+                        description "none";
+                    }
+                    leaf pause-resume-rule {
+                        type pause-resume-rule;
+                        description "none";
+                    }
+                    leaf-list operationset {
+                        type action-effort;
+                        description "none";
+                    }
+                    leaf is-short-lived {
+                        type boolean;
+                        default true;
+                        description "none";
+                    }
+                    list operation-details {
+                        key 'action-verb';
+                        min-elements 1;
+                        uses operation-details-g;
+                        description "none";
+                    }
+                    description "none";
+                }
+
+
+
+    /***********************
+    * package core-physical-model-initial
+    **********************/ 
+        /***********************
+        * package rule-models
+        **********************/ 
+            /***********************
+            * package connector-rules
+            **********************/ 
+                /***********************
+                * package object-classes
+                **********************/ 
+                    grouping connector-in-holder-g {
+                        leaf connector-on-equipment-for-holder {
+                            type universal-id;
+                            description "none";
+                        }
+                        uses connector-g;
+                        description "removed";
+                    }
+                    grouping connector-cable-end-g {
+                        leaf connector-on-equipment-for-cable {
+                            type universal-id;
+                            description "none";
+                        }
+                        uses connector-g;
+                        description "removed";
+                    }
+                    grouping connector-on-equipment-for-cable-g {
+                        leaf connector-cable-end {
+                            type universal-id;
+                            description "none";
+                        }
+                        uses connector-g;
+                        description "removed";
+                    }
+                    grouping connector-on-equipment-for-holder-g {
+                        leaf connector-in-holder {
+                            type universal-id;
+                            description "none";
+                        }
+                        uses connector-g;
+                        description "removed";
+                    }
+
+
+
+        /***********************
+        * package equipment-detail
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                /***********************
+                * package dynamic-details
+                **********************/ 
+                    grouping function-enablers-g {
+                        leaf power-state {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping mechanical-functions-g {
+                        leaf rotation-speed {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping physical-properties-g {
+                        leaf temperature {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping holder-monitors-g {
+                        leaf is-active {
+                            type boolean;
+                            description "none";
+                        }
+                        leaf is-actual-mismatch-with-expected {
+                            type boolean;
+                            description "none";
+                        }
+                        leaf aggregate-function {
+                            type string;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping location-g {
+                        container equipment-location {
+                            uses address-g;
+                            description "none";
+                        }
+                        container geographical-location {
+                            uses address-g;
+                            description "none";
+                        }
+                        description "none";
+                    }
+
+                /***********************
+                * package invariant-details
+                **********************/ 
+                    grouping category-g {
+                        leaf category {
+                            type equipment-category;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping equipment-instance-g {
+                        leaf manufacture-date {
+                            type string;
+                            description "none";
+                        }
+                        leaf serial-number {
+                            type string;
+                            description "none";
+                        }
+                        leaf asset-instance-identifier {
+                            type string;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping equipment-type-g {
+                        leaf description {
+                            type string;
+                            description "none";
+                        }
+                        leaf model-identifier {
+                            type string;
+                            description "none";
+                        }
+                        leaf part-type-identifier {
+                            type string;
+                            description "none";
+                        }
+                        leaf type-name {
+                            type string;
+                            description "none";
+                        }
+                        leaf version {
+                            type string;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping holder-structure-g {
+                        leaf holder-category {
+                            type holder-category;
+                            description "none";
+                        }
+                        leaf is-captive {
+                            type boolean;
+                            description "none";
+                        }
+                        leaf is-guided {
+                            type boolean;
+                            description "none";
+                        }
+                        leaf is-quantized-space {
+                            type boolean;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping manufactured-thing-g {
+                        container manufacturer-properties {
+                            uses manufacturer-properties-g;
+                            description "none";
+                        }
+                        container equipment-type {
+                            uses equipment-type-g;
+                            description "none";
+                        }
+                        container equipment-instance {
+                            uses equipment-instance-g;
+                            description "none";
+                        }
+                        container operator-augmented-equipment-type {
+                            uses operator-augmented-equipment-type-g;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping manufacturer-properties-g {
+                        leaf manufacturer-identifier {
+                            type string;
+                            description "none";
+                        }
+                        leaf manufacturer-name {
+                            type string;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping mechanical-features-g {
+                        description "removed";
+                    }
+                    grouping operator-augmented-equipment-type-g {
+                        leaf asset-type-identifier {
+                            type string;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping physical-characteristics-g {
+                        leaf weight-characteristics {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        leaf fire-characteristics {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        leaf materials {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping physical-rating-g {
+                        leaf thermal-rating {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        leaf power-rating {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping position-g {
+                        leaf relative-position {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping spatial-properties-of-type-g {
+                        leaf height {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        leaf width {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        leaf length {
+                            type to-be-defined;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+                    grouping swapability-g {
+                        leaf is-hot-swappable {
+                            type boolean;
+                            default true;
+                            description "none";
+                        }
+                        description "removed";
+                    }
+
+
+
+        /***********************
+        * package equipment-pattern-structure
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping cable-g {
+                    list connector {
+                        key 'uuid';
+                        min-elements 1;
+                        uses connector-g;
+                        description "none";
+                    }
+                    container manufactured-thing {
+                        uses manufactured-thing-g;
+                        description "none";
+                    }
+                    container physical-characteristics {
+                        uses physical-characteristics-g;
+                        description "none";
+                    }
+                    container mechanical-features {
+                        uses mechanical-features-g;
+                        description "none";
+                    }
+                    container spatial-properties-of-type {
+                        uses spatial-properties-of-type-g;
+                        description "none";
+                    }
+                    uses global-class-g;
+                    description "removed";
+                }
+                grouping connector-g {
+                    leaf connector {
+                        type string;
+                        description "none";
+                    }
+                    list pin {
+                        key 'position';
+                        min-elements 1;
+                        uses pin-g;
+                        description "none";
+                    }
+                    leaf orientation {
+                        type connector-and-pin-orientation;
+                        description "none";
+                    }
+                    container manufactured-thing {
+                        uses manufactured-thing-g;
+                        description "none";
+                    }
+                    container position {
+                        uses position-g;
+                        description "none";
+                    }
+                    container mechanical-features {
+                        uses mechanical-features-g;
+                        description "none";
+                    }
+                    container pin-layout {
+                        uses pin-layout-g;
+                        description "none";
+                    }
+                    leaf connector-type {
+                        type to-be-defined;
+                        description "none";
+                    }
+                    uses local-class-g;
+                    uses group-of-pins-g;
+                    description "removed";
+                }
+                grouping equipment-g {
+                    list connector {
+                        key 'uuid';
+                        uses connector-g;
+                        description "none";
+                    }
+                    list contained-holder {
+                        key 'uuid';
+                        uses holder-g;
+                        description "none";
+                    }
+                    list exposed-cable {
+                        key 'uuid';
+                        uses cable-g;
+                        description "none";
+                    }
+                    container manufactured-thing {
+                        uses manufactured-thing-g;
+                        description "none";
+                    }
+                    container spatial-properties-of-type {
+                        uses spatial-properties-of-type-g;
+                        description "none";
+                    }
+                    container mechanical-features {
+                        uses mechanical-features-g;
+                        description "none";
+                    }
+                    container physical-properties {
+                        uses physical-properties-g;
+                        description "none";
+                    }
+                    container function-enablers {
+                        uses function-enablers-g;
+                        description "none";
+                    }
+                    container mechanical-functions {
+                        uses mechanical-functions-g;
+                        description "none";
+                    }
+                    container physical-characteristics {
+                        uses physical-characteristics-g;
+                        description "none";
+                    }
+                    container swapability {
+                        uses swapability-g;
+                        description "none";
+                    }
+                    container category {
+                        uses category-g;
+                        description "none";
+                    }
+                    container physical-rating {
+                        uses physical-rating-g;
+                        description "none";
+                    }
+                    leaf is-field-replaceable {
+                        type boolean;
+                        default true;
+                        config false;
+                        description "removed";
+                    }
+                    leaf-list function-block {
+                        type string;
+                        description "none";
+                    }
+                    container expected-equipment {
+                        uses expected-equipment-g;
+                        description "none";
+                    }
+                    container actual-equipment {
+                        uses actual-equipment-g;
+                        description "none";
+                    }
+                    container location {
+                        uses location-g;
+                        description "none";
+                    }
+                    uses global-class-g;
+                    description "removed";
+                }
+                list equipment {
+                    key 'uuid';
+                    uses equipment-g;
+                                description "none";
+}
+                grouping holder-g {
+                    leaf-list connector {
+                        type leafref {
+                            path '/equipment/exposed-cable/connector/uuid';
+                        }
+                        description "none";
+                    }
+                    leaf occupying-fru {
+                        type leafref {
+                            path '/equipment/uuid';
+                        }
+                        description "removed";
+                    }
+                    container spatial-properties-of-type {
+                        uses spatial-properties-of-type-g;
+                        description "none";
+                    }
+                    container holder-monitors {
+                        uses holder-monitors-g;
+                        description "none";
+                    }
+                    container holder-location {
+                        uses address-g;
+                        description "none";
+                    }
+                    container position {
+                        uses position-g;
+                        description "none";
+                    }
+                    container holder-structure {
+                        uses holder-structure-g;
+                        description "none";
+                    }
+                    container physical-rating {
+                        uses physical-rating-g;
+                        description "none";
+                    }
+                    leaf-list supported-equipment {
+                        type string;
+                        min-elements 1;
+                        description "none";
+                    }
+                    container expected-holder {
+                        uses expected-holder-g;
+                        description "none";
+                    }
+                    container actual-holder {
+                        uses actual-holder-g;
+                        description "none";
+                    }
+                    uses local-class-g;
+                    description "removed";
+                }
+
+            /***********************
+            * package data-types
+            **********************/ 
+                typedef connector-and-pin-orientation {
+                    type enumeration {
+                        enum male {
+                            description "removed";
+                        }
+                        enum female {
+                            description "removed";
+                        }
+                        enum symmetric-neutral {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef equipment-category {
+                    type enumeration {
+                        enum subrack {
+                            description "removed";
+                        }
+                        enum circuit-pack {
+                            description "removed";
+                        }
+                        enum small-formfactor-pluggable {
+                            description "removed";
+                        }
+                        enum stand-alone-unit {
+                            description "removed";
+                        }
+                        enum rack {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+                typedef holder-category {
+                    type enumeration {
+                        enum slot {
+                            description "removed";
+                        }
+                    }
+                    description "removed";
+                }
+
+
+        /***********************
+        * package expected-and-actual
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping actual-holder-g {
+                    description "removed";
+                }
+                grouping expected-holder-g {
+                    description "removed";
+                }
+                grouping actual-equipment-g {
+                    description "removed";
+                }
+                grouping expected-equipment-g {
+                    description "removed";
+                }
+
+
+        /***********************
+        * package connector-and-pin
+        **********************/ 
+            /***********************
+            * package object-classes
+            **********************/ 
+                grouping pin-g {
+                    leaf position {
+                        type leafref {
+                            path '/equipment/exposed-cable/connector/position/relative-position';
+                        }
+                        description "none";
+                    }
+                    leaf orientation {
+                        type connector-and-pin-orientation;
+                        description "none";
+                    }
+                    description "removed";
+                }
+                grouping pin-group-g {
+                    leaf-list pin {
+                        type leafref {
+                            path '/equipment/exposed-cable/connector/pin/position';
+                        }
+                        min-elements 1;
+                        description "none";
+                    }
+                    uses port-g;
+                    uses group-of-pins-g;
+                    description "removed";
+                }
+                grouping pin-layout-g {
+                    list position {
+                        key 'relative-position';
+                        min-elements 1;
+                        uses position-g;
+                        description "none";
+                    }
+                    description "removed";
+                }
+                grouping port-g {
+                    description "removed";
+                }
+                grouping signal-ref-pt-g {
+                    leaf ltp {
+                        type leafref {
+                            path '/network-element/ltp/uuid';
+                        }
+                        description "none";
+                    }
+                    leaf-list elemental-signals {
+                        type universal-id;
+                        min-elements 1;
+                        description "none";
+                    }
+                    description "removed";
+                }
+                grouping signal-ref-pt-group-g {
+                    leaf pin-group {
+                        type universal-id;
+                        description "none";
+                    }
+                    leaf-list signal-ref-pt {
+                        type universal-id;
+                        min-elements 1;
+                        description "none";
+                    }
+                    uses port-g;
+                    description "removed";
+                }
+                grouping elemental-signals-g {
+                    leaf-list pin {
+                        type leafref {
+                            path '/equipment/exposed-cable/connector/pin/position';
+                        }
+                        min-elements 1;
+                        description "none";
+                    }
+                    description "removed";
+                }
+                grouping group-of-pins-g {
+                    description "removed";
+                }
+
+
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/g.874.1-model@2017-03-20.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/g.874.1-model@2017-03-20.yang
new file mode 100644
index 000000000..4a14783a2
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/g.874.1-model@2017-03-20.yang
@@ -0,0 +1,646 @@
+module g.874.1-model {
+    namespace "urn:onf:params:xml:ns:yang:g.874.1-model";
+    prefix g.874.1-model;
+
+    import core-model {
+        prefix core-model;
+    }
+    import ietf-yang-types {
+        prefix yang;
+    }
+
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             WG Chair: Giorgio Cazzaniga
+                       <mailto:giorgio.cazzaniga@sm-optics.com>
+             Editors:  Thorsten Heinze
+                       <mailto:thorsten.heinze@telefonica.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "<p>Version 2.02; outcome of the 10/2013 Nuremberg meeting.<br>Version 2.03; updates for Geneva 03-2014<br>Version 2.04; updates for Shanghai 09-2014<br>Version 2.05; input to Geneva 11-2014<br>Version 2.06; output from Geneva 11-2014<br>Version 2.07; using OpenProfile 3-2015<br>Version 2.08; output from Geneva 06-2015</p>";
+    revision 2017-03-20 {
+        description "Initial version";
+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";
+    }
+    /***********************
+    * package object-classes
+    **********************/ 
+        grouping otn-current-data-g {
+            leaf timestamp {
+                type date-and-time;
+                description "The timestamp associated with when the current data was collected.";
+            }
+            uses q.822-current-data-g;
+            description "This object class is an abstract class from which the OTN layer-specific CurrentData object classes are inherited. This object class is a subclass of the Q.822 CurrentData object class, which in turn is a subclass of X.739 Scanner object class. It inherits the following attributes: scannerId, operationalState, granularityPeriod, administrativeState, suspectIntervalFlag, elapsedTime, observedObjectClass, and observedObjectInstance.";
+        }
+        grouping otn-history-data-g {
+            leaf suspect-interval-flag {
+                type boolean;
+                default false;
+                description "This attribute indicates that the data collected during the interval is suspect.";
+            }
+            uses q.822-history-data-g;
+            description "This object class is an abstract class from which the OTN layer-specific HistoryData object classes are inherited. ";
+        }
+
+    /***********************
+    * package type-definitions
+    **********************/ 
+        typedef directionality {
+            type enumeration {
+                enum sink {
+                    description "none";
+                }
+                enum source {
+                    description "none";
+                }
+                enum bidirectional {
+                    description "none";
+                }
+            }
+            description "The enumeration with the options for directionality of the termination point.";
+        }
+        typedef gcc-access {
+            type enumeration {
+                enum gcc1 {
+                    description "none";
+                }
+                enum gcc2 {
+                    description "none";
+                }
+                enum gcc1-and-gcc2 {
+                    description "none";
+                }
+            }
+            description "This enumeration indicates the GCC access represented by the entity.";
+        }
+        typedef operational-state {
+            type enumeration {
+                enum enabled {
+                    description "none";
+                }
+                enum disabled {
+                    description "none";
+                }
+            }
+            description "The list of valid operational states for the connection.";
+        }
+        typedef oper-type {
+            type enumeration {
+                enum revertive {
+                    description "none";
+                }
+                enum non-revertive {
+                    description "none";
+                }
+            }
+            description "The operation type associated with the protection mechanism (either non-revertive or revertive).";
+        }
+        typedef ext-cmd-operation {
+            type enumeration {
+                enum exercise {
+                    description "none";
+                }
+                enum manual-switch {
+                    description "none";
+                }
+                enum forced-switch {
+                    description "none";
+                }
+                enum lockout {
+                    description "none";
+                }
+                enum release-of-manual-switch {
+                    description "none";
+                }
+                enum release-of-forced-switch {
+                    description "none";
+                }
+                enum release-of-lockout {
+                    description "none";
+                }
+            }
+            description "This enumeration contains the options for the actions that instruct the protection system for performing specific protection switching operations.";
+        }
+        typedef administrative-state {
+            type enumeration {
+                enum unlocked {
+                    description "none";
+                }
+                enum locked {
+                    description "none";
+                }
+                enum shutting-down {
+                    description "none";
+                }
+            }
+            description "For more information on Administrative State, See ITU-T Recs. X.731 and M.3100.";
+        }
+        typedef oc-tk-nim-k-bit-rate {
+            type enumeration {
+                enum 2.5-g {
+                    description "none";
+                }
+                enum 10-g {
+                    description "none";
+                }
+                enum 40-g {
+                    description "none";
+                }
+                enum 100-g {
+                    description "none";
+                }
+            }
+            description "Provides an enumeration with the meaning of each 'k' value.";
+        }
+        typedef tim-det-mo {
+            type enumeration {
+                enum dapi {
+                    description "none";
+                }
+                enum sapi {
+                    description "none";
+                }
+                enum both {
+                    description "none";
+                }
+            }
+            description "List of modes for trace identifier mismatch detection.";
+        }
+        typedef oc-tk-nim-problem-list {
+            type enumeration {
+                enum los-p {
+                    description "Loss of Signal -- Payload";
+                }
+                enum oci {
+                    description "Open Connection Indicator";
+                }
+                enum ssf-p {
+                    description "Server Signal Failure -- Payload -- can not co-exist with SSF or SSF-O";
+                }
+                enum ssf-o {
+                    description "Server Signal Failure -- Overhead; can not co-exist with SSF or SSF-P";
+                }
+                enum ssf {
+                    description "Server Signal Failure; can not co-exist with SSF-P or SSF-O";
+                }
+                enum tim {
+                    description "Trail Trace Identifier Mismatch";
+                }
+                enum deg {
+                    description "Signal Degraded";
+                }
+                enum bdi {
+                    description "Backward Defect Indication";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef tcm-monitoring {
+            type enumeration {
+                enum intrusive {
+                    description "none";
+                }
+                enum non-intrusive {
+                    description "none";
+                }
+            }
+            description "Monitoring types for the tandem connection monitoring function.";
+        }
+        typedef tcm-mode {
+            type enumeration {
+                enum operational {
+                    description "none";
+                }
+                enum transparent {
+                    description "none";
+                }
+                enum monitor {
+                    description "none";
+                }
+            }
+            description "List of value modes for the sink side of the tandem connection monitoring function.";
+        }
+        typedef ops-mnk-ttp-k-bit-rate {
+            type enumeration {
+                enum 40-g {
+                    description "none";
+                }
+                enum 100-g {
+                    description "none";
+                }
+            }
+            description "Provides an enumeration with the meaning of each 'k' value.";
+        }
+        typedef ops-mnk-ttp-problem-list {
+            type enumeration {
+                enum los {
+                    description "Loss of Signal";
+                }
+                enum lol {
+                    description "Loss of Lane Alignment";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef op-sn-ttp-problem-list {
+            type enumeration {
+                enum los {
+                    description "Loss of Signal";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef otm-n-k-bit-rates {
+            type enumeration {
+                enum 2.5-g {
+                    description "none";
+                }
+                enum 10-g {
+                    description "none";
+                }
+                enum 40-g {
+                    description "none";
+                }
+                enum 2.5-10-g {
+                    description "none";
+                }
+                enum 10-40-g {
+                    description "none";
+                }
+                enum 2.5-10-40-g {
+                    description "none";
+                }
+            }
+            description "Provides an enumeration with the meaning of each 'k' value.";
+        }
+        typedef domain-interface {
+            type enumeration {
+                enum intra-domain {
+                    description "none";
+                }
+                enum inter-domain {
+                    description "none";
+                }
+            }
+            description "This enumeration provides the options for the interface associated with OTMn.";
+        }
+        typedef otm-n-optical-reach {
+            type enumeration {
+                enum intra-office {
+                    description "none";
+                }
+                enum shorthaul {
+                    description "none";
+                }
+                enum longhaul {
+                    description "none";
+                }
+            }
+            description "The valid options for reach of the optical cable.";
+        }
+        typedef apr-status {
+            type enumeration {
+                enum on {
+                    description "none";
+                }
+                enum off {
+                    description "none";
+                }
+            }
+            description "The enumeration of the options for the Automatic Power Reduction Status.";
+        }
+        typedef ot-sn-ttp-problem-list {
+            type enumeration {
+                enum bdi-p {
+                    description "BDI-P (Backward Defect Indication - Payload); not co-exist with BDI-O or BDI";
+                }
+                enum bdi-o {
+                    description "BDI-O (Backward Defect Indication - Overhead); not co-exist with BDI-P or BDI";
+                }
+                enum bdi {
+                    description "BDI (Backward Defect Indication); not co-exist with BDI-P or BDI-O";
+                }
+                enum tim {
+                    description "TIM (Trail Trace Identifier Mismatch);";
+                }
+                enum los-p {
+                    description "-P (Loss of Signal - Payload); not co-exist with LOS-O or LOS";
+                }
+                enum los-o {
+                    description "LOS-O (Loss of Signal - Overhead); not co-exist with LOS-P or LOS";
+                }
+                enum los {
+                    description "LOS (Loss of Signal); not co-exist with LOS-P or LOS-O. ";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef ot-uk-ctp-adaptation {
+            type enumeration {
+                enum regular {
+                    description "i.e. OPSM/OTUk-a, OCh[r]/OTUk-a";
+                }
+                enum none {
+                    description "i.e. OPSM/OTUk-b, OCh[r]/OTUk-b";
+                }
+                enum vendor-specific {
+                    description "i.e. OCh[r]/OTUk-v";
+                }
+                enum functionally-standardized {
+                    description "i.e. OCh[r]/OTUkV";
+                }
+            }
+            description "The adaptation options for OTUk_ConnectionTermationPoints.";
+        }
+        typedef ot-uk-ctp-k-bit-rate {
+            type enumeration {
+                enum 2.5-g {
+                    description "none";
+                }
+                enum 10-g {
+                    description "none";
+                }
+                enum 40-g {
+                    description "none";
+                }
+                enum 100-g {
+                    description "none";
+                }
+            }
+            description "Provides an enumeration with the meaning of each 'k' value.";
+        }
+        typedef ot-uk-ctp-problem-list {
+            type enumeration {
+                enum lof {
+                    description "Loss of Frame";
+                }
+                enum ais {
+                    description "Alarm Indication Signal";
+                }
+                enum lom {
+                    description "Loss of MultiFrame";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef ot-uk-ttp-problem-list {
+            type enumeration {
+                enum tim {
+                    description "Trail Trace Identifier Mismatch";
+                }
+                enum deg {
+                    description "Signal Degraded";
+                }
+                enum bdi {
+                    description "Backward Defect Indication";
+                }
+                enum ssf {
+                    description "Server Signal Failure";
+                }
+            }
+            description "The valid list of problems for the entity.";
+        }
+        typedef monitored-direction {
+            type enumeration {
+                enum sink {
+                    description "none";
+                }
+                enum source {
+                    description "none";
+                }
+            }
+            description "The enumeration with the options for directionality for nonintrusive monitoring.";
+        }
+        typedef deg-thr-type {
+            type enumeration {
+                enum percentage {
+                    description "<p>Choice of % or Number of errored blocks</p>";
+                }
+                enum number-errored-blocks {
+                    description "<p>Number of % or blocks</p>";
+                }
+            }
+            description "<p>The value of the threshold can be provisioned in terms of number of errored blocks or in terms of percentage of errored blocks. For percentage-based specification, in order to support provision of less than 1%, the specification consists of two fields. The first field indicates the granularity of percentage. For examples, in 1%, in 0.1%, or in 0.01%, etc. The second field indicates the multiple of the granularity. For number of errored block based, the value is a positive integer.</p>";
+        }
+        typedef link-type {
+            type enumeration {
+                enum dwdm {
+                    description "none";
+                }
+                enum cwdm {
+                    description "none";
+                }
+                enum no-wdm {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef application-identifier-type {
+            type enumeration {
+                enum standard {
+                    description "none";
+                }
+                enum proprietary {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef printable-string {
+            type string;
+            description "none";
+        }
+        typedef date-and-time {
+            type string;
+            description "This primitive type defines the date and time according to the following structure:
+                'yyyyMMddhhmmss.s[Z|{+|-}HHMm]' where:
+                yyyy    '0000'..'9999'    year
+                MM        '01'..'12'            month
+                dd        '01'..'31'            day
+                hh        '00'..'23'            hour
+                mm        '00'..'59'            minute
+                ss        '00'..'59'            second
+                s        '.0'..'.9'            tenth of second (set to '.0' if EMS or NE cannot support this granularity)
+                Z        'Z'                    indicates UTC (rather than local time)
+                {+|-}    '+' or '-'            delta from UTC
+                HH        '00'..'23'            time zone difference in hours
+                Mm        '00'..'59'            time zone difference in minutes.";
+        }
+        typedef aps-channel {
+            type enumeration {
+                enum path {
+                    description "none";
+                }
+                enum tcm1 {
+                    description "none";
+                }
+                enum tcm2 {
+                    description "none";
+                }
+                enum tcm3 {
+                    description "none";
+                }
+                enum tcm4 {
+                    description "none";
+                }
+                enum tcm5 {
+                    description "none";
+                }
+                enum tcm6 {
+                    description "none";
+                }
+                enum section {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef bit-string {
+            type string;
+            description "This primitive type defines a bit oriented string.
+                The size of the BitString will be defined in the valueRange property of the attribute; according to ASN.1 (X.680).
+                The semantic of each bit position will be defined in the Documentation field of the attribute.";
+        }
+        typedef delay-measurement-role {
+            type enumeration {
+                enum controller {
+                    description "none";
+                }
+                enum responder {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef resize-operation-type {
+            type enumeration {
+                enum increase-bw {
+                    description "Increase Bandwidth";
+                }
+                enum decrease-bw {
+                    description "Decrease Bandwidth";
+                }
+            }
+            description "none";
+        }
+        typedef granularity-period-type {
+            type enumeration {
+                enum unknown {
+                    description "none";
+                }
+                enum period-15-min {
+                    description "none";
+                }
+                enum period-24-hours {
+                    description "none";
+                }
+            }
+            description "The enumeration with the options for granularity period of the performance data.";
+        }
+
+    /***********************
+    * package illustrative-object-diagrams
+    **********************/ 
+
+    /***********************
+    * package imported-information-object-classes
+    **********************/ 
+        /***********************
+        * package q.822
+        **********************/ 
+            grouping q.822-current-data-g {
+                leaf suspect-interval-flag {
+                    type boolean;
+                    description "This attribute is used to indicate that the performance data for the current period may not be reliable. Some reasons for this to occur are:- Suspect data were detected by the actual resource doing data collection.- Transition of the administrativeState attribute to/from the 'lock' state.- Transition of the operationalState to/from the 'disabled' state.- Scheduler setting that inhibits the collection function.- The performance counters were reset during the interval.- The currentData (or subclass) object instance was created during the monitoring period.";
+                }
+                leaf elapsed-time {
+                    type int64;
+                    description "none";
+                }
+                uses x.739-scanner-g;
+                description "none";
+            }
+            grouping q.822-history-data-g {
+                leaf history-data-id {
+                    type string;
+                    description "none";
+                }
+                leaf period-end-time {
+                    type yang:date-and-time;
+                    description "none";
+                }
+                leaf granularity-period {
+                    type granularity-period-type;
+                    description "none";
+                }
+                uses x.721-top-g;
+                description "none";
+            }
+
+        /***********************
+        * package x.739
+        **********************/ 
+            grouping x.739-scanner-g {
+                leaf scanner-id {
+                    type string;
+                    description "none";
+                }
+                leaf granularity-period {
+                    type granularity-period-type;
+                    description "none";
+                }
+                leaf administrative-state {
+                    type core-model:administrative-state;
+                    description "none";
+                }
+                uses x.721-top-g;
+                description "none";
+            }
+
+        /***********************
+        * package x.721
+        **********************/ 
+            grouping x.721-top-g {
+                leaf object-class {
+                    type object-identifier;
+                    description "ObjectClass ::= CHOICE{    globalForm    [0] OBJECT IDENTIFIER,
+                        localForm    [1] INTEGER}";
+                }
+                leaf name-binding {
+                    type object-identifier;
+                    description "none";
+                }
+                description "This is the top level of managed object class hierarchy and every other managed object class is a specialization of either this generic class (top) or a specialization of subclass of top. The parameter miscellaneousError is to be used when a processing failure has occurred and the error condition encountered does not match any of object's defined specific error types.";
+            }
+
+
+    /***********************
+    * package imported-data-types
+    **********************/ 
+        typedef object-instance {
+            type string;
+            description "none";
+        }
+        typedef name {
+            type string;
+            description "none";
+        }
+        typedef object-identifier {
+            type string;
+            description "none";
+        }
+        typedef generalized-time {
+            type string;
+            description "none";
+        }
+        typedef time-period {
+            type string;
+            description "This primitive Type is imported from X.739.";
+        }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/ietf-ptp-dataset@2017-02-08.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/ietf-ptp-dataset@2017-02-08.yang
new file mode 100644
index 000000000..d899e5692
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/ietf-ptp-dataset@2017-02-08.yang
@@ -0,0 +1,605 @@
+   module ietf-ptp-dataset{
+     namespace "urn:ietf:params:xml:ns:yang:ietf-ptp-dataset";
+     prefix "ptp-dataset";
+     organization "IETF TICTOC Working Group";
+     contact
+         "WG Web:   http://tools.ietf.org/wg/tictoc/
+          WG List:  <mailto:tictoc@ietf.org>
+          WG Chair: Karen O'Donoghue
+                    <mailto:odonoghue@isoc.org>
+          WG Chair: Yaakov Stein
+                    <mailto: Yaakov_s@rad.com>
+          Editor:   Yuanlong Jiang
+                    <mailto:jiangyuanlong@huawei.com>
+          Editor:   Rodney Cummings
+                    <mailto:rodney.cummings@ni.com>";
+     description
+       "This YANG module defines a data model for the configuration
+       of IEEE 1588-2008 clocks, and also for retrieval of the state
+       data of IEEE 1588-2008 clocks.";
+
+     revision "2017-02-08" {
+       description "Version 4.0";
+       reference "draft-ietf-tictoc-1588v2-yang";
+      }
+
+     typedef delay-mechanism-enumeration {
+       type enumeration {
+         enum E2E {
+           value 1;
+           description
+             "The port uses the delay request-response
+              mechanism.";
+         }
+         enum P2P {
+           value 2;
+           description
+             "The port uses the peer delay mechanism.";
+         }
+         enum DISABLED {
+           value 254;
+           description
+             "The port does not implement any delay
+              mechanism.";
+         }
+       }
+       description
+         "The propagation delay measuring option used by the
+         port. Values for this enumeration are specified
+         by the IEEE 1588 standard exclusively.";
+       reference
+         "IEEE Std 1588-2008: 8.2.5.4.4";
+     }
+
+     typedef port-state-enumeration {
+       type enumeration {
+         enum INITIALIZING {
+           value 1;
+           description
+             "The port is initializing its data sets, hardware, and
+             communication facilities.";
+         }
+         enum FAULTY {
+           value 2;
+           description
+             "The port is in the fault state.";
+         }
+         enum DISABLED {
+           value 3;
+           description
+             "The port is disabled, and is not communicating PTP
+             messages (other than possibly PTP management
+             messages).";
+         }
+         enum LISTENING {
+           value 4;
+           description
+             "The port is listening for an Announce message.";
+         }
+         enum PRE_MASTER {
+           value 5;
+           description
+             "The port is in the pre-master state.";
+         }
+         enum MASTER {
+           value 6;
+           description
+             "The port is behaving as a master port.";
+         }
+         enum PASSIVE {
+           value 7;
+           description
+             "The port is in the passive state.";
+         }
+         enum UNCALIBRATED {
+           value 8;
+           description
+             "A master port has been selected, but the port is still
+             in the uncalibrated state.";
+         }
+         enum SLAVE {
+           value 9;
+           description
+             "The port is synchronizing to the selected
+             master port.";
+         }
+       }
+       description
+         "The current state of the protocol engine associated
+         with the port.  Values for this enumeration are specified
+         by the IEEE 1588 standard exclusively.";
+       reference
+         "IEEE Std 1588-2008: 8.2.5.3.1, 9.2.5";
+     }
+
+     typedef time-interval-type {
+       type int64;
+       description
+         "Derived data type for time interval,
+         represented in units of nanoseconds and
+         multipled by 2^16";
+       reference
+         "IEEE Std 1588-2008: 5.3.2";
+     }
+
+     typedef clock-identity-type {
+       type binary {
+         length "8";
+       }
+       description
+         "Derived data type to identify a clock";
+       reference
+         "IEEE Std 1588-2008: 5.3.4";
+     }
+
+     grouping port-identity-grouping {
+       description
+         "Derived data type to identify a port, which contains
+         two members: clockIdentity and portNumber.";
+       reference
+         "IEEE Std 1588-2008: 5.3.5";
+
+       leaf clock-identity {
+         type clock-identity-type;
+         description
+           "Identity of the clock";
+       }
+
+       leaf port-number {
+         type uint16;
+         description
+           "Port number";
+       }
+     }
+
+     grouping clock-quality-grouping {
+       description
+         "Derived data type for quality of a clock, which contains
+         clockClass, clockAccuracy and offsetScaledLogVariance.";
+       reference
+         "IEEE Std 1588-2008: 5.3.7";
+
+       leaf clock-class {
+         type uint8;
+         default 248;
+         description
+           "The clockClass denotes the traceability of the time
+           or frequency distributed by the clock.";
+       }
+
+       leaf clock-accuracy {
+         type uint8;
+         description
+           "The clockAccuracy indicates the expected accuracy
+            of the clock.";
+       }
+
+       leaf offset-scaled-log-variance {
+         type uint16;
+         description
+           "The offsetScaledLogVariance provides an
+           estimate of the variations of the clock
+           from a linear timescale when it is not synchronized
+           to another clock using the protocol.";
+       }
+     }
+
+     grouping default-ds-entry {
+       description
+         "Collection of members of the default data set.";
+
+       leaf two-step-flag {
+         type boolean;
+         description
+               "When set, the clock is a two-step clock; otherwise,
+               the clock is a one-step clock.";
+       }
+
+       leaf clock-identity {
+         type clock-identity-type;
+         description
+           "The clockIdentity of the local clock";
+       }
+
+       leaf number-ports {
+         type uint16;
+         description
+           "The number of PTP ports on the device.";
+       }
+
+       container clock-quality {
+         description
+           "The clockQuality of the local clock.";
+
+         uses clock-quality-grouping;
+       }
+
+       leaf priority1 {
+         type uint8;
+         description
+           "The priority1 attribute of the local clock.";
+       }
+
+       leaf priority2{
+         type uint8;
+         description
+           "The priority2 attribute of the local clock. ";
+       }
+
+       leaf domain-number {
+         type uint8;
+         description
+                "The domain number of the current syntonization
+               domain.";
+       }
+
+       leaf slave-only {
+         type boolean;
+         description
+           "When set, the clock is a slave-only clock.";
+       }
+     }
+
+     grouping current-ds-entry {
+       description
+         "Collection of members of current data set.";
+
+       leaf steps-removed {
+         type uint16;
+         default 0;
+         description
+           "The number of communication paths traversed
+           between the local clock and the grandmaster clock.";
+       }
+       leaf offset-from-master {
+         type time-interval-type;
+         description
+           "The current value of the time difference between
+           a master and a slave clock as computed by the slave.";
+       }
+
+       leaf mean-path-delay {
+         type time-interval-type;
+         description
+           "The current value of the mean propagation time between
+           a master and a slave clock as computed by the slave.";
+
+       }
+     }
+
+     grouping parent-ds-entry {
+       description
+         "Collection of members of the parent data set.";
+
+       container parent-port-identity {
+         description
+           "The portIdentity of the port on the master";
+         uses port-identity-grouping;
+       }
+       leaf parent-stats {
+         type boolean;
+         default false;
+         description
+           "When set, the values of
+            observedParentOffsetScaledLogVariance and
+            observedParentClockPhaseChangeRate of parentDS
+            have been measured and are valid.";
+       }
+       leaf observed-parent-offset-scaled-log-variance {
+         type uint16;
+         default 0xFFFF;
+         description
+           "An estimate of the parent clock's PTP variance
+            as observed by the slave clock.";
+       }
+       leaf observed-parent-clock-phase-change-rate {
+         type int32;
+         description
+           "An estimate of the parent clock's phase change rate
+            as observed by the slave clock.";
+       }
+       leaf grandmaster-identity {
+         type binary{
+           length "8";
+         }
+
+         description
+          "The clockIdentity attribute of the grandmaster clock.";
+
+       }
+       container grandmaster-clock-quality {
+         description
+           "The clockQuality of the grandmaster clock.";
+         uses clock-quality-grouping;
+       }
+       leaf grandmaster-priority1 {
+         type uint8;
+         description
+           "The priority1 attribute of the grandmaster clock.";
+       }
+       leaf grandmaster-priority2 {
+         type uint8;
+         description
+           "The priority2 attribute of the grandmaster clock.";
+       }
+     }
+
+     grouping time-properties-ds-entry {
+       description
+         "Collection of members of the timeProperties data set.";
+       leaf current-utc-offset-valid {
+         type boolean;
+         description
+           "When set, the current UTC offset is valid.";
+       }
+       leaf current-utc-offset {
+         type int16;
+         description
+           "The offset between TAI and UTC when the epoch of the
+            PTP system is the PTP epoch, i.e., when ptp-timescale
+            is TRUE; otherwise, the value has no meaning.";
+       }
+       leaf leap59 {
+         type boolean;
+         description
+               "When set, the last minute of the current UTC day
+               contains 59 seconds.";
+       }
+       leaf leap61 {
+         type boolean;
+         description
+               "When set, the last minute of the current UTC day
+               contains 61 seconds.";
+       }
+       leaf time-traceable {
+         type boolean;
+         description
+           "When set, the timescale and the currentUtcOffset are
+               traceable to a primary reference.";
+       }
+       leaf frequency-traceable {
+         type boolean;
+         description
+           "When set, the frequency determining the timescale
+            is traceable to a primary reference.";
+       }
+       leaf ptp-timescale {
+         type boolean;
+         description
+           "When set, the clock timescale of the grandmaster
+                clock is PTP; otherwise, the timescale is ARB
+               (arbitrary).";
+       }
+       leaf time-source {
+         type uint8;
+         description
+           "The source of time used by the grandmaster clock.";
+
+       }
+     }
+
+     grouping port-ds-entry {
+       description
+         "Collection of members of the port data set.";
+
+       container port-identity {
+         description
+           "The portIdentity attribute of the local port.";
+         uses port-identity-grouping;
+       }
+
+       leaf port-state {
+         type port-state-enumeration;
+         default "INITIALIZING";
+         description
+           "Current state associated with the port.";
+       }
+
+       leaf log-min-delay-req-interval {
+         type int8;
+         description
+           "The base-two logarithm of the minDelayReqInterval
+            (the minimum permitted mean time interval between
+            successive Delay_Req messages).";
+       }
+
+       leaf peer-mean-path-delay {
+         type time-interval-type;
+         default 0;
+         description
+           "An estimate of the current one-way propagation delay
+            on the link when the delayMechanism is P2P; otherwise,
+            it is zero.";
+       }
+
+       leaf log-announce-interval {
+         type int8;
+         description
+           "The base-two logarithm of the mean
+            announceInterval (mean time interval between
+            successive Announce messages).";
+       }
+
+       leaf announce-receipt-timeout {
+         type uint8;
+         description
+           "The number of announceInterval that have to pass
+            without receipt of an Announce message before the
+            occurrence of the event ANNOUNCE_RECEIPT_TIMEOUT_
+            EXPIRES.";
+       }
+
+       leaf log-sync-interval {
+         type int8;
+         description
+           "The base-two logarithm of the mean SyncInterval
+            for multicast messages.  The rates for unicast
+            transmissions are negotiated separately on a per port
+            basis and are not constrained by this attribute.";
+       }
+
+       leaf delay-mechanism {
+         type delay-mechanism-enumeration;
+         description
+           "The propagation delay measuring option used by the
+            port in computing meanPathDelay.";
+       }
+
+       leaf log-min-pdelay-req-interval {
+         type int8;
+         description
+           "The base-two logarithm of the
+            minPdelayReqInterval (minimum permitted mean time
+            interval between successive Pdelay_Req messages).";
+
+       }
+
+       leaf version-number {
+         type uint8;
+         description
+           "The PTP version in use on the port.";
+       }
+     }
+
+     grouping transparent-clock-default-ds-entry {
+       description
+         "Collection of members of the transparentClockDefault data
+           set (default data set for a transparent clock).";
+
+       leaf clock-identity {
+         type clock-identity-type;
+         description
+           "The clockIdentity of the transparent clock.";
+       }
+       leaf number-ports {
+         type uint16;
+         description
+           "The number of PTP ports on the device.";
+       }
+       leaf delay-mechanism {
+         type delay-mechanism-enumeration;
+         description
+           "The propagation delay measuring option
+            used by the transparent clock.";
+       }
+       leaf primary-domain {
+         type uint8;
+         default 0;
+         description
+          "The domainNumber of the primary syntonization domain.";
+
+       }
+     }
+
+     grouping transparent-clock-port-ds-entry {
+       description
+         "Collection of members of the transparentClockPort data
+          set (port data set for a transparent clock).";
+
+       container port-identity {
+         description
+           "The portIdentity of the local port.";
+
+         uses port-identity-grouping;
+       }
+       leaf log-min-pdelay-req-interval {
+         type int8;
+         description
+           "The logarithm to the base 2 of the
+            minPdelayReqInterval (minimum permitted mean time
+            interval between successive Pdelay_Req messages).";
+       }
+       leaf faulty-flag {
+         type boolean;
+         default false;
+         description
+           "When set, the port is faulty.";
+       }
+       leaf peer-mean-path-delay {
+         type time-interval-type;
+         default 0;
+         description
+           "An estimate of the current one-way propagation delay
+            on the link when the delayMechanism is P2P; otherwise,
+            it is zero.";
+       }
+     }
+
+     list instance-list {
+
+       key "instance-number";
+
+       description
+         "List of one or more PTP datasets in the device, one for
+         each domain (see IEEE 1588-2008 subclause 6.3).
+         Each PTP dataset represents a distinct instance of
+         PTP implementation in the device (i.e. distinct
+         Ordinary Clock or Boundary Clock).";
+
+       leaf instance-number {
+         type uint16;
+         description
+           "The instance number of the current PTP instance";
+       }
+        container default-ds {
+          description
+            "The default data set of the clock.";
+          uses default-ds-entry;
+        }
+
+        container current-ds {
+          description
+            "The current data set of the clock.";
+          uses current-ds-entry;
+        }
+
+        container parent-ds {
+          description
+            "The parent data set of the clock.";
+          uses parent-ds-entry;
+        }
+
+        container time-properties-ds {
+          description
+            "The timeProperties data set of the clock.";
+          uses time-properties-ds-entry;
+        }
+
+        list port-ds-list {
+          key "port-number";
+          description
+            "List of port data sets of the clock.";
+          leaf port-number{
+            type leafref{
+              path "../port-identity/port-number";
+            }
+            description
+              "Refers to the portNumber memer of
+              portDS.portIdentity.";
+          }
+          uses port-ds-entry;
+        }
+     }
+
+     container transparent-clock-default-ds {
+       description
+         "The members of the transparentClockDefault Data Set";
+       uses transparent-clock-default-ds-entry;
+     }
+
+     list transparent-clock-port-ds-list {
+       key "port-number";
+       description
+         "List of transparentClockPort data sets
+          of the transparent clock.";
+       leaf port-number {
+         type leafref {
+           path "../port-identity/port-number";
+         }
+          description
+            "Refers to the portNumber memer
+             of transparentClockPortDS.portIdentity.";
+        }
+        uses transparent-clock-port-ds-entry;
+      }
+   }
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2017-03-24.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2017-03-24.yang
new file mode 100644
index 000000000..e6b6bb382
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2017-03-24.yang
@@ -0,0 +1,2262 @@
+module microwave-model {
+    namespace "urn:onf:params:xml:ns:yang:microwave-model";
+    prefix microwave-model;
+
+    import core-model {
+        prefix core-model;
+    }
+    import g.874.1-model {
+        prefix g;
+    }
+    import ietf-yang-types {
+        prefix yang;
+    }
+
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             WG Chair: Giorgio Cazzaniga
+                       <mailto:giorgio.cazzaniga@sm-optics.com>
+             Editors:  Thorsten Heinze
+                       <mailto:thorsten.heinze@telefonica.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This module contains a collection of YANG definitions for managing wireless networks.";
+    revision 2017-03-24 {
+        description "Initial version";
+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";
+    }
+    /***********************
+    * package type-definitions
+    **********************/ 
+        typedef loop-back-type {
+            type enumeration {
+                enum none {
+                    description "none";
+                }
+                enum if {
+                    description "Intermediate Frequency on the interface between indoor and outdoor unit.";
+                }
+                enum rf {
+                    description "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site.";
+                }
+            }
+            description "none";
+        }
+        typedef severity-type {
+            type enumeration {
+                enum non-alarmed {
+                    description "none";
+                }
+                enum warning {
+                    description "none";
+                }
+                enum minor {
+                    description "none";
+                }
+                enum major {
+                    description "none";
+                }
+                enum critical {
+                    description "none";
+                }
+            }
+            description "According to ITU-T M.3160";
+        }
+        grouping channel-plan-type-g {
+            leaf supported-channel-plan {
+                type string;
+                default "Channel plan name not defined.";
+                config false;
+                description "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database.";
+            }
+            leaf duplex-distance-is-variable {
+                type boolean;
+                default false;
+                config false;
+                description "To be set on  'true', if the distance between transmitted and received frequency is variable.";
+            }
+            leaf duplex-distance {
+                type int32;
+                units "kHz";
+                default -1;
+                config false;
+                description "Distance between transmitted and received frequency.";
+            }
+            leaf auto-freq-select-is-avail {
+                type boolean;
+                default false;
+                config false;
+                description "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'.";
+            }
+            list transmission-mode-list {
+                key 'transmission-mode-id';
+                config false;
+                min-elements 1;
+                uses transmission-mode-type-g;
+                description "none";
+            }
+            description "none";
+        }
+        grouping transmission-mode-type-g {
+            leaf transmission-mode-id {
+                type core-model:universal-id;
+                config false;
+                description "Indentifies the transmissionMode for internal reference.";
+            }
+            leaf channel-bandwidth {
+                type int32;
+                units "kHz";
+                default -1;
+                config false;
+                description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";
+            }
+            leaf modulation-scheme {
+                type int16;
+                units "symbols";
+                default -1;
+                config false;
+                description "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256').";
+            }
+            leaf code-rate {
+                type int8;
+                units "%";
+                default -1;
+                config false;
+                description "Code rate of the coding scheme in % (Net bit rate ? Gross bit rate ? code rate).";
+            }
+            leaf tx-power-min {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Value of the minimum transmit power the modem can operate in dBm.";
+            }
+            leaf tx-power-max {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Value of the maximum transmit power the modem can operate in dBm.";
+            }
+            leaf rx-threshold {
+                type int16;
+                units "dBm";
+                default 99;
+                config false;
+                description "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less.";
+            }
+            leaf am-upshift-level {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Value of the receive level that has to be exceeded to shift into a higher modulation scheme.";
+            }
+            leaf am-downshift-level {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme.";
+            }
+            leaf xpic-is-avail {
+                type boolean;
+                default false;
+                config false;
+                description "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case.";
+            }
+            description "none";
+        }
+        typedef polarization-type {
+            type enumeration {
+                enum not-specified {
+                    description "none";
+                }
+                enum horizontal {
+                    description "none";
+                }
+                enum vertical {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        grouping air-interface-problem-severity-type-g {
+            leaf problem-kind-name {
+                type string;
+                default "Problem kind name not defined.";
+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";
+            }
+            leaf problem-kind-severity {
+                type severity-type;
+                default warning;
+                description "Severity of this type of alarm.";
+            }
+            description "none";
+        }
+        grouping air-interface-current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "Problem name not specified.";
+                config false;
+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";
+            }
+            uses mw-current-problem-g;
+            description "none";
+        }
+        grouping air-interface-performance-type-g {
+            leaf es {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Number of errored seconds.";
+            }
+            leaf ses {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Number of severely errored seconds.";
+            }
+            leaf cses {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Number of consecutive severely errored seconds.";
+            }
+            leaf unavailability {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Total time of unavailability in seconds.";
+            }
+            leaf tx-level-min {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Minimum transmit power. Signed integers are required.";
+            }
+            leaf tx-level-max {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Maximum transmit power. Signed integers are required.";
+            }
+            leaf tx-level-avg {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Averaged transmit power. Signed integers are required.";
+            }
+            leaf rx-level-min {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Minimum receive level. Signed integers are required.";
+            }
+            leaf rx-level-max {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Maximum receive level. Signed integers are required.";
+            }
+            leaf rx-level-avg {
+                type int8;
+                units "dBm";
+                default 99;
+                config false;
+                description "Averaged receive level. Signed integers are required.";
+            }
+            leaf time2-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Sum of all seconds the transmitter operated in e.g. BPSK.";
+            }
+            leaf time4-states-s {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time4-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time8-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time16-states-s {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time16-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time32-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time64-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time128-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time256-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time512-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time512-states-l {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time1024-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time1024-states-l {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time2048-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time2048-states-l {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time4096-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time4096-states-l {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time8192-states {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf time8192-states-l {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "none";
+            }
+            leaf snir-min {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Minimum signal to (noise+interference) ratio.";
+            }
+            leaf snir-max {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Maximum signal to (noise+interference) ratio.";
+            }
+            leaf snir-avg {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Averaged signal to (noise+interference) ratio.";
+            }
+            leaf xpd-min {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Minimum cross polarization discrimination.";
+            }
+            leaf xpd-max {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Maximum cross polarization discrimination.";
+            }
+            leaf xpd-avg {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Averaged cross polarization discrimination.";
+            }
+            leaf rf-temp-min {
+                type int8;
+                units "C";
+                default -99;
+                config false;
+                description "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+            }
+            leaf rf-temp-max {
+                type int8;
+                units "C";
+                default -99;
+                config false;
+                description "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+            }
+            leaf rf-temp-avg {
+                type int8;
+                units "C";
+                default -99;
+                config false;
+                description "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+            }
+            leaf defect-blocks-sum {
+                type int16;
+                units "blocks";
+                default -1;
+                config false;
+                description "Total number of blocks that were defect after receiving and could not be corrected by the FEC.";
+            }
+            leaf time-period {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Total length of the measurement period.";
+            }
+            description "Consolidated performance information of the air interface.";
+        }
+        grouping air-interface-current-performance-type-g {
+            container performance-data {
+                config false;
+                uses air-interface-performance-type-g;
+                description "none";
+            }
+            uses g:otn-current-data-g;
+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";
+        }
+        grouping air-interface-historical-performance-type-g {
+            container performance-data {
+                config false;
+                uses air-interface-performance-type-g;
+                description "none";
+            }
+            uses g:otn-history-data-g;
+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";
+        }
+        typedef protection-type {
+            type enumeration {
+                enum hsb {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef role-type {
+            type enumeration {
+                enum working {
+                    description "none";
+                }
+                enum protection {
+                    description "none";
+                }
+                enum protected {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        grouping diversity-type-g {
+            leaf diversity-name {
+                type string;
+                default "Diversity name not defined.";
+                config false;
+                description "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'";
+            }
+            leaf number-of-air-interfaces-max {
+                type int8;
+                units "air interfaces";
+                default 1;
+                config false;
+                description "Maximum number of air interfaces that could be part of this kind of diversity.";
+            }
+            description "none";
+        }
+        typedef air-interface-diversity-status-type {
+            type enumeration {
+                enum group-down {
+                    description "All air interfaces that are members of the diversity configuration are down.";
+                }
+                enum not-all-ai-active {
+                    description "At least one, but not all of the air interfaces that are part of the diversity configuration is not working.";
+                }
+                enum all-ai-active {
+                    description "All air interfaces that are part of the diversity configuration are working.";
+                }
+            }
+            description "none";
+        }
+        grouping air-interface-diversity-problem-severity-type-g {
+            leaf problem-kind-name {
+                type string;
+                default "Problem kind name not defined.";
+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";
+            }
+            leaf problem-kind-severity {
+                type severity-type;
+                default warning;
+                description "Severity of this type of alarm.";
+            }
+            description "none";
+        }
+        grouping air-interface-diversity-current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "Problem name not specified.";
+                config false;
+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";
+            }
+            uses mw-current-problem-g;
+            description "none";
+        }
+        grouping air-interface-diversity-performance-type-g {
+            leaf snir-min {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Minimum signal to (noise+interference) ratio of the combined signals.";
+            }
+            leaf snir-max {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Maximum signal to (noise+interference) ratio of the combined signals.";
+            }
+            leaf snir-avg {
+                type int8;
+                units "dB";
+                default -99;
+                config false;
+                description "Average signal to (noise+interference) ratio of the combined signals.";
+            }
+            description "Consolidated performance information of the air interface diversity group.";
+        }
+        grouping air-interface-diversity-current-performance-type-g {
+            container performance-data {
+                config false;
+                uses air-interface-diversity-performance-type-g;
+                description "none";
+            }
+            uses g:otn-current-data-g;
+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";
+        }
+        grouping air-interface-diversity-historical-performance-type-g {
+            container performance-data {
+                config false;
+                uses air-interface-diversity-performance-type-g;
+                description "none";
+            }
+            uses g:otn-history-data-g;
+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";
+        }
+        grouping tdm-structure-type-g {
+            leaf tdm-structure-name {
+                type string;
+                default "TDM structure name not defined.";
+                config false;
+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";
+            }
+            leaf tdm-segment-size {
+                type int32;
+                units "kbit/s";
+                default -1;
+                config false;
+                description "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";
+            }
+            leaf max-number-of-segments-reservable {
+                type int8;
+                units "segments";
+                default -1;
+                config false;
+                description "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface.";
+            }
+            description "none";
+        }
+        grouping structure-problem-severity-type-g {
+            leaf problem-kind-name {
+                type string;
+                default "Problem kind name not defined.";
+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";
+            }
+            leaf problem-kind-severity {
+                type severity-type;
+                default warning;
+                description "Severity of this type of alarm.";
+            }
+            description "none";
+        }
+        grouping structure-current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "Problem name not specified.";
+                config false;
+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";
+            }
+            uses mw-current-problem-g;
+            description "none";
+        }
+        typedef structure-performance-type {
+            type int32;
+            description "Consolidated performance information of the Structure.";
+        }
+        grouping structure-current-performance-type-g {
+            leaf performance-data {
+                type structure-performance-type;
+                config false;
+                description "none";
+            }
+            uses g:otn-current-data-g;
+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";
+        }
+        grouping structure-historical-performance-type-g {
+            leaf performance-data {
+                type structure-performance-type;
+                config false;
+                description "none";
+            }
+            uses g:otn-history-data-g;
+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";
+        }
+        grouping container-type-g {
+            leaf container-name {
+                type string;
+                default "Container name not yet defined.";
+                config false;
+                description "Names to be chosen from the following list: 'ethernet','e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";
+            }
+            leaf number-of-time-slots-required {
+                type int16;
+                units "timeslots";
+                default -1;
+                config false;
+                description "Number of time slots required for transporting this type of container. Value must be calculated by the vendor after defining the timeSlotCapacity. For containers of fixed size: numberOfTimeSlotsRequired = required bandwidth of the container divided by timeSlotCapacity. For containers of variable size the minimum (most probably 1) is to be stated.";
+            }
+            leaf tdm-time-slots-is-required {
+                type boolean;
+                default false;
+                config false;
+                description "Shall be set to '1', if this container type requires bandwidth (times slots) reserved for TDM transport.";
+            }
+            leaf bundling-is-avail {
+                type boolean;
+                default false;
+                config false;
+                description "If it is possible to combine transport resources of several radio links to transport this container type, this attribute shall be set to '1'.";
+            }
+            description "none";
+        }
+        grouping tdm-container-type-g {
+            leaf tdm-container-name {
+                type string;
+                default "TDM container name not defined.";
+                config false;
+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";
+            }
+            leaf tdm-container-size {
+                type int32;
+                units "kbit/s";
+                default -1;
+                config false;
+                description "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";
+            }
+            description "none";
+        }
+        grouping segment-id-type-g {
+            leaf structure-id-ref {
+                type core-model:universal-id;
+                description "none";
+            }
+            leaf segment-id-ref {
+                type int16;
+                description "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once.";
+            }
+            description "Identifies the segments, which are used to transport the container.";
+        }
+        grouping segment-status-type-g {
+            leaf segment-status-type-id {
+                type int16;
+                config false;
+                description "none";
+            }
+            leaf segment-is-reserved-for-tdm {
+                type boolean;
+                default false;
+                config false;
+                description "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm.
+                    ";
+            }
+            leaf operational-status {
+                type core-model:operational-state;
+                default disabled;
+                config false;
+                description "Current operational status of each segment.";
+            }
+            leaf obsolete-priority-class {
+                type int8;
+                default -1;
+                config false;
+                description "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank.";
+            }
+            leaf obsolete-drop-order-rank {
+                type int16;
+                default -1;
+                config false;
+                description "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. 
+                    _unique: within Structure::StructureStatus::segmentStatusList";
+            }
+            description "none";
+        }
+        grouping container-problem-severity-type-g {
+            leaf problem-kind-name {
+                type string;
+                default "Problem kind name not defined.";
+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";
+            }
+            leaf problem-kind-severity {
+                type severity-type;
+                default warning;
+                description "Severity of this type of alarm.";
+            }
+            description "none";
+        }
+        grouping container-current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "Problem name not specified.";
+                config false;
+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";
+            }
+            uses mw-current-problem-g;
+            description "none";
+        }
+        grouping container-performance-type-g {
+            leaf tx-ethernet-bytes-max-s {
+                type int32;
+                units "Bytes/s";
+                default -1;
+                config false;
+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers.";
+            }
+            leaf tx-ethernet-bytes-max-m {
+                type int64;
+                units "Bytes/min";
+                default -1;
+                config false;
+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers.";
+            }
+            leaf tx-ethernet-bytes-sum {
+                type int64;
+                units "Bytes";
+                default -1;
+                config false;
+                description "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers.";
+            }
+            leaf time-period {
+                type int32;
+                units "s";
+                default -1;
+                config false;
+                description "Total length of the measurement period in seconds.";
+            }
+            description "Consolidated performance information of the Container.";
+        }
+        grouping container-current-performance-type-g {
+            container performance-data {
+                config false;
+                uses container-performance-type-g;
+                description "none";
+            }
+            uses g:otn-current-data-g;
+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";
+        }
+        grouping container-historical-performance-type-g {
+            container performance-data {
+                config false;
+                uses container-performance-type-g;
+                description "none";
+            }
+            uses g:otn-history-data-g;
+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";
+        }
+
+    /***********************
+    * package object-classes
+    **********************/ 
+        /***********************
+        * package air-interface
+        **********************/ 
+            list mw-air-interface-pac {
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container air-interface-capability {
+                    config false;
+                    uses air-interface-capability-g;
+                    description "none";
+                }
+                container air-interface-configuration {
+                    uses air-interface-configuration-g;
+                    description "none";
+                }
+                container air-interface-status {
+                    config false;
+                    uses air-interface-status-g;
+                    description "none";
+                }
+                container air-interface-current-problems {
+                    config false;
+                    uses air-interface-current-problems-g;
+                    description "none";
+                }
+                container air-interface-current-performance {
+                    config false;
+                    uses air-interface-current-performance-g;
+                    description "none";
+                }
+                container air-interface-historical-performances {
+                    config false;
+                    uses air-interface-historical-performances-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping air-interface-capability-g {
+                leaf type-of-equipment {
+                    type string;
+                    default "Type of equipment not yet defined.";
+                    config false;
+                    description "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware.";
+                }
+                leaf tx-frequency-min {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Value of the minimum transmit frequency tunable at the air interface.";
+                }
+                leaf tx-frequency-max {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Value of the maximum transmit frequency tunable at the air interface.";
+                }
+                leaf rx-frequency-min {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Value of the minimum receive frequency tunable at the air interface.";
+                }
+                leaf rx-frequency-max {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Value of the maximum receive frequency tunable at the air interface.";
+                }
+                leaf adaptive-modulation-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "In case the device is capable of adaptive modulation, this field shall contain a 'true'.";
+                }
+                leaf mimo-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "In case the device is capable of MIMO, this field shall contain a 'true'.";
+                }
+                leaf mimo-channels {
+                    type int8;
+                    units "channels";
+                    default 1;
+                    config false;
+                    description "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration.";
+                }
+                leaf alic-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'.";
+                }
+                leaf atpc-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "In case the microwave radio is capable of ATPC, this field shall contain a 'true'.";
+                }
+                leaf atpc-range {
+                    type int8;
+                    units "dB";
+                    default 0;
+                    config false;
+                    description "Extent of the ATPC range.";
+                }
+                leaf encryption-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Shall be marked 'true', if payload encryption is available.";
+                }
+                leaf-list supported-loop-back-kind-list {
+                    type loop-back-type;
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    description "List of supported kinds of looping back of header information to the remote site.";
+                }
+                leaf maintenance-timer-range {
+                    type string;
+                    units "s";
+                    default "Range of the maintenance timer not yet defined.";
+                    config false;
+                    description "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas.";
+                }
+                list supported-channel-plan-list {
+                    key 'supported-channel-plan';
+                    config false;
+                    min-elements 1;
+                    uses channel-plan-type-g;
+                    description "List of channel spacing that are supported by the device.";
+                }
+                description "Describes the 'analog' capabilities of modem and transmitter of the microwave device. Value ranges of attributes are not independently (e.g. min. and max. transmit power depends on modulation). Legal combinations of values are expressed in transmissionModeTypes.";
+            }
+            grouping air-interface-configuration-g {
+                leaf air-interface-name {
+                    type string;
+                    default "Air interface ID not yet defined.";
+                    description "Operator specific microwave link ID (often used for coding area, type of element and sequential number).";
+                }
+                leaf radio-signal-id {
+                    type string;
+                    default "Radio signal ID not yet defined.";
+                    description "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check.";
+                }
+                leaf tx-frequency {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    description "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable.";
+                }
+                leaf rx-frequency {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    description "Center frequency of the receive channel.";
+                }
+                leaf tx-channel-bandwidth {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";
+                }
+                leaf rx-channel-bandwidth {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    description "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";
+                }
+                leaf polarization {
+                    type polarization-type;
+                    default not-specified;
+                    description "Allows documenting the polarization of the air interface.";
+                }
+                leaf power-is-on {
+                    type boolean;
+                    default true;
+                    description "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'.";
+                }
+                leaf transmitter-is-on {
+                    type boolean;
+                    default false;
+                    description "Activation of the transmitter inside the radio shall be expressed as a 'true'.";
+                }
+                leaf receiver-is-on {
+                    type boolean;
+                    default true;
+                    description "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations.
+                        ";
+                }
+                leaf tx-power {
+                    type int8;
+                    units "dBm";
+                    default 99;
+                    description "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC.";
+                }
+                leaf adaptive-modulation-is-on {
+                    type boolean;
+                    default false;
+                    description "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'.";
+                }
+                leaf modulation-min {
+                    type int16;
+                    units "symbols";
+                    default -1;
+                    description "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";
+                }
+                leaf modulation-max {
+                    type int16;
+                    units "symbols";
+                    default -1;
+                    description "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";
+                }
+                leaf xpic-is-on {
+                    type boolean;
+                    default false;
+                    description "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'.";
+                }
+                leaf mimo-is-on {
+                    type boolean;
+                    default false;
+                    description "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'.";
+                }
+                leaf alic-is-on {
+                    type boolean;
+                    default false;
+                    description "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'.";
+                }
+                leaf atpc-is-on {
+                    type boolean;
+                    default false;
+                    description "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'.";
+                }
+                leaf atpc-thresh-upper {
+                    type int16;
+                    units "dBm";
+                    default 99;
+                    description "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power.";
+                }
+                leaf atpc-thresh-lower {
+                    type int16;
+                    units "dBm";
+                    default 99;
+                    description "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power.";
+                }
+                leaf auto-freq-select-is-on {
+                    type boolean;
+                    default false;
+                    description "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'.";
+                }
+                leaf auto-freq-select-range {
+                    type int8;
+                    units "channels";
+                    default -1;
+                    description "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen. ";
+                }
+                leaf modulation-is-on {
+                    type boolean;
+                    default true;
+                    description "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'.";
+                }
+                leaf encryption-is-on {
+                    type boolean;
+                    default false;
+                    description "Activates encryption of the payload.";
+                }
+                leaf cryptographic-key {
+                    type string;
+                    default "Cryptographic key not yet defined.";
+                    description "Key for transforming plaintext into ciphertext data.";
+                }
+                leaf loop-back-kind-on {
+                    type loop-back-type;
+                    default none;
+                    description "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";
+                }
+                leaf maintenance-timer {
+                    type int32;
+                    units "s";
+                    default -1;
+                    description "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange.";
+                }
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    min-elements 6;
+                    uses air-interface-problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "Configuration of the radio link.";
+            }
+            grouping air-interface-status-g {
+                leaf tx-frequency-cur {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Center frequency of the currently operated transmit channel.";
+                }
+                leaf rx-frequency-cur {
+                    type int32;
+                    units "kHz";
+                    default -1;
+                    config false;
+                    description "Center frequency of the currently operated receive channel.";
+                }
+                leaf tx-level-cur {
+                    type int8;
+                    units "dBm";
+                    default 99;
+                    config false;
+                    description "Current transmit level.";
+                }
+                leaf rx-level-cur {
+                    type int8;
+                    units "dBm";
+                    default 99;
+                    config false;
+                    description "Current receive level.";
+                }
+                leaf modulation-cur {
+                    type int16;
+                    units "symbols";
+                    default -1;
+                    config false;
+                    description "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";
+                }
+                leaf code-rate-cur {
+                    type int8;
+                    units "%";
+                    default -1;
+                    config false;
+                    description "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate).";
+                }
+                leaf snir-cur {
+                    type int8;
+                    units "dB";
+                    default -99;
+                    config false;
+                    description "Currently measured signal to (noise+interference) ratio.";
+                }
+                leaf xpd-cur {
+                    type int8;
+                    units "dB";
+                    default -99;
+                    config false;
+                    description "Currently measured cross polarization discrimination.";
+                }
+                leaf rf-temp-cur {
+                    type int8;
+                    units "Celsius";
+                    default -99;
+                    config false;
+                    description "Current temperature (in degree Celsius) of the radio module inside the outdoor unit.";
+                }
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time the Air Interface entered its current operational status.  ";
+                }
+                leaf radio-power-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If the radio unit has power and is switched on, this shall be expressed as a 'true'.";
+                }
+                leaf link-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'.";
+                }
+                leaf xpic-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'.";
+                }
+                leaf mimo-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'.";
+                }
+                leaf alic-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'.";
+                }
+                leaf atpc-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'.";
+                }
+                leaf auto-freq-select-is-up {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'.";
+                }
+                leaf loop-back-kind-up {
+                    type loop-back-type;
+                    default none;
+                    config false;
+                    description "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";
+                }
+                leaf local-end-point-id {
+                    type string;
+                    default "not-supported";
+                    config false;
+                    description "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link.";
+                }
+                leaf remote-end-point-id {
+                    type string;
+                    default "not-supported";
+                    config false;
+                    description "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link.";
+                }
+                description "Measurements of current values on the air interface and operational status of the device.";
+            }
+            grouping air-interface-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses air-interface-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping air-interface-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses air-interface-current-performance-type-g;
+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";
+                }
+                description "Aggregated performance information of the air interface at a particular moment.";
+            }
+            grouping air-interface-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses air-interface-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the air interface for a pre-defined measurement interval.";
+            }
+            list co-channel-group {
+                key 'co-channel-group-id';
+                uses co-channel-group-g;
+                description "none";
+            }
+            grouping co-channel-group-g {
+                leaf co-channel-group-id {
+                    type core-model:universal-id;
+                    description "none";
+                }
+                leaf-list air-interface-list {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';
+                    }
+                    description "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group.";
+                }
+                leaf sort-of-co-channel-group {
+                    type string;
+                    default "Kind of co-channel group not specified.";
+                    description "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';";
+                }
+                leaf-list logical-termination-point {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';
+                    }
+                    description "none";
+                }
+                description "Required for configuring XPIC, MIMO and ALIC.";
+            }
+
+        /***********************
+        * package air-interface-hsb
+        **********************/ 
+            list mw-air-interface-hsb-end-point-pac {
+                key 'endpoint';
+                leaf role {
+                    type role-type;
+                    default working;
+                    description "none";
+                }
+                leaf endpoint {
+                    type leafref {
+                        path '/core-model:forwarding-construct/core-model:fc-port/core-model:uuid';
+                    }
+                    description "none";
+                }
+                description "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC.  The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.";
+            }
+            list mw-air-interface-hsb-fc-switch-pac {
+                key 'fcswitch';
+                leaf prot-type {
+                    type protection-type;
+                    default hsb;
+                    description "Indicates the protection scheme that is used for the ProtectionGroup.";
+                }
+                leaf air-interface-hsb-configuration-is-faulty-severity {
+                    type severity-type;
+                    default warning;
+                    description "The level of severity of an airInterfaceHsbConfigurationIsFaulty alarm shall be chosen from an enumeration.";
+                }
+                leaf air-interface-hsb-is-partly-down-severity {
+                    type severity-type;
+                    default warning;
+                    description "The level of severity for one link out of the HSB configuration being down shall be chosen from an enumeration.";
+                }
+                leaf air-interface-hsb-is-down-severity {
+                    type severity-type;
+                    default warning;
+                    description "The level of severity of the total HSB configuration being down shall be chosen from an enumeration.";
+                }
+                leaf fcswitch {
+                    type leafref {
+                        path '/core-model:forwarding-construct/core-model:fc-switch/core-model:uuid';
+                    }
+                    description "none";
+                }
+                description "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as  1+1 ane 1:1).  May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state.";
+            }
+
+        /***********************
+        * package air-interface-diversity
+        **********************/ 
+            list mw-air-interface-diversity-pac {
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container air-interface-diversity-capability {
+                    config false;
+                    uses air-interface-diversity-capability-g;
+                    description "none";
+                }
+                container air-interface-diversity-configuration {
+                    uses air-interface-diversity-configuration-g;
+                    description "none";
+                }
+                container air-interface-diversity-status {
+                    config false;
+                    uses air-interface-diversity-status-g;
+                    description "none";
+                }
+                container air-interface-diversity-current-problems {
+                    config false;
+                    uses air-interface-diversity-current-problems-g;
+                    description "none";
+                }
+                container air-interface-diversity-current-performance {
+                    config false;
+                    uses air-interface-diversity-current-performance-g;
+                    description "none";
+                }
+                container air-interface-diversity-historical-performances {
+                    config false;
+                    uses air-interface-diversity-historical-performances-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping air-interface-diversity-capability-g {
+                list available-kinds-of-diversity {
+                    key 'diversity-name';
+                    config false;
+                    uses diversity-type-g;
+                    description "Available types of diversity to be listed.";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas.";
+                }
+                description "Describes the capabilities in implementing different types of air interface diversity.";
+            }
+            grouping air-interface-diversity-configuration-g {
+                container air-interface-diversity {
+                    uses diversity-type-g;
+                    description "Type of air interface diversity configured at the link.";
+                }
+                leaf-list air-interface-ltp-list {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';
+                    }
+                    min-elements 2;
+                    description "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax";
+                }
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    min-elements 3;
+                    uses air-interface-diversity-problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "none";
+            }
+            grouping air-interface-diversity-status-g {
+                leaf snir-cur {
+                    type int8;
+                    units "dB";
+                    default -99;
+                    config false;
+                    description "Currently measured signal to (noise+interference) ratio of the combined signals.";
+                }
+                leaf air-interface-diversity-status {
+                    type air-interface-diversity-status-type;
+                    default group-down;
+                    config false;
+                    description "Status of the air interface bundle. ";
+                }
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time the Diversity Group entered its current operational status.  ";
+                }
+                description "none";
+            }
+            grouping air-interface-diversity-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses air-interface-diversity-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping air-interface-diversity-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses air-interface-diversity-current-performance-type-g;
+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";
+                }
+                description "Aggregated performance information of the air interface diversity configuration at a particular moment.";
+            }
+            grouping air-interface-diversity-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses air-interface-diversity-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the air interface diversity configuration for a pre-defined measurement interval.";
+            }
+
+        /***********************
+        * package pure-ethernet-structure
+        **********************/ 
+            list mw-pure-ethernet-structure-pac {
+                if-feature pure-ethernet;
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container pure-ethernet-structure-capability {
+                    config false;
+                    uses pure-ethernet-structure-capability-g;
+                    description "none";
+                }
+                container pure-ethernet-structure-configuration {
+                    uses pure-ethernet-structure-configuration-g;
+                    description "none";
+                }
+                container pure-ethernet-structure-status {
+                    config false;
+                    uses pure-ethernet-structure-status-g;
+                    description "none";
+                }
+                container pure-ethernet-structure-current-problems {
+                    config false;
+                    uses pure-ethernet-structure-current-problems-g;
+                    description "none";
+                }
+                container pure-ethernet-structure-current-performance {
+                    config false;
+                    uses pure-ethernet-structure-current-performance-g;
+                    description "none";
+                }
+                container pure-ethernet-structure-historical-performances {
+                    config false;
+                    uses pure-ethernet-structure-historical-performances-g;
+                    description "none";
+                }
+                description "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only.";
+            }
+            grouping pure-ethernet-structure-capability-g {
+                leaf structure-id {
+                    type core-model:universal-id;
+                    config false;
+                    description "Identifies the Structure for bundling and container.";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";
+                }
+                description "Describes the logical structuring of the physical capacity provided by a pure Ethernet microwave device. Segmentation is not available. No fixed segment size. No TDM transport.";
+            }
+            grouping pure-ethernet-structure-configuration-g {
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    uses structure-problem-severity-type-g;
+                    description "Severity of the type of problem to be configured.";
+                }
+                description "none";
+            }
+            grouping pure-ethernet-structure-status-g {
+                container segment-status-list {
+                    config false;
+                    uses segment-status-type-g;
+                    description "Status of the Ethernet transport segment. Always just one segment.";
+                }
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time and date of the last update of the status information.  ";
+                }
+                description "none";
+            }
+            grouping pure-ethernet-structure-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses structure-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping pure-ethernet-structure-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses structure-current-performance-type-g;
+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";
+                }
+                description "Aggregated performance information of the structure of an pure Ethernet microwave at a particular moment.";
+            }
+            grouping pure-ethernet-structure-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses structure-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the structure of an pure Ethernet microwave for a pre-defined measurement interval.";
+            }
+            feature pure-ethernet {
+                description "Feature 'pure-ethernet' is mandatory for device types transporting pure Ethernet.";
+            }
+
+        /***********************
+        * package hybrid-mw-structure
+        **********************/ 
+            list mw-hybrid-mw-structure-pac {
+                if-feature hybrid-microwave;
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container hybrid-mw-structure-capability {
+                    config false;
+                    uses hybrid-mw-structure-capability-g;
+                    description "none";
+                }
+                container hybrid-mw-structure-configuration {
+                    uses hybrid-mw-structure-configuration-g;
+                    description "none";
+                }
+                container hybrid-mw-structure-status {
+                    config false;
+                    uses hybrid-mw-structure-status-g;
+                    description "none";
+                }
+                container hybrid-mw-structure-current-problems {
+                    config false;
+                    uses hybrid-mw-structure-current-problems-g;
+                    description "none";
+                }
+                container hybrid-mw-structure-current-performance {
+                    config false;
+                    uses hybrid-mw-structure-current-performance-g;
+                    description "none";
+                }
+                container hybrid-mw-structure-historical-performances {
+                    config false;
+                    uses hybrid-mw-structure-historical-performances-g;
+                    description "none";
+                }
+                description "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic.";
+            }
+            grouping hybrid-mw-structure-capability-g {
+                leaf structure-id {
+                    type core-model:universal-id;
+                    config false;
+                    description "Identifies the Structure for bundling and container.";
+                }
+                list supported-tdm-structure-types-list {
+                    key 'tdm-structure-name';
+                    config false;
+                    min-elements 1;
+                    uses tdm-structure-type-g;
+                    description "Lists the TDM frame types that are supported.";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";
+                }
+                description "Describes the logical structuring of the physical capacity provided by a hybrid microwave device (TDM + Ethernet). Segmentation is available. TDM transport is available.";
+            }
+            grouping hybrid-mw-structure-configuration-g {
+                container structure-type {
+                    uses tdm-structure-type-g;
+                    description "TDM frame to be applied.";
+                }
+                leaf number-of-tdm-segments-to-be-reserved {
+                    type int16;
+                    default -1;
+                    description "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType";
+                }
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    uses structure-problem-severity-type-g;
+                    description "Severity of the type of problem to be configured.";
+                }
+                description "none";
+            }
+            grouping hybrid-mw-structure-status-g {
+                list segment-status-list {
+                    key 'segment-status-type-id';
+                    config false;
+                    uses segment-status-type-g;
+                    description "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1";
+                }
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time and date of the last update of the status information.  ";
+                }
+                description "none";
+            }
+            grouping hybrid-mw-structure-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses structure-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping hybrid-mw-structure-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses structure-current-performance-type-g;
+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";
+                }
+                description "Aggregated performance information of the structure of a hybrid microwave at a particular moment.";
+            }
+            grouping hybrid-mw-structure-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses structure-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the structure of a hybrid microwave for a pre-defined measurement interval.";
+            }
+            feature hybrid-microwave {
+                description "Feature 'hybrid-microwave' is mandatory for device types transporting Ethernet + TDM.";
+            }
+
+        /***********************
+        * package ethernet-container
+        **********************/ 
+            list mw-ethernet-container-pac {
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container ethernet-container-capability {
+                    config false;
+                    uses ethernet-container-capability-g;
+                    description "none";
+                }
+                container ethernet-container-configuration {
+                    uses ethernet-container-configuration-g;
+                    description "none";
+                }
+                container ethernet-container-status {
+                    config false;
+                    uses ethernet-container-status-g;
+                    description "none";
+                }
+                container ethernet-container-current-problems {
+                    config false;
+                    uses ethernet-container-current-problems-g;
+                    description "none";
+                }
+                container ethernet-container-current-performance {
+                    config false;
+                    uses ethernet-container-current-performance-g;
+                    description "none";
+                }
+                container ethernet-container-historical-performances {
+                    config false;
+                    uses ethernet-container-historical-performances-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping ethernet-container-capability-g {
+                leaf bundling-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container.";
+                }
+                leaf packet-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans.";
+                }
+                leaf layer2-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on layer 2 available at the device.";
+                }
+                leaf vlan-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on VLAN layer available at the device.";
+                }
+                leaf q-in-q-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on layer of a second VLAN available at the device.";
+                }
+                leaf mpls-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on mpls layer available at the device.";
+                }
+                leaf ipv4-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on layer 3 for IPv4 available at the device.";
+                }
+                leaf ipv6-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on layer 3 for IPv6 available at the device.";
+                }
+                leaf layer4-compression-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Packet compression on layer 4 (TCP and UDP header) available at the device.";
+                }
+                leaf encryption-is-avail {
+                    type boolean;
+                    default false;
+                    config false;
+                    description "Shall be marked 'true', if Ethernet payload encryption is available.";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";
+                }
+                description "none";
+            }
+            grouping ethernet-container-configuration-g {
+                leaf container-id {
+                    type string;
+                    default "No Ethernet Flow associated yet.";
+                    description "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller.";
+                }
+                list segments-id-list {
+                    key 'structure-id-ref segment-id-ref';
+                    min-elements 1;
+                    uses segment-id-type-g;
+                    description "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list.";
+                }
+                leaf packet-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum.";
+                }
+                leaf layer2-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on layer 2 configured at the device.";
+                }
+                leaf vlan-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on VLAN layer configured at the device.";
+                }
+                leaf q-in-q-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on layer of a second VLAN configured at the device.";
+                }
+                leaf mpls-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on MPLS layer configured at the device.";
+                }
+                leaf ipv4-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on layer 3 for IPv4 configured at the device.";
+                }
+                leaf ipv6-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on layer 3 for IPv6 configured at the device.";
+                }
+                leaf layer4-compression-is-on {
+                    type boolean;
+                    default false;
+                    description "Packet compression on layer 4 (TCP and UDP header) configured at the device.";
+                }
+                leaf encryption-is-on {
+                    type boolean;
+                    default false;
+                    description "Activates encryption of the Ethernet payload.";
+                }
+                leaf cryptographic-key {
+                    type string;
+                    default "Cryptographic key not yet defined.";
+                    description "Key for transforming plaintext into cipher text data.";
+                }
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    min-elements 2;
+                    uses container-problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "none";
+            }
+            grouping ethernet-container-status-g {
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time the Container entered its current operational status.  ";
+                }
+                description "none";
+            }
+            grouping ethernet-container-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses container-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping ethernet-container-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses container-current-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the Ethernet container at a particular moment.";
+            }
+            grouping ethernet-container-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses container-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the Ethernet container for a pre-defined measurement interval.";
+            }
+
+        /***********************
+        * package tdm-container
+        **********************/ 
+            list mw-tdm-container-pac {
+                if-feature hybrid-microwave;
+                key 'layer-protocol';
+                leaf layer-protocol {
+                    type leafref {
+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                    }
+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";
+                }
+                container tdm-container-capability {
+                    config false;
+                    uses tdm-container-capability-g;
+                    description "none";
+                }
+                container tdm-container-configuration {
+                    uses tdm-container-configuration-g;
+                    description "none";
+                }
+                container tdm-container-status {
+                    config false;
+                    uses tdm-container-status-g;
+                    description "none";
+                }
+                container tdm-container-current-problems {
+                    config false;
+                    uses tdm-container-current-problems-g;
+                    description "none";
+                }
+                container tdm-container-current-performance {
+                    config false;
+                    uses tdm-container-current-performance-g;
+                    description "none";
+                }
+                container tdm-container-historical-performances {
+                    config false;
+                    uses tdm-container-historical-performances-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping tdm-container-capability-g {
+                list supported-tdm-container-types-list {
+                    key 'tdm-container-name';
+                    config false;
+                    min-elements 1;
+                    uses tdm-container-type-g;
+                    description "Lists the TDM containers that are supported.";
+                }
+                leaf supported-alarms {
+                    type string;
+                    default "Supported alarms not yet defined.";
+                    config false;
+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";
+                }
+                description "Bundling is not available.";
+            }
+            grouping tdm-container-configuration-g {
+                leaf container-id {
+                    type string;
+                    default "No TDM Flow associated yet.";
+                    description "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller.";
+                }
+                container container-type {
+                    uses tdm-container-type-g;
+                    description "Type of TDM container.";
+                }
+                container segment-id {
+                    uses segment-id-type-g;
+                    description "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;";
+                }
+                list problem-kind-severity-list {
+                    key 'problem-kind-name';
+                    min-elements 2;
+                    uses container-problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "none";
+            }
+            grouping tdm-container-status-g {
+                leaf last-status-change {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time the Container entered its current operational status.  ";
+                }
+                description "none";
+            }
+            grouping tdm-container-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses container-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping tdm-container-current-performance-g {
+                list current-performance-data-list {
+                    key 'scanner-id';
+                    config false;
+                    min-elements 1;
+                    max-elements 2;
+                    uses container-current-performance-type-g;
+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";
+                }
+                description "Aggregated performance information of the TDM container at a particular moment.";
+            }
+            grouping tdm-container-historical-performances-g {
+                list historical-performance-data-list {
+                    key 'history-data-id';
+                    config false;
+                    uses container-historical-performance-type-g;
+                    description "none";
+                }
+                description "Aggregated performance information of the TDM container for a pre-defined measurement interval.";
+            }
+
+        /***********************
+        * package super-classes
+        **********************/ 
+            grouping mw-current-problem-g {
+                leaf sequence-number {
+                    type int32;
+                    config false;
+                    description "Unique sequence number of the current problem object.";
+                }
+                leaf time-stamp {
+                    type yang:date-and-time;
+                    default "2017-01-01T00:00:00.0Z";
+                    config false;
+                    description "Time and date of the problem.  ";
+                }
+                leaf problem-severity {
+                    type severity-type;
+                    default warning;
+                    config false;
+                    description "Severity of the alarm.";
+                }
+                description "none";
+            }
+
+
+    /***********************
+    * package notifications
+    **********************/ 
+        notification object-creation-notification {
+            uses object-creation-notification-g;
+            description "none";
+        }
+        grouping object-creation-notification-g {
+            leaf counter {
+                type int32;
+                default -1;
+                description "Counts object creation notifications.";
+            }
+            leaf time-stamp {
+                type yang:date-and-time;
+                default "2017-01-01T00:00:00.0Z";
+                description "none";
+            }
+            leaf object-id-ref {
+                type core-model:universal-id;
+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";
+            }
+            leaf object-type {
+                type string;
+                default "Type of created object not specified.";
+                description "Type of Object to be chosen from the following list of values: 'MW_AirInterface_Pac', 'MW_AirInterfaceDiversity_Pac', 'MW_Structure_Pac', 'MW_PureEthernetStructure_Pac', 'MW_HybridMwStructure_Pac', 'MW_Container_Pac', 'MW_EthernetContainer_Pac' or 'MW_TdmContainer_Pac'.";
+            }
+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac has to be instancieted in the controller.";
+        }
+        notification object-deletion-notification {
+            uses object-deletion-notification-g;
+            description "none";
+        }
+        grouping object-deletion-notification-g {
+            leaf counter {
+                type int32;
+                default -1;
+                description "Counts object deletion notifications.";
+            }
+            leaf time-stamp {
+                type yang:date-and-time;
+                default "2017-01-01T00:00:00.0Z";
+                description "none";
+            }
+            leaf object-id-ref {
+                type core-model:universal-id;
+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";
+            }
+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac instance has to be deleted in the controller.";
+        }
+        notification attribute-value-changed-notification {
+            uses attribute-value-changed-notification-g;
+            description "none";
+        }
+        grouping attribute-value-changed-notification-g {
+            leaf counter {
+                type int32;
+                default -1;
+                description "Counts attribute value changed notifications.";
+            }
+            leaf time-stamp {
+                type yang:date-and-time;
+                default "2017-01-01T00:00:00.0Z";
+                description "none";
+            }
+            leaf object-id-ref {
+                type core-model:universal-id;
+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";
+            }
+            leaf attribute-name {
+                type string;
+                default "Attribute name not specified.";
+                description "Name of the attribute that has been changed.";
+            }
+            leaf new-value {
+                type string;
+                default "New value not specified.";
+                description "Attribute value converted to a string (xml, json, ...)";
+            }
+            description "To be sent when an attribute has changed and one or more controllers have to update their data.";
+        }
+        notification problem-notification {
+            uses problem-notification-g;
+            description "none";
+        }
+        grouping problem-notification-g {
+            leaf counter {
+                type int32;
+                default -1;
+                description "Counts problem notifications";
+            }
+            leaf time-stamp {
+                type yang:date-and-time;
+                default "2017-01-01T00:00:00.0Z";
+                description "none";
+            }
+            leaf object-id-ref {
+                type core-model:universal-id;
+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";
+            }
+            leaf problem {
+                type string;
+                default "Problem name not specified.";
+                description "Name of the problem according to AirInterface::AirInterfaceCapability::supportedAlarms or AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms or Structure::StructureCapability::supportedAlarms or PureEthernetStructure::PureEthernetStructureCapability::supportedAlarms or HybridMwStructure::HybridMwStructureCapability::supportedAlarms or Container::ContainerCapability::supportedAlarms or EthernetContainer::EthernetContainerCapability::supportedAlarms or TdmContainer::TdmContainerCapability::supportedAlarms.";
+            }
+            leaf severity {
+                type severity-type;
+                default warning;
+                description "Severity of the problem according to AirInterface::AirInterfaceConfiguration::problemSeverityList, AirInterfaceDiversity::AirInterfaceDiversityConfiguration::problemSeverityList, Structure::StructureConfiguration::problemSeverityList, PureEthernetStructure::PureEthernetStructureConfiguration::problemSeverityList, HybridMwStructure::HybridMwStructureConfiguration::problemSeverityList, Container::ContainerConfiguration::problemSeverityList, EthernetContainer::EthernetContainerConfiguration::problemSeverityList or TdmContainer::TdmContainerConfiguration::problemSeverityList";
+            }
+            description "To be sent when a problem occurs at a MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";
+        }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-09-07.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-09-07.yang
new file mode 100644
index 000000000..db94e09c5
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-09-07.yang
@@ -0,0 +1,2567 @@
+module microwave-model {

+    namespace "urn:onf:params:xml:ns:yang:microwave-model";

+    prefix microwave-model;

+

+    import core-model {

+        prefix core-model;

+    }

+    import g.874.1-model {

+        prefix g;

+    }

+    import ietf-yang-types {

+        prefix yang;

+    }

+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";

+    contact "WG Web: <https://www.opennetworking.org/software-defined-standards/models-apis/>

+             WG List:  <mailto:wireless-transport@login.opennetworking.org>

+             WG Chair: Lyndon Ong

+                       <mailto:lyong@ciena.com>

+             WG Chair: Giorgio Cazzaniga

+                       <mailto:giorgio.cazzaniga@sm-optics.com>

+             Editors:  Thorsten Heinze

+                       <mailto:thorsten.heinze@telefonica.com>

+                       Shrikanth Malavalli Divakar

+                       <mailto:shrikanth.divakar@wipro.com>";					   

+    description "This module contains a collection of YANG definitions for managing wireless networks.

+        This model is for vendor agnostic management of wireless network elements.";

+    revision 2018-09-07 {

+        description "Version 1.1";

+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";

+    }

+	

+    revision 2017-03-24 {

+        description "Initial version";

+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";

+    }

+	

+    /***********************

+    * package type-definitions

+    **********************/ 

+        typedef loop-back-type {

+            type enumeration {

+                enum rf-to-remote {

+                    description "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units.";

+                }

+                enum rf-to-local {

+                    description "Returning the header information of the local site back to the local site on the radio interface between both outdoor units.";

+                }

+                enum if-to-remote {

+                    description "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit.";

+                }

+                enum if-to-local {

+                    description "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit.";

+                }

+                enum none {				

+                    description "none";

+                }

+                enum if {

+					status deprecated;

+                    description "Intermediate Frequency on the interface between indoor and outdoor unit.";

+                }

+                enum rf {

+					status deprecated;

+                    description "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site.";

+                }

+            }

+            description "none";

+        }

+        typedef severity-type {

+            type enumeration {

+                enum non-alarmed {

+                    description "none";

+                }

+                enum warning {

+                    description "none";

+                }

+                enum minor {

+                    description "none";

+                }

+                enum major {

+                    description "none";

+                }

+                enum critical {

+                    description "none";

+                }

+            }

+            description "According to ITU-T M.3160";

+        }

+        grouping channel-plan-type-g {

+            leaf supported-channel-plan {

+                type string;

+                config false;

+                description "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database.";

+            }

+            leaf duplex-distance-is-variable {

+                type boolean;

+                default false;

+                config false;

+                description "To be set on  'true', if the distance between transmitted and received frequency is variable.";

+            }

+            leaf-list duplex-distance-list {

+                type int32;

+                units "kHz";

+                config false;

+                min-elements 1;

+                description "Distance between transmitted and received frequency. To be filled with single value, in case duplex distance is not variable. To be filled with all configurable values, in case duplex distance is variable.";

+            }

+            leaf duplex-distance {

+                type int32;

+                units "kHz";

+                default -1;

+                config false;

+				status deprecated;

+                description "Distance between transmitted and received frequency.";

+            }

+            leaf auto-freq-select-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'.";

+            }

+            list transmission-mode-list {

+                key 'transmission-mode-id';

+                config false;

+                min-elements 1;

+                uses transmission-mode-type-g;

+                description "none";

+            }

+            description "none";

+        }

+        grouping transmission-mode-type-g {

+            leaf transmission-mode-id {

+                type core-model:universal-id;

+                description "Indentifies the transmissionMode for internal reference.";

+            }

+            leaf transmission-mode-name {

+                type string;

+                default "Name of the transmission mode not yet defined.";

+                config false;

+                description "Name of the transmission mode. BBBB-m*-i*/t*-r*. B=four digits of channel bandwidth in MHz. m*=required number of digits for modulation name. (i*/t*=code rate.) i*=required number of digits for number of information bits. t*=required number of digits for total bits. r*=required number of digits for rate reduction factor. Example: 028-4QAM-188/204-1";

+            }

+            leaf channel-bandwidth {

+                type int32;

+                units "kHz";

+                default -1;

+                config false;

+                description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+            }

+            leaf modulation-scheme {

+                type int16;

+                units "symbols";

+                default -1;

+                config false;

+                description "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256').";

+            }

+            leaf code-rate {

+                type int8;

+                units "%";

+                default -1;

+                config false;

+                description "Code rate of the coding scheme in % (Net bit rate ≤ Gross bit rate · code rate).";

+            }

+            leaf symbol-rate-reduction-factor {

+                type int8;

+                default 1;

+                config false;

+                description "Reduction factor for the symbol rate. Example: value would be 4 for 1/4BPSK.";

+            }

+            leaf tx-power-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the minimum transmit power the modem can operate in dBm.";

+            }

+            leaf tx-power-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the maximum transmit power the modem can operate in dBm.";

+            }

+            leaf rx-threshold {

+                type int16;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less.";

+            }

+            leaf am-upshift-level {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level that has to be exceeded to shift into a higher modulation scheme.";

+            }

+            leaf am-downshift-level {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme.";

+            }

+            leaf xpic-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case.";

+            }

+            description "none";

+        }

+        typedef polarization-type {

+            type enumeration {

+                enum not-specified {

+                    description "none";

+                }

+                enum horizontal {

+                    description "none";

+                }

+                enum vertical {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef g826-type {

+            type enumeration {

+                enum es {

+                    description "Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::es .";

+                }

+                enum ses {

+                    description "Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::ses .";

+                }

+                enum cses {

+                    description "Consecutive Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::cses .";

+                }

+                enum not-specified {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+		

+        grouping threshold-cross-alarm-type-g {

+            leaf g826-value-kind {

+                type g826-type;

+                description "Kind of performance value that shall be equipped with a threshold alarm.";

+            }

+            leaf granularity-period {

+                type g:granularity-period-type;

+                description "Period of the performance data collection.";

+            }

+            leaf alarm-raising-threshold {

+                type int32;

+                units "s";

+                default -1;

+                description "Number of events required for raising the threshold cross alarm.";

+            }

+            leaf alarm-clearing-threshold {

+                type int32;

+                units "s";

+                default -1;

+                description "Number of events required for clearing the threshold cross alarm.";

+            }

+            description "Allows defining a threshold cross alarm.

+                ";

+        }

+        grouping air-interface-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping air-interface-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping time-x-states-type-g {

+            leaf transmission-mode {

+				type leafref{

+					path '/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id';

+				}

+                config false;

+                description "Operated transmission mode.";

+            }

+            leaf time {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Sum of all seconds the transmitter operated the transmission mode.";

+            }

+            description "none";

+        }

+        grouping air-interface-performance-type-g {

+            leaf es {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of errored seconds.";

+            }

+            leaf ses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of severely errored seconds.";

+            }

+            leaf cses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of consecutive severely errored seconds.";

+            }

+            leaf unavailability {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total time of unavailability in seconds.";

+            }

+            leaf tx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum transmit power. Signed integers are required.";

+            }

+            leaf tx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum transmit power. Signed integers are required.";

+            }

+            leaf tx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged transmit power. Signed integers are required.";

+            }

+            leaf rx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum receive level. Signed integers are required.";

+            }

+            leaf rx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum receive level. Signed integers are required.";

+            }

+            leaf rx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged receive level. Signed integers are required.";

+            }

+            list time-x-states-list {

+				key 'transmission-mode';

+                config false;

+                min-elements 1;

+                uses time-x-states-type-g;

+                description "Time period the transmitter operated in the respective transmission mode.";

+            }

+            leaf time2-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;

+                description "Sum of all seconds the transmitter operated in e.g. BPSK.";

+            }

+            leaf time4-states-s {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;	

+                description "none";

+            }

+            leaf time4-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time8-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time16-states-s {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time16-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time32-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time64-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;

+                description "none";

+            }

+            leaf time128-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time256-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time512-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time512-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;

+                description "none";

+            }

+            leaf time1024-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time1024-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;

+                description "none";

+            }

+            leaf time2048-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time2048-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;

+                description "none";

+            }

+            leaf time4096-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time4096-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time8192-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf time8192-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+				status deprecated;				

+                description "none";

+            }

+            leaf snir-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum signal to (noise+interference) ratio.";

+            }

+            leaf snir-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum signal to (noise+interference) ratio.";

+            }

+            leaf snir-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Averaged signal to (noise+interference) ratio.";

+            }

+            leaf xpd-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum cross polarization discrimination.";

+            }

+            leaf xpd-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum cross polarization discrimination.";

+            }

+            leaf xpd-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Averaged cross polarization discrimination.";

+            }

+            leaf rf-temp-min {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf rf-temp-max {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf rf-temp-avg {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf defect-blocks-sum {

+                type int16;

+                units "blocks";

+                default -1;

+                config false;

+                description "Total number of blocks that were defect after receiving and could not be corrected by the FEC.";

+            }

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period.";

+            }

+            description "Consolidated performance information of the air interface.";

+        }

+        grouping air-interface-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping air-interface-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        typedef protection-type {

+            type enumeration {

+                enum hsb {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef role-type {

+            type enumeration {

+                enum working {

+                    description "none";

+                }

+                enum protection {

+                    description "none";

+                }

+                enum protected {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        grouping diversity-type-g {

+            leaf diversity-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'";

+            }

+            leaf number-of-air-interfaces-max {

+                type int8;

+                units "air interfaces";

+                default 1;

+                config false;

+                description "Maximum number of air interfaces that could be part of this kind of diversity.";

+            }

+            description "none";

+        }

+        typedef air-interface-diversity-status-type {

+            type enumeration {

+                enum group-down {

+                    description "All air interfaces that are members of the diversity configuration are down.";

+                }

+                enum not-all-ai-active {

+                    description "At least one, but not all of the air interfaces that are part of the diversity configuration is not working.";

+                }

+                enum all-ai-active {

+                    description "All air interfaces that are part of the diversity configuration are working.";

+                }

+            }

+            description "none";

+        }

+        grouping air-interface-diversity-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping air-interface-diversity-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping air-interface-diversity-performance-type-g {

+            leaf snir-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum signal to (noise+interference) ratio of the combined signals.";

+            }

+            leaf snir-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum signal to (noise+interference) ratio of the combined signals.";

+            }

+            leaf snir-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Average signal to (noise+interference) ratio of the combined signals.";

+            }

+            description "Consolidated performance information of the air interface diversity group.";

+        }

+        grouping air-interface-diversity-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-diversity-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping air-interface-diversity-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-diversity-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        grouping tdm-structure-type-g {

+            leaf tdm-structure-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf tdm-segment-size {

+                type int32;

+                units "kbit/s";

+                default -1;

+                config false;

+                description "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";

+            }

+            leaf max-number-of-segments-reservable {

+                type int8;

+                units "segments";

+                default -1;

+                config false;

+                description "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface.";

+            }

+            description "none";

+        }

+        grouping structure-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping structure-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping structure-performance-type-g {

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period in seconds.";

+            }

+            leaf es {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf ses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf cses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of consecutive severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf unavailability {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total time of unavailability in seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf rx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            leaf rx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            leaf rx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            description "Consolidated performance information of the Structure.";

+        }

+        grouping structure-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses structure-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping structure-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses structure-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        grouping container-type-g {

+            leaf container-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'ethernet','e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf number-of-time-slots-required {

+                type int16;

+                units "timeslots";

+                default -1;

+                config false;

+                description "Number of time slots required for transporting this type of container. Value must be calculated by the vendor after defining the timeSlotCapacity. For containers of fixed size: numberOfTimeSlotsRequired = required bandwidth of the container divided by timeSlotCapacity. For containers of variable size the minimum (most probably 1) is to be stated.";

+            }

+            leaf tdm-time-slots-is-required {

+                type boolean;

+                default false;

+                config false;

+                description "Shall be set to '1', if this container type requires bandwidth (times slots) reserved for TDM transport.";

+            }

+            leaf bundling-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "If it is possible to combine transport resources of several radio links to transport this container type, this attribute shall be set to '1'.";

+            }

+            description "none";

+        }

+        grouping tdm-container-type-g {

+            leaf tdm-container-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf tdm-container-size {

+                type int32;

+                units "kbit/s";

+                default -1;

+                config false;

+                description "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";

+            }

+            description "none";

+        }

+        grouping segment-id-type-g {

+            leaf structure-id-ref {

+                type core-model:universal-id;

+                description "none";

+            }

+            leaf segment-id-ref {

+                type int16;

+                description "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once.";

+            }

+            description "Identifies the segments, which are used to transport the container.";

+        }

+        grouping segment-status-type-g {

+            leaf segment-status-type-id {

+                type int16;

+                config false;

+                description "none";

+            }

+            leaf segment-is-reserved-for-tdm {

+                type boolean;

+                default false;

+                config false;

+                description "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm.

+                    ";

+            }

+            leaf operational-status {

+                type core-model:operational-state;

+                default disabled;

+                config false;

+                description "Current operational status of each segment.";

+            }

+            leaf obsolete-priority-class {

+                type int8;

+                default -1;

+                config false;

+                description "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank.";

+            }

+            leaf obsolete-drop-order-rank {

+                type int16;

+                default -1;

+                config false;

+                description "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. 

+                    _unique: within Structure::StructureStatus::segmentStatusList";

+            }

+            description "none";

+        }

+        grouping container-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping container-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping container-performance-type-g {

+            leaf tx-ethernet-bytes-max-s {

+                type int32;

+                units "Bytes/s";

+                default -1;

+                config false;

+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf tx-ethernet-bytes-max-m {

+                type int64;

+                units "Bytes/min";

+                default -1;

+                config false;

+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf tx-ethernet-bytes-sum {

+                type int64;

+                units "Bytes";

+                default -1;

+                config false;

+                description "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period in seconds.";

+            }

+            description "Consolidated performance information of the Container.";

+        }

+        grouping container-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses container-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping container-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses container-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+

+    /***********************

+    * package object-classes

+    **********************/ 

+        /***********************

+        * package air-interface

+        **********************/ 

+            list mw-air-interface-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container air-interface-capability {

+                    config false;

+                    uses air-interface-capability-g;

+                    description "none";

+                }

+                container air-interface-configuration {

+                    uses air-interface-configuration-g;

+                    description "none";

+                }

+                container air-interface-status {

+                    config false;

+                    uses air-interface-status-g;

+                    description "none";

+                }

+                container air-interface-current-problems {

+                    config false;

+                    uses air-interface-current-problems-g;

+                    description "none";

+                }

+                container air-interface-current-performance {

+                    config false;

+                    uses air-interface-current-performance-g;

+                    description "none";

+                }

+                container air-interface-historical-performances {

+                    config false;

+                    uses air-interface-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-capability-g {

+                leaf type-of-equipment {

+                    type string;

+                    default "Type of equipment not yet defined.";

+                    config false;

+                    description "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware.";

+                }

+                leaf tx-frequency-min {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the minimum transmit frequency tunable at the air interface.";

+                }

+                leaf tx-frequency-max {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the maximum transmit frequency tunable at the air interface.";

+                }

+                leaf rx-frequency-min {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the minimum receive frequency tunable at the air interface.";

+                }

+                leaf rx-frequency-max {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the maximum receive frequency tunable at the air interface.";

+                }

+                leaf adaptive-modulation-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the device is capable of adaptive modulation, this field shall contain a 'true'.";

+                }

+                leaf mimo-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the device is capable of MIMO, this field shall contain a 'true'.";

+                }

+                leaf mimo-channels {

+                    type int8;

+                    units "channels";

+                    default 1;

+                    config false;

+                    description "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration.";

+                }

+                leaf alic-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'.";

+                }

+                leaf atpc-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the microwave radio is capable of ATPC, this field shall contain a 'true'.";

+                }

+                leaf atpc-range {

+                    type int8;

+                    units "dB";

+                    default 0;

+                    config false;

+                    description "Extent of the ATPC range. This value represents a device specific maximum value. The actual range of the ATPC at a specific link might be limited by the difference between configured transmit power (AirInterface::AirInterfaceConfiguration::txPower) and minimum transmit power of the device (TypeDefinitions::TransmissionModeType::txPowerMin).";

+                }

+                leaf encryption-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Shall be marked 'true', if payload encryption is available.";

+                }

+                leaf-list supported-loop-back-kind-list {

+                    type loop-back-type;

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    description "List of supported kinds of looping back of header information to the remote site.";

+                }

+                leaf maintenance-timer-range {

+                    type string;

+                    units "s";

+                    default "Range of the maintenance timer not yet defined.";

+                    config false;

+                    description "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 7;

+                    description "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','signalIDMismatching','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas.";

+                }

+                list supported-channel-plan-list {

+                    key 'supported-channel-plan';

+                    config false;

+                    min-elements 1;

+                    uses channel-plan-type-g;

+                    description "List of channel spacing that are supported by the device.";

+                }

+                description "Describes the 'analog' capabilities of modem and transmitter of the microwave device. Value ranges of attributes are not independently (e.g. min. and max. transmit power depends on modulation). Legal combinations of values are expressed in transmissionModeTypes.";

+            }

+            grouping air-interface-configuration-g {

+                leaf air-interface-name {

+                    type string;

+                    default "Air interface ID not yet defined.";

+                    description "Operator specific microwave link ID (often used for coding area, type of element and sequential number).";

+                }

+                leaf remote-air-interface-name {

+                    type string;

+                    default "Air interface ID at the remote site not yet defined.";

+                    description "Name of the air interface, which belongs to the same link, at the remote site.";

+                }

+                leaf expected-signal-id {

+                    type int16;

+                    description "If set on '0', the receiver ignores the signal ID of the received signal. If set on any other value, the receiver exclusively synchronizes on signals with the same signal ID.";

+                }

+                leaf transmitted-signal-id {

+                    type int16;

+                    description "Transmitted radio signal ID for synchronizing the receiver.";

+                }

+                leaf radio-signal-id {

+                    type string;

+                    default "Radio signal ID not yet defined.";

+					status deprecated;

+                    description "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check.";

+                }

+                leaf tx-frequency {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable.";

+                }

+                leaf rx-frequency {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Center frequency of the receive channel.";

+                }

+                leaf transmission-mode-min {

+					type core-model:universal-id;

+                    description "Minimum transmission mode to be configured (in case adaptive modulation is not used, this value represents also the fixed transmission mode).";

+                }

+                leaf transmission-mode-max {

+					type core-model:universal-id;

+                    description "Maximum transmission mode to be configured.";

+                }

+                leaf tx-channel-bandwidth {

+                    type int32;

+                    units "kHz";

+                    default -1;

+					status deprecated;

+                    description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+                }

+                leaf rx-channel-bandwidth {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+                }

+                leaf polarization {

+                    type polarization-type;

+                    default not-specified;

+                    description "Allows documenting the polarization of the air interface.";

+                }

+                leaf power-is-on {

+                    type boolean;

+                    default true;

+                    description "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'.";

+                }

+                leaf transmitter-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of the transmitter inside the radio shall be expressed as a 'true'.";

+                }

+                leaf receiver-is-on {

+                    type boolean;

+                    default true;

+                    description "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations.

+                        ";

+                }

+                leaf tx-power {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    description "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC.";

+                }

+                leaf adaptive-modulation-is-on {

+                    type boolean;

+                    default false;

+                    description "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'.";

+                }

+                leaf modulation-min {

+                    type int16;

+                    units "symbols";

+                    default -1;

+					status deprecated;

+                    description "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf modulation-max {

+                    type int16;

+                    units "symbols";

+                    default -1;

+					status deprecated;

+                    description "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf xpic-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'.";

+                }

+                leaf mimo-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'.";

+                }

+                leaf alic-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'.";

+                }

+                leaf atpc-is-on {

+                    type boolean;

+                    default false;

+                    description "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'.";

+                }

+                leaf atpc-thresh-upper {

+                    type int16;

+                    units "dBm";

+                    default 99;

+                    description "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power.";

+                }

+                leaf atpc-thresh-lower {

+                    type int16;

+                    units "dBm";

+                    default 99;

+                    description "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power.";

+                }

+                leaf atpc-tx-power-min {

+                    type int8;

+                    units "dBm";

+                    default -99;

+                    description "Transmit power, which is not to be undercut, while operating ATPC.";

+                }

+                leaf auto-freq-select-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'.";

+                }

+                leaf auto-freq-select-range {

+                    type int8;

+                    units "channels";

+                    default -1;

+                    description "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen. ";

+                }

+                leaf modulation-is-on {

+                    type boolean;

+                    default true;

+                    description "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'.";

+                }

+                leaf encryption-is-on {

+                    type boolean;

+                    default false;

+                    description "Activates encryption of the payload.";

+                }

+                leaf cryptographic-key {

+                    type string;

+                    default "Cryptographic key not yet defined.";

+                    description "Key for transforming plaintext into ciphertext data.";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list threshold-cross-alarm-list {

+                    key 'g826-value-kind granularity-period';

+                    max-elements 6;

+                    uses threshold-cross-alarm-type-g;

+                    description "List of threshold cross alarms to be configured.";

+                }

+                leaf loop-back-kind-on {

+                    type loop-back-type;

+                    default none;

+                    description "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";

+                }

+                leaf maintenance-timer {

+                    type int32;

+                    units "s";

+                    default -1;

+                    description "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 6;

+                    uses air-interface-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "Configuration of the radio link.";

+            }

+            grouping air-interface-status-g {

+                leaf tx-frequency-cur {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Center frequency of the currently operated transmit channel.";

+                }

+                leaf rx-frequency-cur {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Center frequency of the currently operated receive channel.";

+                }

+                leaf tx-level-cur {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    config false;

+                    description "Current transmit level.";

+                }

+                leaf rx-level-cur {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    config false;

+                    description "Current receive level.";

+                }

+                leaf transmission-mode-cur {

+					type leafref {

+						path '/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id';

+					}    

+					config false;

+                    description "Currently operated transmission mode according to definitions in Capabilities.";

+                }

+                leaf modulation-cur {

+                    type int16;

+                    units "symbols";

+                    default -1;

+                    config false;

+					status deprecated;

+                    description "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf code-rate-cur {

+                    type int8;

+                    units "%";

+                    default -1;

+                    config false;

+					status deprecated;

+                    description "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate).";

+                } 

+                leaf received-signal-id {

+                    type int16;

+                    default -1;

+                    config false;

+                    description "ID of the signal, which the receiver is currently synchronized on.";

+                }

+                leaf snir-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured signal to (noise+interference) ratio.";

+                }

+                leaf xpd-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured cross polarization discrimination.";

+                }

+                leaf rf-temp-cur {

+                    type int8;

+                    units "Celsius";

+                    default -99;

+                    config false;

+                    description "Current temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Air Interface entered its current operational status.  ";

+                }

+                leaf radio-power-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If the radio unit has power and is switched on, this shall be expressed as a 'true'.";

+                }

+                leaf link-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'.";

+                }

+                leaf xpic-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf mimo-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf alic-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf atpc-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf auto-freq-select-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf loop-back-kind-up {

+                    type loop-back-type;

+                    default none;

+                    config false;

+                    description "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";

+                }

+                leaf local-end-point-id {

+                    type string;

+                    default "not-supported";

+                    config false;

+                    description "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link.";

+                }

+                leaf remote-end-point-id {

+                    type string;

+                    default "not-supported";

+                    config false;

+                    description "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link.";

+                }

+                description "Measurements of current values on the air interface and operational status of the device.";

+            }

+            grouping air-interface-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses air-interface-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses air-interface-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the air interface at a particular moment.";

+            }

+            grouping air-interface-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses air-interface-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the air interface for a pre-defined measurement interval.";

+            }

+            list co-channel-group {

+                key 'co-channel-group-id';

+                uses co-channel-group-g;

+                description "none";

+            }

+            grouping co-channel-group-g {

+                leaf co-channel-group-id {

+                    type core-model:universal-id;

+                    description "none";

+                }

+                leaf-list air-interface-list {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+                    description "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group.";

+                }

+                leaf sort-of-co-channel-group {

+                    type string;

+                    default "Kind of co-channel group not specified.";

+                    description "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';";

+                }

+                leaf-list logical-termination-point {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+					status deprecated;

+                    description "none";

+                }

+                description "Required for configuring XPIC, MIMO and ALIC.";

+            }

+

+        /***********************

+        * package air-interface-hsb

+        **********************/ 

+            list mw-air-interface-hsb-end-point-pac {

+                key 'endpoint';

+                leaf role {

+                    type role-type;

+                    default working;

+                    description "none";

+                }

+                leaf endpoint {

+                    type leafref {

+                        path '/core-model:forwarding-construct/core-model:fc-port/core-model:uuid';

+                    }

+                    description "none";

+                }

+                description "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC.  The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.";

+            }

+            list mw-air-interface-hsb-fc-switch-pac {

+                key 'fcswitch';

+                leaf prot-type {

+                    type protection-type;

+                    default hsb;

+                    description "Indicates the protection scheme that is used for the ProtectionGroup.";

+                }

+                leaf air-interface-hsb-configuration-is-faulty-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity of an airInterfaceHsbConfigurationIsFaulty alarm shall be chosen from an enumeration.";

+                }

+                leaf air-interface-hsb-is-partly-down-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity for one link out of the HSB configuration being down shall be chosen from an enumeration.";

+                }

+                leaf air-interface-hsb-is-down-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity of the total HSB configuration being down shall be chosen from an enumeration.";

+                }

+                leaf fcswitch {

+                    type leafref {

+                        path '/core-model:forwarding-construct/core-model:fc-switch/core-model:uuid';

+                    }

+                    description "none";

+                }

+                description "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as  1+1 ane 1:1).  May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state.";

+            }

+

+        /***********************

+        * package air-interface-diversity

+        **********************/ 

+            list mw-air-interface-diversity-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container air-interface-diversity-capability {

+                    config false;

+                    uses air-interface-diversity-capability-g;

+                    description "none";

+                }

+                container air-interface-diversity-configuration {

+                    uses air-interface-diversity-configuration-g;

+                    description "none";

+                }

+                container air-interface-diversity-status {

+                    config false;

+                    uses air-interface-diversity-status-g;

+                    description "none";

+                }

+                container air-interface-diversity-current-problems {

+                    config false;

+                    uses air-interface-diversity-current-problems-g;

+                    description "none";

+                }

+                container air-interface-diversity-current-performance {

+                    config false;

+                    uses air-interface-diversity-current-performance-g;

+                    description "none";

+                }

+                container air-interface-diversity-historical-performances {

+                    config false;

+                    uses air-interface-diversity-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-capability-g {

+                list available-kinds-of-diversity {

+                    key 'diversity-name';

+                    config false;

+                    uses diversity-type-g;

+                    description "Available types of diversity to be listed.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas.";

+                }

+                description "Describes the capabilities in implementing different types of air interface diversity.";

+            }

+            grouping air-interface-diversity-configuration-g {

+                container air-interface-diversity {

+                    uses diversity-type-g;

+                    description "Type of air interface diversity configured at the link.";

+                }

+                leaf-list air-interface-ltp-list {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+                    min-elements 2;

+                    description "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list threshold-cross-alarm-list {

+                    key 'g826-value-kind granularity-period';

+                    max-elements 6;

+                    uses threshold-cross-alarm-type-g;

+                    description "List of threshold cross alarms to be configured.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 3;

+                    uses air-interface-diversity-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-status-g {

+                leaf snir-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured signal to (noise+interference) ratio of the combined signals.";

+                }

+                leaf air-interface-diversity-status {

+                    type air-interface-diversity-status-type;

+                    default group-down;

+                    config false;

+                    description "Status of the air interface bundle. ";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Diversity Group entered its current operational status.  ";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses air-interface-diversity-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses air-interface-diversity-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the air interface diversity configuration at a particular moment.";

+            }

+            grouping air-interface-diversity-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses air-interface-diversity-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the air interface diversity configuration for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package pure-ethernet-structure

+        **********************/ 

+            list mw-pure-ethernet-structure-pac {

+                if-feature pure-ethernet;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container pure-ethernet-structure-capability {

+                    config false;

+                    uses pure-ethernet-structure-capability-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-configuration {

+                    uses pure-ethernet-structure-configuration-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-status {

+                    config false;

+                    uses pure-ethernet-structure-status-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-current-problems {

+                    config false;

+                    uses pure-ethernet-structure-current-problems-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-current-performance {

+                    config false;

+                    uses pure-ethernet-structure-current-performance-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-historical-performances {

+                    config false;

+                    uses pure-ethernet-structure-historical-performances-g;

+                    description "none";

+                }

+                description "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only.";

+            }

+            grouping pure-ethernet-structure-capability-g {

+                leaf structure-id {

+                    type core-model:universal-id;

+                    config false;

+                    description "Identifies the Structure for bundling and container.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";

+                }

+                description "Describes the logical structuring of the physical capacity provided by a pure Ethernet microwave device. Segmentation is not available. No fixed segment size. No TDM transport.";

+            }

+            grouping pure-ethernet-structure-configuration-g {

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    uses structure-problem-severity-type-g;

+                    description "Severity of the type of problem to be configured.";

+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-status-g {

+                container segment-status-list {

+                    config false;

+                    uses segment-status-type-g;

+                    description "Status of the Ethernet transport segment. Always just one segment.";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the last update of the status information.  ";

+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses structure-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses structure-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the structure of an pure Ethernet microwave at a particular moment.";

+            }

+            grouping pure-ethernet-structure-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses structure-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the structure of an pure Ethernet microwave for a pre-defined measurement interval.";

+            }

+            feature pure-ethernet {

+                description "Feature 'pure-ethernet' is mandatory for device types transporting pure Ethernet.";

+            }

+

+        /***********************

+        * package hybrid-mw-structure

+        **********************/ 

+            list mw-hybrid-mw-structure-pac {

+                if-feature hybrid-microwave;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container hybrid-mw-structure-capability {

+                    config false;

+                    uses hybrid-mw-structure-capability-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-configuration {

+                    uses hybrid-mw-structure-configuration-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-status {

+                    config false;

+                    uses hybrid-mw-structure-status-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-current-problems {

+                    config false;

+                    uses hybrid-mw-structure-current-problems-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-current-performance {

+                    config false;

+                    uses hybrid-mw-structure-current-performance-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-historical-performances {

+                    config false;

+                    uses hybrid-mw-structure-historical-performances-g;

+                    description "none";

+                }

+                description "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic.";

+            }

+            grouping hybrid-mw-structure-capability-g {

+                leaf structure-id {

+                    type core-model:universal-id;

+                    config false;

+                    description "Identifies the Structure for bundling and container.";

+                }

+                list supported-tdm-structure-types-list {

+                    key 'tdm-structure-name';

+                    config false;

+                    min-elements 1;

+                    uses tdm-structure-type-g;

+                    description "Lists the TDM frame types that are supported.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";

+                }

+                description "Describes the logical structuring of the physical capacity provided by a hybrid microwave device (TDM + Ethernet). Segmentation is available. TDM transport is available.";

+            }

+            grouping hybrid-mw-structure-configuration-g {

+                container structure-kind {

+                    uses tdm-structure-type-g;

+                    description "TDM frame to be applied.";

+                }

+                container structure-type {

+                    uses tdm-structure-type-g;

+					status deprecated;

+                    description "TDM frame to be applied.";

+                }

+                leaf number-of-tdm-segments-to-be-reserved {

+                    type int16;

+                    default -1;

+                    description "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    uses structure-problem-severity-type-g;

+                    description "Severity of the type of problem to be configured.";

+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-status-g {

+                list segment-status-list {

+                    key 'segment-status-type-id';

+                    config false;

+                    uses segment-status-type-g;

+                    description "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the last update of the status information.  ";

+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses structure-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses structure-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the structure of a hybrid microwave at a particular moment.";

+            }

+            grouping hybrid-mw-structure-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses structure-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the structure of a hybrid microwave for a pre-defined measurement interval.";

+            }

+            feature hybrid-microwave {

+                description "Feature 'hybrid-microwave' is mandatory for device types transporting Ethernet + TDM.";

+            }

+

+        /***********************

+        * package ethernet-container

+        **********************/ 

+            list mw-ethernet-container-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container ethernet-container-capability {

+                    config false;

+                    uses ethernet-container-capability-g;

+                    description "none";

+                }

+                container ethernet-container-configuration {

+                    uses ethernet-container-configuration-g;

+                    description "none";

+                }

+                container ethernet-container-status {

+                    config false;

+                    uses ethernet-container-status-g;

+                    description "none";

+                }

+                container ethernet-container-current-problems {

+                    config false;

+                    uses ethernet-container-current-problems-g;

+                    description "none";

+                }

+                container ethernet-container-current-performance {

+                    config false;

+                    uses ethernet-container-current-performance-g;

+                    description "none";

+                }

+                container ethernet-container-historical-performances {

+                    config false;

+                    uses ethernet-container-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping ethernet-container-capability-g {

+                leaf bundling-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container.";

+                }

+                leaf packet-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans.";

+                }

+                leaf layer2-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 2 available at the device.";

+                }

+                leaf vlan-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on VLAN layer available at the device.";

+                }

+                leaf q-in-q-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer of a second VLAN available at the device.";

+                }

+                leaf mpls-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on mpls layer available at the device.";

+                }

+                leaf ipv4-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 3 for IPv4 available at the device.";

+                }

+                leaf ipv6-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 3 for IPv6 available at the device.";

+                }

+                leaf layer4-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 4 (TCP and UDP header) available at the device.";

+                }

+                leaf encryption-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Shall be marked 'true', if Ethernet payload encryption is available.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";

+                }

+                description "none";

+            }

+            grouping ethernet-container-configuration-g {

+                leaf container-id {

+                    type string;

+                    default "No Ethernet Flow associated yet.";

+                    description "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller.";

+                }

+                list segments-id-list {

+                    key 'structure-id-ref segment-id-ref';

+                    min-elements 1;

+                    uses segment-id-type-g;

+                    description "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list.";

+                }

+                leaf packet-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum.";

+                }

+                leaf layer2-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 2 configured at the device.";

+                }

+                leaf vlan-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on VLAN layer configured at the device.";

+                }

+                leaf q-in-q-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer of a second VLAN configured at the device.";

+                }

+                leaf mpls-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on MPLS layer configured at the device.";

+                }

+                leaf ipv4-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 3 for IPv4 configured at the device.";

+                }

+                leaf ipv6-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 3 for IPv6 configured at the device.";

+                }

+                leaf layer4-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 4 (TCP and UDP header) configured at the device.";

+                }

+                leaf encryption-is-on {

+                    type boolean;

+                    default false;

+                    description "Activates encryption of the Ethernet payload.";

+                }

+                leaf cryptographic-key {

+                    type string;

+                    default "Cryptographic key not yet defined.";

+                    description "Key for transforming plaintext into cipher text data.";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 2;

+                    uses container-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping ethernet-container-status-g {

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Container entered its current operational status.  ";

+                }

+                description "none";

+            }

+            grouping ethernet-container-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses container-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping ethernet-container-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses container-current-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the Ethernet container at a particular moment.";

+            }

+            grouping ethernet-container-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses container-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the Ethernet container for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package tdm-container

+        **********************/ 

+            list mw-tdm-container-pac {

+                if-feature hybrid-microwave;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container tdm-container-capability {

+                    config false;

+                    uses tdm-container-capability-g;

+                    description "none";

+                }

+                container tdm-container-configuration {

+                    uses tdm-container-configuration-g;

+                    description "none";

+                }

+                container tdm-container-status {

+                    config false;

+                    uses tdm-container-status-g;

+                    description "none";

+                }

+                container tdm-container-current-problems {

+                    config false;

+                    uses tdm-container-current-problems-g;

+                    description "none";

+                }

+                container tdm-container-current-performance {

+                    config false;

+                    uses tdm-container-current-performance-g;

+                    description "none";

+                }

+                container tdm-container-historical-performances {

+                    config false;

+                    uses tdm-container-historical-performances-g;

+                    description "none";

+                }

+                description "The TdmContainer_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM traffic.";

+            }

+            grouping tdm-container-capability-g {

+                list supported-tdm-container-types-list {

+                    key 'tdm-container-name';

+                    config false;

+                    min-elements 1;

+                    uses tdm-container-type-g;

+                    description "Lists the TDM containers that are supported.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+					status deprecated;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";

+                }

+                description "Bundling is not available.";

+            }

+            grouping tdm-container-configuration-g {

+                leaf container-id {

+                    type string;

+                    default "No TDM Flow associated yet.";

+                    description "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller.";

+                }

+                container container-type {

+                    uses tdm-container-type-g;

+                    description "Type of TDM container.";

+                }

+                container segment-id {

+                    uses segment-id-type-g;

+                    description "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 2;

+                    uses container-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping tdm-container-status-g {

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Container entered its current operational status.  ";

+                }

+                description "none";

+            }

+            grouping tdm-container-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses container-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping tdm-container-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses container-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the TDM container at a particular moment.";

+            }

+            grouping tdm-container-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses container-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the TDM container for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package super-classes

+        **********************/ 

+            grouping mw-current-problem-g {

+                leaf sequence-number {

+                    type int32;

+                    config false;

+                    description "Unique sequence number of the current problem object.";

+                }

+                leaf time-stamp {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the problem.  ";

+                }

+                leaf problem-severity {

+                    type severity-type;

+                    default warning;

+                    config false;

+                    description "Severity of the alarm.";

+                }

+                description "none";

+            }

+

+

+    /***********************

+    * package notifications

+    **********************/ 

+        notification object-creation-notification {

+            uses object-creation-notification-g;

+            description "none";

+        }

+        grouping object-creation-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts object creation notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf object-type {

+                type string;

+                default "Type of created object not specified.";

+                description "Type of Object to be chosen from the following list of values: 'MW_AirInterface_Pac', 'MW_AirInterfaceDiversity_Pac', 'MW_Structure_Pac', 'MW_PureEthernetStructure_Pac', 'MW_HybridMwStructure_Pac', 'MW_Container_Pac', 'MW_EthernetContainer_Pac' or 'MW_TdmContainer_Pac'.";

+            }

+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac has to be instancieted in the controller.";

+        }

+        notification object-deletion-notification {

+            uses object-deletion-notification-g;

+            description "none";

+        }

+        grouping object-deletion-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts object deletion notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac instance has to be deleted in the controller.";

+        }

+        notification attribute-value-changed-notification {

+            uses attribute-value-changed-notification-g;

+            description "none";

+        }

+        grouping attribute-value-changed-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts attribute value changed notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf attribute-name {

+                type string;

+                default "Attribute name not specified.";

+                description "Name of the attribute that has been changed.";

+            }

+            leaf new-value {

+                type string;

+                default "New value not specified.";

+                description "Attribute value converted to a string (xml, json, ...)";

+            }

+            description "To be sent when an attribute has changed and one or more controllers have to update their data.";

+        }

+        notification problem-notification {

+            uses problem-notification-g;

+            description "none";

+        }

+        grouping problem-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts problem notifications";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf problem {

+                type string;

+                default "Problem name not specified.";

+                description "Name of the problem according to AirInterface::AirInterfaceCapability::supportedAlarms or AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms or Structure::StructureCapability::supportedAlarms or PureEthernetStructure::PureEthernetStructureCapability::supportedAlarms or HybridMwStructure::HybridMwStructureCapability::supportedAlarms or Container::ContainerCapability::supportedAlarms or EthernetContainer::EthernetContainerCapability::supportedAlarms or TdmContainer::TdmContainerCapability::supportedAlarms.";

+            }

+            leaf severity {

+                type severity-type;

+                default warning;

+                description "Severity of the problem according to AirInterface::AirInterfaceConfiguration::problemSeverityList, AirInterfaceDiversity::AirInterfaceDiversityConfiguration::problemSeverityList, Structure::StructureConfiguration::problemSeverityList, PureEthernetStructure::PureEthernetStructureConfiguration::problemSeverityList, HybridMwStructure::HybridMwStructureConfiguration::problemSeverityList, Container::ContainerConfiguration::problemSeverityList, EthernetContainer::EthernetContainerConfiguration::problemSeverityList or TdmContainer::TdmContainerConfiguration::problemSeverityList";

+            }

+            description "To be sent when a problem occurs at a MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+        }

+

+}

diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-10-10.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-10-10.yang
new file mode 100644
index 000000000..d13122d28
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/microwave-model@2018-10-10.yang
@@ -0,0 +1,3581 @@
+module microwave-model {

+    namespace "urn:onf:params:xml:ns:yang:microwave-model";

+    prefix microwave-model;
+
+    import core-model {
+        prefix core-model;
+    }
+    import g.874.1-model {
+        prefix g;
+    }
+    import ietf-yang-types {
+        prefix yang;
+    }
+

+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";

+    contact "WG Web: <https://www.opennetworking.org/software-defined-standards/models-apis/>

+             WG List:  <mailto:wireless-transport@login.opennetworking.org>

+             WG Chair: Lyndon Ong

+                       <mailto:lyong@ciena.com>

+             WG Chair: Giorgio Cazzaniga

+                       <mailto:giorgio.cazzaniga@sm-optics.com>

+             Editors:  Thorsten Heinze

+                       <mailto:thorsten.heinze@telefonica.com>

+                       Shrikanth Malavalli Divakar

+                       <mailto:shrikanth.divakar@wipro.com>";					   

+    description "This module contains a collection of YANG definitions for managing wireless networks.

+        This model is for vendor agnostic management of wireless network elements.";

+    revision 2018-10-10 {

+        description "Version 1.1";

+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";

+    }

+    revision 2017-03-24 {

+        description "Initial version";

+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";

+    }

+    /***********************

+    * package type-definitions

+    **********************/ 

+        typedef loop-back-type {

+            type enumeration {

+                enum rf-to-remote {

+                    description "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units.";

+                }

+                enum rf-to-local {

+                    description "Returning the header information of the local site back to the local site on the radio interface between both outdoor units.";

+                }

+                enum if-to-remote {

+                    description "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit.";

+                }

+                enum if-to-local {

+                    description "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit.";

+                }

+                enum none {

+                    description "none";

+                }

+                enum if {

+		    status deprecated;

+                    description "Intermediate Frequency on the interface between indoor and outdoor unit.";

+                }

+                enum rf {

+		    status deprecated;

+                    description "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site.";

+                }

+            }

+            description "none";

+        }

+        typedef severity-type {

+            type enumeration {

+                enum non-alarmed {

+                    description "none";

+                }

+                enum warning {

+                    description "none";

+                }

+                enum minor {

+                    description "none";

+                }

+                enum major {

+                    description "none";

+                }

+                enum critical {

+                    description "none";

+                }

+            }

+            description "According to ITU-T M.3160";

+        }

+        grouping channel-plan-type-g {

+            leaf supported-channel-plan {

+                type string;

+                config false;

+                description "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database.";

+            }

+            leaf duplex-distance-is-variable {

+                type boolean;

+                default false;

+                config false;

+                description "To be set on  'true', if the distance between transmitted and received frequency is variable.";

+            }

+            leaf-list duplex-distance-list {

+                type int32;

+                units "kHz";

+                config false;

+                min-elements 1;

+                description "Distance between transmitted and received frequency. To be filled with single value, in case duplex distance is not variable. To be filled with all configurable values, in case duplex distance is variable.";

+            }

+            leaf duplex-distance {

+                type int32;

+                units "kHz";

+                default -1;

+                config false;

+		status deprecated;

+                description "Distance between transmitted and received frequency.";

+            }

+            leaf auto-freq-select-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'.";

+            }

+            list transmission-mode-list {

+                key 'transmission-mode-id';

+                config false;

+                min-elements 1;

+                uses transmission-mode-type-g;

+                description "none";

+            }

+            description "none";

+        }

+        grouping transmission-mode-type-g {

+            leaf transmission-mode-id {

+                type core-model:universal-id;

+                description "Indentifies the transmissionMode for internal reference.";

+            }

+            leaf transmission-mode-name {

+                type string;

+                default "Name of the transmission mode not yet defined.";

+                config false;

+                description "Name of the transmission mode. BBBB-m*-i*/t*-r*. B=four digits of channel bandwidth in MHz. m*=required number of digits for modulation name. (i*/t*=code rate.) i*=required number of digits for number of information bits. t*=required number of digits for total bits. r*=required number of digits for rate reduction factor. Example: 028-4QAM-188/204-1";

+            }

+            leaf channel-bandwidth {

+                type int32;

+                units "kHz";

+                default -1;

+                config false;

+                description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+            }

+            leaf modulation-scheme {

+                type int16;

+                units "symbols";

+                default -1;

+                config false;

+                description "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256').";

+            }

+            leaf code-rate {

+                type int8;

+                units "%";

+                default -1;

+                config false;

+                description "Code rate of the coding scheme in % (Net bit rate ≤ Gross bit rate · code rate).";

+            }

+            leaf symbol-rate-reduction-factor {

+                type int8;

+                default 1;

+                config false;

+                description "Reduction factor for the symbol rate. Example: value would be 4 for 1/4BPSK.";

+            }

+            leaf tx-power-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the minimum transmit power the modem can operate in dBm.";

+            }

+            leaf tx-power-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the maximum transmit power the modem can operate in dBm.";

+            }

+            leaf rx-threshold {

+                type int16;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less.";

+            }

+            leaf am-upshift-level {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level that has to be exceeded to shift into a higher modulation scheme.";

+            }

+            leaf am-downshift-level {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme.";

+            }

+            leaf xpic-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case.";

+            }

+            description "none";

+        }

+        typedef polarization-type {

+            type enumeration {

+                enum not-specified {

+                    description "none";

+                }

+                enum horizontal {

+                    description "none";

+                }

+                enum vertical {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef g826-type {

+            type enumeration {

+                enum es {

+                    description "Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::es .";

+                }

+                enum ses {

+                    description "Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::ses .";

+                }

+                enum cses {

+                    description "Consecutive Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::cses .";

+                }

+                enum not-specified {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+		

+        grouping threshold-cross-alarm-type-g {

+            leaf g826-value-kind {

+                type g826-type;

+                description "Kind of performance value that shall be equipped with a threshold alarm.";

+            }

+            leaf granularity-period {

+                type g:granularity-period-type;

+                description "Period of the performance data collection.";

+            }

+            leaf alarm-raising-threshold {

+                type int32;

+                units "s";

+                default -1;

+                description "Number of events required for raising the threshold cross alarm.";

+            }

+            leaf alarm-clearing-threshold {

+                type int32;

+                units "s";

+                default -1;

+                description "Number of events required for clearing the threshold cross alarm.";

+            }

+            description "Allows defining a threshold cross alarm.

+                ";

+        }

+        grouping air-interface-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping air-interface-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping time-x-states-type-g {

+            leaf transmission-mode {

+		type leafref{

+			path '/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id';

+		}

+                config false;

+                description "Operated transmission mode.";

+            }

+            leaf time {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Sum of all seconds the transmitter operated the transmission mode.";

+            }

+            description "none";

+        }

+        grouping air-interface-performance-type-g {

+            leaf es {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of errored seconds.";

+            }

+            leaf ses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of severely errored seconds.";

+            }

+            leaf cses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of consecutive severely errored seconds.";

+            }

+            leaf unavailability {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total time of unavailability in seconds.";

+            }

+            leaf tx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum transmit power. Signed integers are required.";

+            }

+            leaf tx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum transmit power. Signed integers are required.";

+            }

+            leaf tx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged transmit power. Signed integers are required.";

+            }

+            leaf rx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum receive level. Signed integers are required.";

+            }

+            leaf rx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum receive level. Signed integers are required.";

+            }

+            leaf rx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged receive level. Signed integers are required.";

+            }

+            list time-x-states-list {

+                key 'transmission-mode';

+                config false;

+                min-elements 1;

+                uses time-x-states-type-g;

+                description "Time period the transmitter operated in the respective transmission mode.";

+            }

+            leaf time2-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;

+                description "Sum of all seconds the transmitter operated in e.g. BPSK.";

+            }

+            leaf time4-states-s {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;	

+                description "none";

+            }

+            leaf time4-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time8-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time16-states-s {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time16-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time32-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time64-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;

+                description "none";

+            }

+            leaf time128-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time256-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time512-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time512-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;

+                description "none";

+            }

+            leaf time1024-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time1024-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;

+                description "none";

+            }

+            leaf time2048-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time2048-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;

+                description "none";

+            }

+            leaf time4096-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time4096-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time8192-states {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf time8192-states-l {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+		status deprecated;				

+                description "none";

+            }

+            leaf snir-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum signal to (noise+interference) ratio.";

+            }

+            leaf snir-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum signal to (noise+interference) ratio.";

+            }

+            leaf snir-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Averaged signal to (noise+interference) ratio.";

+            }

+            leaf xpd-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum cross polarization discrimination.";

+            }

+            leaf xpd-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum cross polarization discrimination.";

+            }

+            leaf xpd-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Averaged cross polarization discrimination.";

+            }

+            leaf rf-temp-min {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf rf-temp-max {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf rf-temp-avg {

+                type int8;

+                units "C";

+                default -99;

+                config false;

+                description "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+            }

+            leaf defect-blocks-sum {

+                type int16;

+                units "blocks";

+                default -1;

+                config false;

+                description "Total number of blocks that were defect after receiving and could not be corrected by the FEC.";

+            }

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period.";

+            }

+            description "Consolidated performance information of the air interface.";

+        }

+        grouping air-interface-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping air-interface-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        typedef protection-type {

+            type enumeration {

+                enum hsb {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef role-type {

+            type enumeration {

+                enum working {

+                    description "none";

+                }

+                enum protection {

+                    description "none";

+                }

+                enum protected {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        grouping diversity-type-g {

+            leaf diversity-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'";

+            }

+            leaf number-of-air-interfaces-max {

+                type int8;

+                units "air interfaces";

+                default 1;

+                config false;

+                description "Maximum number of air interfaces that could be part of this kind of diversity.";

+            }

+            description "none";

+        }

+        typedef air-interface-diversity-status-type {

+            type enumeration {

+                enum group-down {

+                    description "All air interfaces that are members of the diversity configuration are down.";

+                }

+                enum not-all-ai-active {

+                    description "At least one, but not all of the air interfaces that are part of the diversity configuration is not working.";

+                }

+                enum all-ai-active {

+                    description "All air interfaces that are part of the diversity configuration are working.";

+                }

+            }

+            description "none";

+        }

+        grouping air-interface-diversity-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping air-interface-diversity-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping air-interface-diversity-performance-type-g {

+            leaf snir-min {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Minimum signal to (noise+interference) ratio of the combined signals.";

+            }

+            leaf snir-max {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Maximum signal to (noise+interference) ratio of the combined signals.";

+            }

+            leaf snir-avg {

+                type int8;

+                units "dB";

+                default -99;

+                config false;

+                description "Average signal to (noise+interference) ratio of the combined signals.";

+            }

+            description "Consolidated performance information of the air interface diversity group.";

+        }

+        grouping air-interface-diversity-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-diversity-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping air-interface-diversity-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses air-interface-diversity-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        grouping tdm-structure-type-g {

+            leaf tdm-structure-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf tdm-segment-size {

+                type int32;

+                units "kbit/s";

+                default -1;

+                config false;

+                description "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";

+            }

+            leaf max-number-of-segments-reservable {

+                type int8;

+                units "segments";

+                default -1;

+                config false;

+                description "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface.";

+            }

+            description "none";

+        }

+        grouping structure-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping structure-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to Structure::StructureCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping structure-performance-type-g {

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period in seconds.";

+            }

+            leaf es {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf ses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf cses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Number of consecutive severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf unavailability {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total time of unavailability in seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals.";

+            }

+            leaf rx-level-min {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Minimum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            leaf rx-level-max {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Maximum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            leaf rx-level-avg {

+                type int8;

+                units "dBm";

+                default 99;

+                config false;

+                description "Averaged receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value.";

+            }

+            description "Consolidated performance information of the Structure.";

+        }

+        grouping structure-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses structure-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping structure-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses structure-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        grouping container-type-g {

+            leaf container-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'ethernet','e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf number-of-time-slots-required {

+                type int16;

+                units "timeslots";

+                default -1;

+                config false;

+                description "Number of time slots required for transporting this type of container. Value must be calculated by the vendor after defining the timeSlotCapacity. For containers of fixed size: numberOfTimeSlotsRequired = required bandwidth of the container divided by timeSlotCapacity. For containers of variable size the minimum (most probably 1) is to be stated.";

+            }

+            leaf tdm-time-slots-is-required {

+                type boolean;

+                default false;

+                config false;

+                description "Shall be set to '1', if this container type requires bandwidth (times slots) reserved for TDM transport.";

+            }

+            leaf bundling-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "If it is possible to combine transport resources of several radio links to transport this container type, this attribute shall be set to '1'.";

+            }

+            description "none";

+        }

+        grouping tdm-container-type-g {

+            leaf tdm-container-name {

+                type string;

+                config false;

+                description "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'";

+            }

+            leaf tdm-container-size {

+                type int32;

+                units "kbit/s";

+                default -1;

+                config false;

+                description "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;";

+            }

+            description "none";

+        }

+        grouping segment-id-type-g {

+            leaf structure-id-ref {

+                type core-model:universal-id;

+                description "none";

+            }

+            leaf segment-id-ref {

+                type int16;

+                description "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once.";

+            }

+            description "Identifies the segments, which are used to transport the container.";

+        }

+        grouping segment-status-type-g {

+            leaf segment-status-type-id {

+                type int16;

+                config false;

+                description "none";

+            }

+            leaf segment-is-reserved-for-tdm {

+                type boolean;

+                default false;

+                config false;

+                description "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm.

+                    ";

+            }

+            leaf operational-status {

+                type core-model:operational-state;

+                default disabled;

+                config false;

+                description "Current operational status of each segment.";

+            }

+            leaf obsolete-priority-class {

+                type int8;

+                default -1;

+                config false;

+                description "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank.";

+            }

+            leaf obsolete-drop-order-rank {

+                type int16;

+                default -1;

+                config false;

+                description "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. 

+                    _unique: within Structure::StructureStatus::segmentStatusList";

+            }

+            description "none";

+        }

+        grouping container-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping container-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to Container::ContainerCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping container-performance-type-g {

+            leaf tx-ethernet-bytes-max-s {

+                type int32;

+                units "Bytes/s";

+                default -1;

+                config false;

+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf tx-ethernet-bytes-max-m {

+                type int64;

+                units "Bytes/min";

+                default -1;

+                config false;

+                description "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf tx-ethernet-bytes-sum {

+                type int64;

+                units "Bytes";

+                default -1;

+                config false;

+                description "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers.";

+            }

+            leaf time-period {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "Total length of the measurement period in seconds.";

+            }

+            description "Consolidated performance information of the Container.";

+        }

+        grouping container-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses container-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping container-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses container-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+        typedef mii-kind-type {

+            type enumeration {

+                enum gbic {

+                    description "none";

+                }

+                enum soldered-connector {

+                    description "none";

+                }

+                enum sfp-sfp-plus-sfp28 {

+                    description "none";

+                }

+                enum xbi-300-pin {

+                    description "none";

+                }

+                enum xenpak {

+                    description "none";

+                }

+                enum xfp {

+                    description "none";

+                }

+                enum xfp-e {

+                    description "none";

+                }

+                enum xpak {

+                    description "none";

+                }

+                enum x2 {

+                    description "none";

+                }

+                enum dwdm-sfp-sfp-plus {

+                    description "none";

+                }

+                enum qsfp {

+                    description "none";

+                }

+                enum qsfp-plus {

+                    description "none";

+                }

+                enum cxp {

+                    description "none";

+                }

+                enum shielded-mini-multilane-hd-4-x {

+                    description "none";

+                }

+                enum shielded-mini-multilane-hd-8-x {

+                    description "none";

+                }

+                enum qsfp28 {

+                    description "none";

+                }

+                enum cxp2 {

+                    description "none";

+                }

+                enum cdfp-style1-style2 {

+                    description "none";

+                }

+                enum shielded-mini-multilane-hd-4-x-fan-out {

+                    description "none";

+                }

+                enum shielded-mini-multilane-hd-8-x-fan-out {

+                    description "none";

+                }

+                enum cdfp-style3 {

+                    description "none";

+                }

+                enum qsfp-micro {

+                    description "none";

+                }

+                enum qsfp-dd {

+                    description "none";

+                }

+                enum qsfp-plus-rate-select-v1 {

+                    description "none";

+                }

+                enum qsfp-plus-rate-select-v2 {

+                    description "none";

+                }

+                enum not-yet-defined {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef mdi-kind-type {

+            type enumeration {

+                enum sc {

+                    description "Subscriber Connector";

+                }

+                enum fibre-channel-style-1 {

+                    description "Copper connector";

+                }

+                enum fibre-channel-style-2 {

+                    description "Copper connector";

+                }

+                enum bnc-tnc {

+                    description "Bayonet/Threaded Neill-Concelman";

+                }

+                enum fc {

+                    description "Fibre Channel coax headers";

+                }

+                enum fiber-jack {

+                    description "none";

+                }

+                enum lc {

+                    description "Lucent Connector";

+                }

+                enum mt-rj {

+                    description "Mechanical Transfer - Registered Jack";

+                }

+                enum mu {

+                    description "Multiple Optical";

+                }

+                enum sg {

+                    description "none";

+                }

+                enum optical-pigtail {

+                    description "none";

+                }

+                enum mpo1-x12 {

+                    description "Multifiber Parallel Optic";

+                }

+                enum mpo2-x16 {

+                    description "Multifiber Parallel Optic";

+                }

+                enum hssdc-ii {

+                    description "High Speed Serial Data Connector";

+                }

+                enum copper-pigtail {

+                    description "none";

+                }

+                enum rj45 {

+                    description "8P8C, according to Clause 3 and Figures 1 through 5 of IEC 60603-7";

+                }

+                enum no-seperable-connector {

+                    description "none";

+                }

+                enum mxc2-x16 {

+                    description "none";

+                }

+                enum st {

+                    description "according to IEC 60874-10:1992, also often called BFOC/2.5";

+                }

+                enum not-yet-defined {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef medium-kind-type {

+            type enumeration {

+                enum tp-cat3 {

+                    description "none";

+                }

+                enum tp-cat5 {

+                    description "none";

+                }

+                enum tp-cat6 {

+                    description "none";

+                }

+                enum tp-cat8 {

+                    description "none";

+                }

+                enum single-mode {

+                    description "none";

+                }

+                enum multi-mode {

+                    description "none";

+                }

+                enum not-yet-defined {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        typedef pmd-name-type {

+            type enumeration {

+                enum 10-base5 {

+                    description "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8";

+                }

+                enum foirl {

+                    description "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9";

+                }

+                enum 10-base2 {

+                    description "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10";

+                }

+                enum 10-broad36 {

+                    description "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11";

+                }

+                enum 10-base-t {

+                    description "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown";

+                }

+                enum 10-base-thd {

+                    description "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode";

+                }

+                enum 10-base-tfd {

+                    description "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode";

+                }

+                enum 10-base-fp {

+                    description "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16";

+                }

+                enum 10-base-fb {

+                    description "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17";

+                }

+                enum 10-base-fl {

+                    description "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown";

+                }

+                enum 10-base-flhd {

+                    description "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode";

+                }

+                enum 10-base-flfd {

+                    description "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode";

+                }

+                enum 100-base-t4 {

+                    description "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23";

+                }

+                enum 100-base-tx {

+                    description "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown";

+                }

+                enum 100-base-txhd {

+                    description "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode";

+                }

+                enum 100-base-txfd {

+                    description "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode";

+                }

+                enum 100-base-bx10-d {

+                    description "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58";

+                }

+                enum 100-base-bx10-u {

+                    description "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58";

+                }

+                enum 100-base-fx {

+                    description "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown";

+                }

+                enum 100-base-fxhd {

+                    description "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode";

+                }

+                enum 100-base-fxfd {

+                    description "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode";

+                }

+                enum 100-base-lx10 {

+                    description "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58";

+                }

+                enum 100-base-t2 {

+                    description "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown";

+                }

+                enum 100-base-t2-hd {

+                    description "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode";

+                }

+                enum 100-base-t2-fd {

+                    description "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode";

+                }

+                enum 1000-base-x {

+                    description "X  as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown";

+                }

+                enum 1000-base-bx10-d {

+                    description "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59";

+                }

+                enum 1000-base-bx10-u {

+                    description "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59";

+                }

+                enum 1000-base-xhd {

+                    description "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 1000-base-xfd {

+                    description "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 1000-base-lx {

+                    description "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown";

+                }

+                enum 1000-base-lxhd {

+                    description "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode";

+                }

+                enum 1000-base-lxfd {

+                    description "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode";

+                }

+                enum 1000-base-lx10 {

+                    description "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59";

+                }

+                enum 1000-base-sx {

+                    description "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown";

+                }

+                enum 1000-base-sxhd {

+                    description "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode";

+                }

+                enum 1000-base-sxfd {

+                    description "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode";

+                }

+                enum 1000-base-cx {

+                    description "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown";

+                }

+                enum 1000-base-cxhd {

+                    description "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode";

+                }

+                enum 1000-base-cxfd {

+                    description "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode";

+                }

+                enum 1000-base-kx {

+                    description "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70";

+                }

+                enum 1000-base-t {

+                    description "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown";

+                }

+                enum 1000-base-thd {

+                    description "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode";

+                }

+                enum 1000-base-tfd {

+                    description "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode";

+                }

+                enum 10-gbase-x {

+                    description "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 10-gbase-lx4 {

+                    description "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53";

+                }

+                enum 10-gbase-cx4 {

+                    description "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54";

+                }

+                enum 10-gbase-kx4 {

+                    description "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71";

+                }

+                enum 10-gbase-r {

+                    description "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 10-gbase-er {

+                    description "R fiber over 1550nm optics as specified in 802.3 Clause 52";

+                }

+                enum 10-gbase-lr {

+                    description "R fiber over 1310nm optics as specified in 802.3 Clause 52";

+                }

+                enum 10-gbase-sr {

+                    description "R fiber over 850nm optics as specified in 802.3 Clause 52";

+                }

+                enum 10-gbase-lrm {

+                    description "R fiber over 1310 nm optics as specified in 802.3 Clause 68";

+                }

+                enum 10-gbase-kr {

+                    description "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72";

+                }

+                enum 10-gbase-t {

+                    description "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55";

+                }

+                enum 10-gbase-pr-d1 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-d2 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-d3 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-d4 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-u1 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-u2 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-u3 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 10-gbase-pr-u4 {

+                    description "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75";

+                }

+                enum 40-gbase-r {

+                    description "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 40-gbase-kr4 {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84";

+                }

+                enum 40-gbase-cr4 {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85";

+                }

+                enum 40-gbase-sr4 {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86";

+                }

+                enum 4-x10-gbase-sr {

+                    description "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber";

+                }

+                enum 40-gbase-lr4 {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87";

+                }

+                enum 40-gbase-er4 {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87";

+                }

+                enum 40-gbase-fr {

+                    description "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89";

+                }

+                enum 100-gbase-r {

+                    description "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown";

+                }

+                enum 100-gbase-cr4 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92";

+                }

+                enum 100-gbase-kr4 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93";

+                }

+                enum 100-gbase-kp4 {

+                    description "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94";

+                }

+                enum 100-gbase-cr10 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85";

+                }

+                enum 100-gbase-sr4 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95";

+                }

+                enum 100-gbase-sr10 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86";

+                }

+                enum 2-x40-gbase-sr {

+                    description "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber";

+                }

+                enum 10-x10-gbase-sr {

+                    description "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber";

+                }

+                enum 12-x10-gbase-sr {

+                    description "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber";

+                }

+                enum 100-gbase-lr4 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88";

+                }

+                enum 100-gbase-er4 {

+                    description "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88";

+                }

+                enum not-yet-defined {

+                    description "none";

+                }

+            }

+            description "none";

+        }

+        grouping signal-ordering-type-g {

+            leaf signal-ordering-kind-name {

+                type string;

+                config false;

+                description "To be filled according to TR-541. Must be unique for referencing during configuration of the interface.";

+            }

+            leaf-list signal-list {

+                type string;

+                config false;

+                min-elements 2;

+                description "Desciption of the signals on the Media Dependent Interface (MDI), might be e.g. 'TX+' in case of e.g. 10BASE-T, might be e.g. '1,295.56 nm' in case of e.g. 100GBASE-LR4";

+            }

+            description "none";

+        }

+        grouping mau-type-g {

+            leaf mau-id {

+                type core-model:universal-id;

+                config false;

+                description "802.3 according to 30.5.1.1.1 aMAUID

+                    Unique identifier of the Medium Attachment Unit (MAU) instance within the data about the device";

+            }

+            leaf mii-kind {

+                type mii-kind-type;

+                default not-yet-defined;

+                config false;

+                description "SFF8472_SFF8636

+                    Kind of Medium Independent Interface (MII) provided by this Medium Attachment Unit (MAU) (e.g. SFP, moldered port)";

+            }

+            leaf mdi-kind {

+                type mdi-kind-type;

+                default not-yet-defined;

+                config false;

+                description "Kind of Medium Dependent Interface (MDI) provided by this Medium Attachment Unit (MAU)";

+            }

+            leaf required-medium-kind {

+                type medium-kind-type;

+                default not-yet-defined;

+                config false;

+                description "Kind of medium required for operating this Medium Attachment Unit (MAU), more like an information field";

+            }

+            leaf-list wavelength-min {

+                type int32;

+                units "pm";

+                config false;

+                max-elements 3;

+                description "SFF-8690

+                    Minimum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMax = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5";

+            }

+            leaf-list wavelength-max {

+                type int32;

+                units "pm";

+                config false;

+                max-elements 3;

+                description "Maximum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMin = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5

+                    SFF-8690";

+            }

+            leaf wavelength-grid-min {

+                type int32;

+                units "pm";

+                default -1;

+                config false;

+                description "Minimum grid spacing supported by the transceiver, -1 = not applicable, 0 = not known

+                    SFF-8690";

+            }

+            leaf link-length-max {

+                type int32;

+                units "m";

+                default -1;

+                config false;

+                description "Indicates the maximum link length that is supported by the transceiver on the medium, which is specified in the standard referenced in TypeDefinitions::phyType::phyKind.";

+            }

+            leaf vendor-name {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "Name of the vendor of the transceiver

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerName";

+            }

+            leaf vendor-oui {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "Describes the IEEE Company identifier of the vendor of the transceiver (1st part of 802.3 ResourceTypeID)

+                    802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerIdentifier";

+            }

+            leaf part-number {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as six bit model number 

+                    Uniquely identifies the transceiver in the vendor's product lists

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::partTypeIdentifier";

+            }

+            leaf revision-number {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "Identifies the revision number of the transceiver (3rd part of 802.3 ResourceTypeID)

+                    802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as four-bit revision number

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::version";

+            }

+            leaf serial-number {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "Vendor's serial number for the transceiver. 0 = not applicable

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::serialNumber";

+            }

+            leaf date-code {

+                type string;

+                default "NOT_YET_DEFINED";

+                config false;

+                description "Vendor's date code for the transceiver

+                    Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::manufactureDate";

+            }

+            leaf-list pmd-list {

+                type pmd-name-type;

+                config false;

+                min-elements 1;

+                description "List of Physical Medium Dependent (PMD) that can be operated

+                    *** In case ordering of the signals depends on the PMD, pmdList has to be put into the datatype for the signal ordering ***";

+            }

+            list signal-ordering-list {

+                key 'signal-ordering-kind-name';

+                config false;

+                min-elements 1;

+                uses signal-ordering-type-g;

+                description "Describes the different (e.g. MDI, MDI-X) ways of ordering the signals on the physical medium";

+            }

+            leaf auto-signal-ordering-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "1 = there is a mechanism for automatically crossing over tx and rx implemented";

+            }

+            leaf short-reach-mode-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "1 = Indicates that Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64 is available";

+            }

+            leaf eee-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "1 = Indicates that Energy-Efficient Ethernet (EEE) is available at the device.";

+            }

+            leaf unidirectional-operation-is-avail {

+                type boolean;

+                default false;

+                config false;

+                description "1 = Medium Attachment Unit (MAU) able to transmit from Media Independent Interface (MII) regardless of whether the MAU has determined that a valid link has been established, 0 = MAU able to transmit from MII only when the MAU has determined that a valid link has been established

+                    802.3";

+            }

+            leaf-list supported-alarms {

+                type string;

+                config false;

+                min-elements 6;

+                description "MW IM

+                    Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas.";

+            }

+            description "none";

+        }

+        grouping wire-interface-problem-severity-type-g {

+            leaf problem-kind-name {

+                type string;

+                description "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms";

+            }

+            leaf problem-kind-severity {

+                type severity-type;

+                default warning;

+                description "Severity of this type of alarm.";

+            }

+            description "none";

+        }

+        grouping wire-interface-current-problem-type-g {

+            leaf problem-name {

+                type string;

+                default "Problem name not specified.";

+                config false;

+                description "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms";

+            }

+            uses mw-current-problem-g;

+            description "none";

+        }

+        grouping wire-interface-performance-type-g {

+            leaf es {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "802.3 30.8.1.1.13 aLineESs

+                    Number of errored seconds";

+            }

+            leaf ses {

+                type int32;

+                units "s";

+                default -1;

+                config false;

+                description "802.3 30.8.1.1.12 aLineSESs

+                    Number of severely errored seconds";

+            }

+            leaf symbol-error-during-carrier {

+                type int32;

+                default -1;

+                config false;

+                description "802.3 according to 30.3.2.1.5 aSymbolErrorDuringCarrier

+                    Number of times when valid carrier was present and an invalid data symbol occured.";

+            }

+            leaf low-power-idle-transmitter-ms {

+                type int32;

+                units "ms";

+                default -1;

+                config false;

+                description "802.3 similar to 30.3.2.1.8 aTransmitLPIMicroseconds

+                    Number of milliseconds (original counter expresses microseconds), during which the transmitter was in power save mode";

+            }

+            leaf low-power-idle-receiver-ms {

+                type int32;

+                units "ms";

+                default -1;

+                config false;

+                description "802.3 similar to 30.3.2.1.9 aReceiveLPIMicroseconds

+                    Number of milliseconds (original counter expresses microseconds), during which the receiver was in power save mode";

+            }

+            description "none";

+        }

+        grouping wire-interface-current-performance-type-g {

+            container performance-data {

+                config false;

+                uses wire-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-current-data-g;

+            description "Turns performance information into current performance information by inheriting from OTN_CurrentData.";

+        }

+        grouping wire-interface-historical-performance-type-g {

+            container performance-data {

+                config false;

+                uses wire-interface-performance-type-g;

+                description "none";

+            }

+            uses g:otn-history-data-g;

+            description "Turns performance information into historical performance information by inheriting from OTN_HistoryData.";

+        }

+

+    /***********************

+    * package object-classes

+    **********************/ 

+        /***********************

+        * package air-interface

+        **********************/ 

+            list mw-air-interface-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container air-interface-capability {

+                    config false;

+                    uses air-interface-capability-g;

+                    description "none";

+                }

+                container air-interface-configuration {

+                    uses air-interface-configuration-g;

+                    description "none";

+                }

+                container air-interface-status {

+                    config false;

+                    uses air-interface-status-g;

+                    description "none";

+                }

+                container air-interface-current-problems {

+                    config false;

+                    uses air-interface-current-problems-g;

+                    description "none";

+                }

+                container air-interface-current-performance {

+                    config false;

+                    uses air-interface-current-performance-g;

+                    description "none";

+                }

+                container air-interface-historical-performances {

+                    config false;

+                    uses air-interface-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-capability-g {

+                leaf type-of-equipment {

+                    type string;

+                    default "Type of equipment not yet defined.";

+                    config false;

+                    description "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware.";

+                }

+                leaf tx-frequency-min {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the minimum transmit frequency tunable at the air interface.";

+                }

+                leaf tx-frequency-max {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the maximum transmit frequency tunable at the air interface.";

+                }

+                leaf rx-frequency-min {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the minimum receive frequency tunable at the air interface.";

+                }

+                leaf rx-frequency-max {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Value of the maximum receive frequency tunable at the air interface.";

+                }

+                leaf adaptive-modulation-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the device is capable of adaptive modulation, this field shall contain a 'true'.";

+                }

+                leaf mimo-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the device is capable of MIMO, this field shall contain a 'true'.";

+                }

+                leaf mimo-channels {

+                    type int8;

+                    units "channels";

+                    default 1;

+                    config false;

+                    description "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration.";

+                }

+                leaf alic-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'.";

+                }

+                leaf atpc-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case the microwave radio is capable of ATPC, this field shall contain a 'true'.";

+                }

+                leaf atpc-range {

+                    type int8;

+                    units "dB";

+                    default 0;

+                    config false;

+                    description "Extent of the ATPC range. This value represents a device specific maximum value. The actual range of the ATPC at a specific link might be limited by the difference between configured transmit power (AirInterface::AirInterfaceConfiguration::txPower) and minimum transmit power of the device (TypeDefinitions::TransmissionModeType::txPowerMin).";

+                }

+                leaf encryption-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Shall be marked 'true', if payload encryption is available.";

+                }

+                leaf-list supported-loop-back-kind-list {

+                    type loop-back-type;

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    description "List of supported kinds of looping back of header information to the remote site.";

+                }

+                leaf maintenance-timer-range {

+                    type string;

+                    units "s";

+                    default "Range of the maintenance timer not yet defined.";

+                    config false;

+                    description "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 7;

+                    description "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','signalIDMismatching','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas.";

+                }

+                list supported-channel-plan-list {

+                    key 'supported-channel-plan';

+                    config false;

+                    min-elements 1;

+                    uses channel-plan-type-g;

+                    description "List of channel spacing that are supported by the device.";

+                }

+                description "Describes the 'analog' capabilities of modem and transmitter of the microwave device. Value ranges of attributes are not independently (e.g. min. and max. transmit power depends on modulation). Legal combinations of values are expressed in transmissionModeTypes.";

+            }

+            grouping air-interface-configuration-g {

+                leaf air-interface-name {

+                    type string;

+                    default "Air interface ID not yet defined.";

+                    description "Operator specific microwave link ID (often used for coding area, type of element and sequential number).";

+                }

+                leaf remote-air-interface-name {

+                    type string;

+                    default "Air interface ID at the remote site not yet defined.";

+                    description "Name of the air interface, which belongs to the same link, at the remote site.";

+                }

+                leaf expected-signal-id {

+                    type int16;

+                    description "If set on '0', the receiver ignores the signal ID of the received signal. If set on any other value, the receiver exclusively synchronizes on signals with the same signal ID.";

+                }

+                leaf transmitted-signal-id {

+                    type int16;

+                    description "Transmitted radio signal ID for synchronizing the receiver.";

+                }

+                leaf radio-signal-id {

+                    type string;

+                    default "Radio signal ID not yet defined.";

+		    status deprecated;

+                    description "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check.";

+                }

+                leaf tx-frequency {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable.";

+                }

+                leaf rx-frequency {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Center frequency of the receive channel.";

+                }

+                leaf transmission-mode-min {

+		    type core-model:universal-id;

+                    description "Minimum transmission mode to be configured (in case adaptive modulation is not used, this value represents also the fixed transmission mode).";

+                }

+                leaf transmission-mode-max {

+		    type core-model:universal-id;

+                    description "Maximum transmission mode to be configured.";

+                }

+                leaf tx-channel-bandwidth {

+                    type int32;

+                    units "kHz";

+                    default -1;

+		    status deprecated;

+                    description "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+                }

+                leaf rx-channel-bandwidth {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    description "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;";

+                }

+                leaf polarization {

+                    type polarization-type;

+                    default not-specified;

+                    description "Allows documenting the polarization of the air interface.";

+                }

+                leaf power-is-on {

+                    type boolean;

+                    default true;

+                    description "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'.";

+                }

+                leaf transmitter-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of the transmitter inside the radio shall be expressed as a 'true'.";

+                }

+                leaf receiver-is-on {

+                    type boolean;

+                    default true;

+                    description "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations.

+                        ";

+                }

+                leaf tx-power {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    description "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC.";

+                }

+                leaf adaptive-modulation-is-on {

+                    type boolean;

+                    default false;

+                    description "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'.";

+                }

+                leaf modulation-min {

+                    type int16;

+                    units "symbols";

+                    default -1;

+		    status deprecated;

+                    description "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf modulation-max {

+                    type int16;

+                    units "symbols";

+                    default -1;

+		    status deprecated;

+                    description "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf xpic-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'.";

+                }

+                leaf mimo-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'.";

+                }

+                leaf alic-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'.";

+                }

+                leaf atpc-is-on {

+                    type boolean;

+                    default false;

+                    description "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'.";

+                }

+                leaf atpc-thresh-upper {

+                    type int16;

+                    units "dBm";

+                    default 99;

+                    description "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power.";

+                }

+                leaf atpc-thresh-lower {

+                    type int16;

+                    units "dBm";

+                    default 99;

+                    description "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power.";

+                }

+                leaf atpc-tx-power-min {

+                    type int8;

+                    units "dBm";

+                    default -99;

+                    description "Transmit power, which is not to be undercut, while operating ATPC.";

+                }

+                leaf auto-freq-select-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'.";

+                }

+                leaf auto-freq-select-range {

+                    type int8;

+                    units "channels";

+                    default -1;

+                    description "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen. ";

+                }

+                leaf modulation-is-on {

+                    type boolean;

+                    default true;

+                    description "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'.";

+                }

+                leaf encryption-is-on {

+                    type boolean;

+                    default false;

+                    description "Activates encryption of the payload.";

+                }

+                leaf cryptographic-key {

+                    type string;

+                    default "Cryptographic key not yet defined.";

+                    description "Key for transforming plaintext into ciphertext data.";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list threshold-cross-alarm-list {

+                    key 'g826-value-kind granularity-period';

+                    max-elements 6;

+                    uses threshold-cross-alarm-type-g;

+                    description "List of threshold cross alarms to be configured.";

+                }

+                leaf loop-back-kind-on {

+                    type loop-back-type;

+                    default none;

+                    description "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";

+                }

+                leaf maintenance-timer {

+                    type int32;

+                    units "s";

+                    default -1;

+                    description "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 6;

+                    uses air-interface-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "Configuration of the radio link.";

+            }

+            grouping air-interface-status-g {

+                leaf tx-frequency-cur {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Center frequency of the currently operated transmit channel.";

+                }

+                leaf rx-frequency-cur {

+                    type int32;

+                    units "kHz";

+                    default -1;

+                    config false;

+                    description "Center frequency of the currently operated receive channel.";

+                }

+                leaf tx-level-cur {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    config false;

+                    description "Current transmit level.";

+                }

+                leaf rx-level-cur {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    config false;

+                    description "Current receive level.";

+                }

+                leaf transmission-mode-cur {

+			type leafref {

+				path '/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id';

+			}    

+                    config false;

+                    description "Currently operated transmission mode according to definitions in Capabilities.";

+                }

+                leaf modulation-cur {

+                    type int16;

+                    units "symbols";

+                    default -1;

+                    config false;

+		    status deprecated;

+                    description "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme.";

+                }

+                leaf code-rate-cur {

+                    type int8;

+                    units "%";

+                    default -1;

+                    config false;

+		    status deprecated;

+                    description "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate).";

+                }

+                leaf received-signal-id {

+                    type int16;

+                    default -1;

+                    config false;

+                    description "ID of the signal, which the receiver is currently synchronized on.";

+                }

+                leaf snir-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured signal to (noise+interference) ratio.";

+                }

+                leaf xpd-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured cross polarization discrimination.";

+                }

+                leaf rf-temp-cur {

+                    type int8;

+                    units "Celsius";

+                    default -99;

+                    config false;

+                    description "Current temperature (in degree Celsius) of the radio module inside the outdoor unit.";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Air Interface entered its current operational status.  ";
+                }

+                leaf radio-power-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If the radio unit has power and is switched on, this shall be expressed as a 'true'.";

+                }

+                leaf link-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'.";

+                }

+                leaf xpic-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf mimo-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf alic-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf atpc-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf auto-freq-select-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'.";

+                }

+                leaf loop-back-kind-up {

+                    type loop-back-type;

+                    default none;

+                    config false;

+                    description "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site.";

+                }

+                leaf local-end-point-id {

+                    type string;

+                    default "not-supported";

+                    config false;

+                    description "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link.";

+                }

+                leaf remote-end-point-id {

+                    type string;

+                    default "not-supported";

+                    config false;

+                    description "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link.";

+                }

+                description "Measurements of current values on the air interface and operational status of the device.";

+            }

+            grouping air-interface-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses air-interface-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses air-interface-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the air interface at a particular moment.";

+            }

+            grouping air-interface-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses air-interface-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the air interface for a pre-defined measurement interval.";

+            }

+            list co-channel-group {

+                key 'co-channel-group-id';

+                uses co-channel-group-g;

+                description "none";

+            }

+            grouping co-channel-group-g {

+                leaf co-channel-group-id {

+                    type core-model:universal-id;

+                    description "none";

+                }

+                leaf-list air-interface-list {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+                    description "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group.";

+                }

+                leaf sort-of-co-channel-group {

+                    type string;

+                    default "Kind of co-channel group not specified.";

+                    description "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';";

+                }

+                leaf-list logical-termination-point {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+		    status deprecated;

+                    description "none";

+                }

+                description "Required for configuring XPIC, MIMO and ALIC.";

+            }

+

+        /***********************

+        * package air-interface-hsb

+        **********************/ 

+            list mw-air-interface-hsb-end-point-pac {

+                key 'endpoint';

+                leaf role {

+                    type role-type;

+                    default working;

+                    description "none";

+                }

+                leaf endpoint {

+                    type leafref {

+                        path '/core-model:forwarding-construct/core-model:fc-port/core-model:uuid';

+                    }

+                    description "none";

+                }

+                description "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC.  The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.";

+            }

+            list mw-air-interface-hsb-fc-switch-pac {

+                key 'fcswitch';

+                leaf prot-type {

+                    type protection-type;

+                    default hsb;

+                    description "Indicates the protection scheme that is used for the ProtectionGroup.";

+                }

+                leaf air-interface-hsb-configuration-is-faulty-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity of an airInterfaceHsbConfigurationIsFaulty alarm shall be chosen from an enumeration.";

+                }

+                leaf air-interface-hsb-is-partly-down-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity for one link out of the HSB configuration being down shall be chosen from an enumeration.";

+                }

+                leaf air-interface-hsb-is-down-severity {

+                    type severity-type;

+                    default warning;

+                    description "The level of severity of the total HSB configuration being down shall be chosen from an enumeration.";

+                }

+                leaf fcswitch {

+                    type leafref {

+                        path '/core-model:forwarding-construct/core-model:fc-switch/core-model:uuid';

+                    }

+                    description "none";

+                }

+                description "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as  1+1 ane 1:1).  May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state.";

+            }

+

+        /***********************

+        * package air-interface-diversity

+        **********************/ 

+            list mw-air-interface-diversity-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container air-interface-diversity-capability {

+                    config false;

+                    uses air-interface-diversity-capability-g;

+                    description "none";

+                }

+                container air-interface-diversity-configuration {

+                    uses air-interface-diversity-configuration-g;

+                    description "none";

+                }

+                container air-interface-diversity-status {

+                    config false;

+                    uses air-interface-diversity-status-g;

+                    description "none";

+                }

+                container air-interface-diversity-current-problems {

+                    config false;

+                    uses air-interface-diversity-current-problems-g;

+                    description "none";

+                }

+                container air-interface-diversity-current-performance {

+                    config false;

+                    uses air-interface-diversity-current-performance-g;

+                    description "none";

+                }

+                container air-interface-diversity-historical-performances {

+                    config false;

+                    uses air-interface-diversity-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-capability-g {

+                list available-kinds-of-diversity {

+                    key 'diversity-name';

+                    config false;

+                    uses diversity-type-g;

+                    description "Available types of diversity to be listed.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas.";

+                }

+                description "Describes the capabilities in implementing different types of air interface diversity.";

+            }

+            grouping air-interface-diversity-configuration-g {

+                container air-interface-diversity {

+                    uses diversity-type-g;

+                    description "Type of air interface diversity configured at the link.";

+                }

+                leaf-list air-interface-ltp-list {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:uuid';

+                    }

+                    min-elements 2;

+                    description "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list threshold-cross-alarm-list {

+                    key 'g826-value-kind granularity-period';

+                    max-elements 6;

+                    uses threshold-cross-alarm-type-g;

+                    description "List of threshold cross alarms to be configured.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 3;

+                    uses air-interface-diversity-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-status-g {

+                leaf snir-cur {

+                    type int8;

+                    units "dB";

+                    default -99;

+                    config false;

+                    description "Currently measured signal to (noise+interference) ratio of the combined signals.";

+                }

+                leaf air-interface-diversity-status {

+                    type air-interface-diversity-status-type;

+                    default group-down;

+                    config false;

+                    description "Status of the air interface bundle. ";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Diversity Group entered its current operational status.  ";
+                }

+                description "none";

+            }

+            grouping air-interface-diversity-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses air-interface-diversity-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping air-interface-diversity-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses air-interface-diversity-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the air interface diversity configuration at a particular moment.";

+            }

+            grouping air-interface-diversity-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses air-interface-diversity-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the air interface diversity configuration for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package pure-ethernet-structure

+        **********************/ 

+            list mw-pure-ethernet-structure-pac {

+                if-feature pure-ethernet;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container pure-ethernet-structure-capability {

+                    config false;

+                    uses pure-ethernet-structure-capability-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-configuration {

+                    uses pure-ethernet-structure-configuration-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-status {

+                    config false;

+                    uses pure-ethernet-structure-status-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-current-problems {

+                    config false;

+                    uses pure-ethernet-structure-current-problems-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-current-performance {

+                    config false;

+                    uses pure-ethernet-structure-current-performance-g;

+                    description "none";

+                }

+                container pure-ethernet-structure-historical-performances {

+                    config false;

+                    uses pure-ethernet-structure-historical-performances-g;

+                    description "none";

+                }

+                description "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only.";

+            }

+            grouping pure-ethernet-structure-capability-g {

+                leaf structure-id {

+                    type core-model:universal-id;

+                    config false;

+                    description "Identifies the Structure for bundling and container.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";

+                }

+                description "Describes the logical structuring of the physical capacity provided by a pure Ethernet microwave device. Segmentation is not available. No fixed segment size. No TDM transport.";

+            }

+            grouping pure-ethernet-structure-configuration-g {

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    uses structure-problem-severity-type-g;

+                    description "Severity of the type of problem to be configured.";

+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-status-g {

+                container segment-status-list {

+                    config false;

+                    uses segment-status-type-g;

+                    description "Status of the Ethernet transport segment. Always just one segment.";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the last update of the status information.  ";
+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses structure-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping pure-ethernet-structure-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses structure-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the structure of an pure Ethernet microwave at a particular moment.";

+            }

+            grouping pure-ethernet-structure-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses structure-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the structure of an pure Ethernet microwave for a pre-defined measurement interval.";

+            }

+            feature pure-ethernet {

+                description "Feature 'pure-ethernet' is mandatory for device types transporting pure Ethernet.";

+            }

+

+        /***********************

+        * package hybrid-mw-structure

+        **********************/ 

+            list mw-hybrid-mw-structure-pac {

+                if-feature hybrid-microwave;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container hybrid-mw-structure-capability {

+                    config false;

+                    uses hybrid-mw-structure-capability-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-configuration {

+                    uses hybrid-mw-structure-configuration-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-status {

+                    config false;

+                    uses hybrid-mw-structure-status-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-current-problems {

+                    config false;

+                    uses hybrid-mw-structure-current-problems-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-current-performance {

+                    config false;

+                    uses hybrid-mw-structure-current-performance-g;

+                    description "none";

+                }

+                container hybrid-mw-structure-historical-performances {

+                    config false;

+                    uses hybrid-mw-structure-historical-performances-g;

+                    description "none";

+                }

+                description "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic.";

+            }

+            grouping hybrid-mw-structure-capability-g {

+                leaf structure-id {

+                    type core-model:universal-id;

+                    config false;

+                    description "Identifies the Structure for bundling and container.";

+                }

+                list supported-tdm-structure-types-list {

+                    key 'tdm-structure-name';

+                    config false;

+                    min-elements 1;

+                    uses tdm-structure-type-g;

+                    description "Lists the TDM frame types that are supported.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device.";

+                }

+                description "Describes the logical structuring of the physical capacity provided by a hybrid microwave device (TDM + Ethernet). Segmentation is available. TDM transport is available.";

+            }

+            grouping hybrid-mw-structure-configuration-g {

+                container structure-kind {

+                    uses tdm-structure-type-g;

+                    description "TDM frame to be applied.";

+                }

+                container structure-type {

+                    uses tdm-structure-type-g;

+		    status deprecated;

+                    description "TDM frame to be applied.";

+                }

+                leaf number-of-tdm-segments-to-be-reserved {

+                    type int16;

+                    default -1;

+                    description "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    uses structure-problem-severity-type-g;

+                    description "Severity of the type of problem to be configured.";

+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-status-g {

+                list segment-status-list {

+                    key 'segment-status-type-id';

+                    config false;

+                    uses segment-status-type-g;

+                    description "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1";

+                }

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the last update of the status information.  ";
+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses structure-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping hybrid-mw-structure-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses structure-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the structure of a hybrid microwave at a particular moment.";

+            }

+            grouping hybrid-mw-structure-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses structure-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the structure of a hybrid microwave for a pre-defined measurement interval.";

+            }

+            feature hybrid-microwave {

+                description "Feature 'hybrid-microwave' is mandatory for device types transporting Ethernet + TDM.";

+            }

+

+        /***********************

+        * package ethernet-container

+        **********************/ 

+            list mw-ethernet-container-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container ethernet-container-capability {

+                    config false;

+                    uses ethernet-container-capability-g;

+                    description "none";

+                }

+                container ethernet-container-configuration {

+                    uses ethernet-container-configuration-g;

+                    description "none";

+                }

+                container ethernet-container-status {

+                    config false;

+                    uses ethernet-container-status-g;

+                    description "none";

+                }

+                container ethernet-container-current-problems {

+                    config false;

+                    uses ethernet-container-current-problems-g;

+                    description "none";

+                }

+                container ethernet-container-current-performance {

+                    config false;

+                    uses ethernet-container-current-performance-g;

+                    description "none";

+                }

+                container ethernet-container-historical-performances {

+                    config false;

+                    uses ethernet-container-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping ethernet-container-capability-g {

+                leaf bundling-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container.";

+                }

+                leaf packet-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans.";

+                }

+                leaf layer2-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 2 available at the device.";

+                }

+                leaf vlan-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on VLAN layer available at the device.";

+                }

+                leaf q-in-q-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer of a second VLAN available at the device.";

+                }

+                leaf mpls-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on mpls layer available at the device.";

+                }

+                leaf ipv4-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 3 for IPv4 available at the device.";

+                }

+                leaf ipv6-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 3 for IPv6 available at the device.";

+                }

+                leaf layer4-compression-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Packet compression on layer 4 (TCP and UDP header) available at the device.";

+                }

+                leaf encryption-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Shall be marked 'true', if Ethernet payload encryption is available.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";

+                }

+                description "none";

+            }

+            grouping ethernet-container-configuration-g {

+                leaf container-id {

+                    type string;

+                    default "No Ethernet Flow associated yet.";

+                    description "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller.";

+                }

+                list segments-id-list {

+                    key 'structure-id-ref segment-id-ref';

+                    min-elements 1;

+                    uses segment-id-type-g;

+                    description "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list.";

+                }

+                leaf packet-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum.";

+                }

+                leaf layer2-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 2 configured at the device.";

+                }

+                leaf vlan-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on VLAN layer configured at the device.";

+                }

+                leaf q-in-q-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer of a second VLAN configured at the device.";

+                }

+                leaf mpls-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on MPLS layer configured at the device.";

+                }

+                leaf ipv4-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 3 for IPv4 configured at the device.";

+                }

+                leaf ipv6-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 3 for IPv6 configured at the device.";

+                }

+                leaf layer4-compression-is-on {

+                    type boolean;

+                    default false;

+                    description "Packet compression on layer 4 (TCP and UDP header) configured at the device.";

+                }

+                leaf encryption-is-on {

+                    type boolean;

+                    default false;

+                    description "Activates encryption of the Ethernet payload.";

+                }

+                leaf cryptographic-key {

+                    type string;

+                    default "Cryptographic key not yet defined.";

+                    description "Key for transforming plaintext into cipher text data.";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 2;

+                    uses container-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping ethernet-container-status-g {

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Container entered its current operational status.  ";
+                }

+                description "none";

+            }

+            grouping ethernet-container-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses container-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping ethernet-container-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses container-current-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the Ethernet container at a particular moment.";

+            }

+            grouping ethernet-container-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses container-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the Ethernet container for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package tdm-container

+        **********************/ 

+            list mw-tdm-container-pac {

+                if-feature hybrid-microwave;

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container tdm-container-capability {

+                    config false;

+                    uses tdm-container-capability-g;

+                    description "none";

+                }

+                container tdm-container-configuration {

+                    uses tdm-container-configuration-g;

+                    description "none";

+                }

+                container tdm-container-status {

+                    config false;

+                    uses tdm-container-status-g;

+                    description "none";

+                }

+                container tdm-container-current-problems {

+                    config false;

+                    uses tdm-container-current-problems-g;

+                    description "none";

+                }

+                container tdm-container-current-performance {

+                    config false;

+                    uses tdm-container-current-performance-g;

+                    description "none";

+                }

+                container tdm-container-historical-performances {

+                    config false;

+                    uses tdm-container-historical-performances-g;

+                    description "none";

+                }

+                description "The TdmContainer_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM traffic.";

+            }

+            grouping tdm-container-capability-g {

+                list supported-tdm-container-types-list {

+                    key 'tdm-container-name';

+                    config false;

+                    min-elements 1;

+                    uses tdm-container-type-g;

+                    description "Lists the TDM containers that are supported.";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 2;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor.";

+                }

+                leaf supported-alarms {

+                    type string;

+                    default "Supported alarms not yet defined.";

+                    config false;

+		    status deprecated;

+                    description "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device.";

+                }

+                description "Bundling is not available.";

+            }

+            grouping tdm-container-configuration-g {

+                leaf container-id {

+                    type string;

+                    default "No TDM Flow associated yet.";

+                    description "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller.";

+                }

+                container container-type {

+                    uses tdm-container-type-g;

+                    description "Type of TDM container.";

+                }

+                container segment-id {

+                    uses segment-id-type-g;

+                    description "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;";

+                }

+                leaf performance-monitoring-collection-is-on {

+                    type boolean;

+                    default false;

+                    description "Enables measurement, collection, storage and access to performance data.";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 2;

+                    uses container-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping tdm-container-status-g {

+                leaf last-status-change {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time the Container entered its current operational status.  ";
+                }

+                description "none";

+            }

+            grouping tdm-container-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses container-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping tdm-container-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses container-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the TDM container at a particular moment.";

+            }

+            grouping tdm-container-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses container-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the TDM container for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package wire-interface

+        **********************/ 

+            list wire-interface-pac {

+                key 'layer-protocol';

+                leaf layer-protocol {

+                    type leafref {

+                        path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';

+                    }

+                    description "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid";

+                }

+                container wirebased-interface-capability {

+                    config false;

+                    uses wire-interface-capability-g;

+                    description "none";

+                }

+                container wirebased-interface-configuration {

+                    uses wire-interface-configuration-g;

+                    description "none";

+                }

+                container wirebased-interface-status {

+                    config false;

+                    uses wire-interface-status-g;

+                    description "none";

+                }

+                container wirebased-interface-current-problems {

+                    config false;

+                    uses wire-interface-current-problems-g;

+                    description "none";

+                }

+                container wirebased-interface-current-performance {

+                    config false;

+                    uses wire-interface-current-performance-g;

+                    description "none";

+                }

+                container wirebased-interface-historical-performances {

+                    config false;

+                    uses wire-interface-historical-performances-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping wire-interface-capability-g {

+                list available-mau-list {

+                    key 'mau-id';

+                    config false;

+                    uses mau-type-g;

+                    description "List of Medium Attachment Units (MAUs) that are available for being selected. If rate and service configuration (e.g. SFF-8079) are not supported, the MAU determined by hardware shall be described.

+                        ";

+                }

+                leaf auto-pmd-negotiation-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Parameter

+                        1 = Indicates that device is supporting Auto-negotiation";

+                }

+                leaf auto-pmd-negotiation-max-is-avail {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "1 = Indicates that device is supporting definition of the maximum speed/Medium Attached Unit (MAU) automatically chosen when (autoNegotiationIsOn=1)";

+                }

+                leaf-list supported-loop-back-kind-list {

+                    type loop-back-type;

+                    config false;

+                    min-elements 1;

+                    max-elements 5;

+                    description "List of supported kinds of looping back of header information to the remote site.

+                        802.3 45.2.1.12.1 PMA remote loopback ability";

+                }

+                leaf maintenance-timer-range {

+                    type string;

+                    units "Byte";

+                    default "Range of the maintenance timer not yet defined.";

+                    config false;

+                    description "MW IM

+                        Available time periods for maintenance configurations (e.g. the loop back) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";

+                }

+                leaf-list supported-alarm-list {

+                    type string;

+                    config false;

+                    min-elements 6;

+                    description "Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas.";

+                }

+                description "none";

+            }

+            grouping wire-interface-configuration-g {

+                leaf wire-interface-name {

+                    type string;

+                    default "Not yet defined.";

+                    description "Text field for the wire interface being named by the operator. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network

+                        Parameter";

+                }

+                leaf remote-wire-interface-name {

+                    type string;

+                    default "Not yet defined.";

+                    description "Learning from MW IM

+                        Text field for defining the wire interface this one is connected with. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network";

+                }

+                leaf interface-is-on {

+                    type boolean;

+                    default true;

+                    description "1 = Activation of the interface (it gets powered and can be managed even if the transceiver is not yet transmitting or receiving). In case there is no Medium Attachment Unit (MAU) (e.g. no SFP in the cage) SETting (interfaceIsOn=1) must be ignored and GETing must return (interfaceIsOn=0)

+                        802.3 according 30.3.2.2.1 acPhyAdminControl";

+                }

+                leaf-list transceiver-is-on-list {

+                    type boolean;

+                    min-elements 1;

+                    max-elements 11;

+                    description "802.3 22.?.? and additionally 802.3 45.2.1.8 PMD transmit disable register (Register 1.9)

+                        1 = Activation of the transmitter and receiver (e.g. laser) of the PHY; transceiverIsOnList[0]:total interface; transceiverIsOnList[1..10] different lanes of a multilane Medium Attachment Unit (MAU)";

+                }

+                leaf auto-pmd-negotiation-is-on {

+                    type boolean;

+                    default false;

+                    description "Parameter

+                        1 = Auto-negotiation is switched on";

+                }

+                leaf fixed-pmd {

+                    type pmd-name-type;

+                    default not-yet-defined;

+                    description "If (autoPmdNegotiationIsOn=0) configuration of the concrete kind of Physical Medium Dependent (PMD). If (autoNegotiationIsOn=1) value of this field becomes irrelevant";

+                }

+                leaf auto-pmd-negotiation-max {

+                    type pmd-name-type;

+                    default not-yet-defined;

+                    description "Parameter

+                        If (autoNegotiationIsOn=1) AND (autoNegotiationMauMaxIsAvail=1) configuration of the maximum speed/Physical Medium Dependent (PMD), which is automatically chosen by Auto-negotiation";

+                }

+                leaf auto-signal-ordering-is-on {

+                    type boolean;

+                    default false;

+                    description "1 = e.g. auto-MDI-X is switched on";

+                }

+                leaf fixed-signal-ordering {

+					type core-model:universal-id;

+                    description "If (autoSignalOrderingIsOn=0) configuration of the concrete kind of signal ordering on the media (e.g. MDI, or MDI-X). If (autoSignalOrderingIsOn=1) value of this field becomes irrelevant";

+                }

+                leaf short-reach-mode-is-on {

+                    type boolean;

+                    default false;

+                    description "Activation of the Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64";

+                }

+                leaf unidirectional-operation-is-on {

+                    type boolean;

+                    default false;

+                    description "If (autoNegotiationIsOn=1) OR manualDuplexSelection=0 (=half duplex), this bit is ignored. When autoNegotiationIsOn=0 AND manualDuplexSelection=1 (=full duplex):  1 = Enable transmit from media independent interface regardless of whether the PHY has determined that a valid link has been established, 0 = Enable transmit from media independent interface only when the PHY has determined that a valid link has been established

+                        802.3

+                        Parameter";

+                }

+                leaf-list wavelength-list {

+                    type int32;

+                    units "pm";

+                    max-elements 4;

+                    description "Wavelength of the signal of laser in pico meter; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5

+                        SFF-8690";

+                }

+                leaf temperature-high-threshold {

+                    type int8;

+                    units "Celsius";

+                    default -99;

+                    description "Threshold for alarming high temperature values.

+                        Will move to somewhere in the Physical Segment of the Core IM";

+                }

+                leaf temperature-low-threshold {

+                    type int8;

+                    units "Celsius";

+                    default -99;

+                    description "Threshold for alarming low temperature values.

+                        Will move to somewhere in the Physical Segment of the Core IM";

+                }

+                leaf rxlevel-high-threshold {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    description "Threshold for alarming high RX levels.";

+                }

+                leaf rxlevel-low-threshold {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    description "Threshold for alarming low RX levels.";

+                }

+                leaf loop-back-kind-on {

+                    type string;

+                    description "Parameter

+                        802.3 according 22.2.4.1.2 Loopback

+                        Maintenance Feature. The currently configured type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site.

+                        Activation of local loopback mode on physical layer";

+                }

+                leaf isolation-is-on {

+                    type boolean;

+                    default false;

+                    description "1 = Activation of the separation of the PHY from higher network layers

+                        802.3";

+                }

+                leaf restart-pmd-negotiation-is-on {

+                    type boolean;

+                    default false;

+                    description "Restarts the auto negotiation process

+                        802.3";

+                }

+                leaf reset-mau-is-on {

+                    type boolean;

+                    default false;

+                    description "802.3

+                        Resets the entire Medium Access Unit (MAU)";

+                }

+                leaf maintenance-timer {

+                    type int32;

+                    default -1;

+                    description "Parameter and MW IM

+                        Time of existence of any maintenance configuration (e.g. the loop back). Valid values are defined in WireInterface::WireInterfaceCapability::maintenanceTimerRange";

+                }

+                list problem-kind-severity-list {

+                    key 'problem-kind-name';

+                    min-elements 6;

+                    uses wire-interface-problem-severity-type-g;

+                    description "Severity of the problem to be configured.";

+                }

+                description "none";

+            }

+            grouping wire-interface-status-g {

+                leaf interface-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "802.3 according 30.3.2.1.7 aPhyAdminState

+                        1 = A Physical layer entity (PHY) exists (including Medium Attachment Unit (e.g. SFP) ) and it is powered and can be managed";

+                }

+                leaf-list receive-signal-is-detected {

+                    type boolean;

+                    config false;

+                    min-elements 1;

+                    max-elements 11;

+                    description "802.3 45.2.1.9 PMD receive signal detect

+                        1 = Receiver (e.g. laser) detects signal; receiveSignalIsDetected[0]:total interface; receiveSignalIsDetected[1..10] different lanes of a multilane Medium Attachment Unit (MAU)";

+                }

+                leaf pmd-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Inverse of 802.3 45.2.1.2.3 Fault (1.1.7)

+                        If (interfaceIsUp=1) BUT 0 = there is a fault in either transmit or receive path";

+                }

+                leaf pmd-cur {

+                    type pmd-name-type;

+                    default not-yet-defined;

+                    config false;

+                    description "Indicates the kind of Physical Medium Dependent (PMD) currently operated at this interface";

+                }

+                container signal-ordering-kind-cur {

+                    config false;

+                    uses signal-ordering-type-g;

+                    description "Reference on a SignalOrderingType for expressing the currently active way of ordering the signals on the physical medium. Must contain a value as defined in TypeDefinitions::SignalOrderingType::signalOrderingKindName";

+                }

+                leaf eee-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "1 = Energy Efficient Ethernet is supported at both ends of the link and it is activated";

+                }

+                leaf link-is-up {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "Parameter

+                        1 = (transceiverIsUp=1) AND communication is established to the remote site";

+                }

+                leaf link-is-idle {

+                    type boolean;

+                    default false;

+                    config false;

+                    description "1 = (linkIsUp=1) AND (eeeIsAvail=1) AND (eeeIsOn=1) AND link is currently in idle mode. If Energy Efficient Ethernet is not supported or switched off, this attribute must be 0.";

+                }

+                leaf tx-level-cur {

+                    type int8;

+                    units "dBm";

+                    default 99;

+                    config false;

+                    description "Current transmit power";

+                }

+                leaf-list rx-level-cur {

+                    type int8;

+                    units "dBm";

+                    config false;

+                    min-elements 1;

+                    max-elements 4;

+                    description "Current receive power; Also used for receive signal power measured at the Medium Dependent Interface (MDI) of 10GBASE-T during training as described in 802.3 55.4.3.1";

+                }

+                leaf temp-cur {

+                    type int8;

+                    units "Celsius";

+                    default -99;

+                    config false;

+                    description "Current temperature (in degree Celsius) inside the transceiver

+                        To be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::DynamicDetails::PhysicalProperties ";

+                }

+                leaf loop-back-kind-up {

+                    type loop-back-type;

+                    default none;

+                    config false;

+                    description "Paramter and MW IM

+                        The currently active (not just configured) type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site.";

+                }

+                description "none";

+            }

+            grouping wire-interface-current-problems-g {

+                list current-problem-list {

+                    key 'sequence-number';

+                    config false;

+                    uses wire-interface-current-problem-type-g;

+                    description "none";

+                }

+                description "none";

+            }

+            grouping wire-interface-current-performance-g {

+                list current-performance-data-list {

+                    key 'scanner-id';

+                    config false;

+                    min-elements 1;

+                    max-elements 2;

+                    uses wire-interface-current-performance-type-g;

+                    description "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too.";

+                }

+                description "Aggregated performance information of the air interface at a particular moment.";

+            }

+            grouping wire-interface-historical-performances-g {

+                list historical-performance-data-list {

+                    key 'history-data-id';

+                    config false;

+                    uses wire-interface-historical-performance-type-g;

+                    description "none";

+                }

+                description "Aggregated performance information of the air interface for a pre-defined measurement interval.";

+            }

+

+        /***********************

+        * package super-classes

+        **********************/ 

+            grouping mw-current-problem-g {

+                leaf sequence-number {

+                    type int32;

+                    config false;

+                    description "Unique sequence number of the current problem object.";

+                }

+                leaf time-stamp {

+                    type yang:date-and-time;

+                    default "2017-01-01T00:00:00.0Z";

+                    config false;

+                    description "Time and date of the problem.  ";
+                }

+                leaf problem-severity {

+                    type severity-type;

+                    default warning;

+                    config false;

+                    description "Severity of the alarm.";

+                }

+                description "none";

+            }

+

+

+    /***********************

+    * package notifications

+    **********************/ 

+        notification object-creation-notification {

+            uses object-creation-notification-g;

+            description "none";

+        }

+        grouping object-creation-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts object creation notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf object-type {

+                type string;

+                default "Type of created object not specified.";

+                description "Type of Object to be chosen from the following list of values: 'MW_AirInterface_Pac', 'MW_AirInterfaceDiversity_Pac', 'MW_Structure_Pac', 'MW_PureEthernetStructure_Pac', 'MW_HybridMwStructure_Pac', 'MW_Container_Pac', 'MW_EthernetContainer_Pac' or 'MW_TdmContainer_Pac'.";

+            }

+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac has to be instancieted in the controller.";

+        }

+        notification object-deletion-notification {

+            uses object-deletion-notification-g;

+            description "none";

+        }

+        grouping object-deletion-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts object deletion notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            description "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac instance has to be deleted in the controller.";

+        }

+        notification attribute-value-changed-notification {

+            uses attribute-value-changed-notification-g;

+            description "none";

+        }

+        grouping attribute-value-changed-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts attribute value changed notifications.";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf attribute-name {

+                type string;

+                default "Attribute name not specified.";

+                description "Name of the attribute that has been changed.";

+            }

+            leaf new-value {

+                type string;

+                default "New value not specified.";

+                description "Attribute value converted to a string (xml, json, ...)";

+            }

+            description "To be sent when an attribute has changed and one or more controllers have to update their data.";

+        }

+        notification problem-notification {

+            uses problem-notification-g;

+            description "none";

+        }

+        grouping problem-notification-g {

+            leaf counter {

+                type int32;

+                default -1;

+                description "Counts problem notifications";

+            }

+            leaf time-stamp {

+                type yang:date-and-time;

+                default "2017-01-01T00:00:00.0Z";

+                description "none";

+            }

+            leaf object-id-ref {

+                type core-model:universal-id;

+                description "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+            }

+            leaf problem {

+                type string;

+                default "Problem name not specified.";

+                description "Name of the problem according to AirInterface::AirInterfaceCapability::supportedAlarms or AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms or Structure::StructureCapability::supportedAlarms or PureEthernetStructure::PureEthernetStructureCapability::supportedAlarms or HybridMwStructure::HybridMwStructureCapability::supportedAlarms or Container::ContainerCapability::supportedAlarms or EthernetContainer::EthernetContainerCapability::supportedAlarms or TdmContainer::TdmContainerCapability::supportedAlarms.";

+            }

+            leaf severity {

+                type severity-type;

+                default warning;

+                description "Severity of the problem according to AirInterface::AirInterfaceConfiguration::problemSeverityList, AirInterfaceDiversity::AirInterfaceDiversityConfiguration::problemSeverityList, Structure::StructureConfiguration::problemSeverityList, PureEthernetStructure::PureEthernetStructureConfiguration::problemSeverityList, HybridMwStructure::HybridMwStructureConfiguration::problemSeverityList, Container::ContainerConfiguration::problemSeverityList, EthernetContainer::EthernetContainerConfiguration::problemSeverityList or TdmContainer::TdmContainerConfiguration::problemSeverityList";

+            }

+            description "To be sent when a problem occurs at a MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac.";

+        }

+

+}

diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-core-model-conditional-packages@2017-04-02.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-core-model-conditional-packages@2017-04-02.yang
new file mode 100644
index 000000000..44c99b10e
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-core-model-conditional-packages@2017-04-02.yang
@@ -0,0 +1,350 @@
+module onf-core-model-conditional-packages {
+    namespace "urn:onf:params:xml:ns:yang:onf-core-model-conditional-packages";
+    prefix onf-core-model-conditional-packages;
+    import core-model {
+        prefix core-model;
+    }
+    import microwave-model {
+        prefix microwave-model;
+    }
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             WG Chair: Giorgio Cazzaniga
+                       <mailto:giorgio.cazzaniga@sm-optics.com>
+             Editors:  Thorsten Heinze
+                       <mailto:thorsten.heinze@telefonica.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This model adds conditional packages to the ONF CoreModel in order to support fault management for object classes NetworkElement, Equipment and Holder.";
+    revision 2017-04-02 {
+        description "Initial version";
+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";
+    }
+    /***********************
+    * package type-definitions
+    **********************/ 
+        grouping current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "not-specified";
+                config false;
+                description "Name of the alarm according capability::supportedAlarms.";
+            }
+            uses microwave-model:mw-current-problem-g;
+            description "none";
+        }
+        grouping network-element-current-problem-type-g {
+            leaf problem-name {
+                type string;
+                default "not-specified";
+                config false;
+                description "Name of the alarm according capability::supportedAlarms.";
+            }
+            leaf object-reference {
+                type string;
+                config false;
+                description "An explaining string of the related object class. This is necesseary, because the current problem list of the NetworkElement object class acts as a container for all alarms, where its object classes are not modeled.";
+            }
+            uses microwave-model:mw-current-problem-g;
+            description "none";
+        }
+        grouping problem-severity-type-g {
+            leaf problem-type-name {
+                type string;
+                description "Name of the alarm according to Capability::supportedAlarms";
+            }
+            leaf problem-type-severity {
+                type microwave-model:severity-type;
+                description "Severity of this type of alarm.";
+            }
+            description "none";
+        }
+        typedef processing-type {
+            type enumeration {
+                enum done {
+                    description "none";
+                }
+                enum processing {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+
+    /***********************
+    * package object-classes
+    **********************/ 
+        /***********************
+        * package network-element
+        **********************/ 
+            container network-element-pac {
+                leaf network-element {
+                    type leafref {
+                        path '/core-model:network-element/core-model:uuid';
+                    }
+                    description "none";
+                }
+                container network-element-capability {
+                    config false;
+                    uses network-element-capability-g;
+                    description "none";
+                }
+                container network-element-configuration {
+                    uses network-element-configuration-g;
+                    description "none";
+                }
+                container network-element-status {
+                    config false;
+                    uses network-element-status-g;
+                    description "none";
+                }
+                container network-element-current-problems {
+                    config false;
+                    uses network-element-current-problems-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping network-element-capability-g {
+                leaf-list supported-alarms {
+                    type string;
+                    config false;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping network-element-configuration-g {
+                list problem-type-severity-list {
+                    key 'problem-type-name';
+                    uses problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                leaf trigger-refresh {
+                    type boolean;
+                    description "A trigger to instruct the netconf server to refresh its internal database/cache. 
+                                 It is primary used for alarms status, but could be used for anything else too. 
+                                 It is assumed that the refresh mechanism takes some time. 
+                                 In order to indicate the process to the controller a refreshStatus attribute is used.";
+                }
+                description "none";
+            }
+            grouping network-element-status-g {
+                leaf refresh-status {
+                    type processing-type;
+                    config false;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping network-element-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses network-element-current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+
+        /***********************
+        * package equipment
+        **********************/ 
+            list equipment-pac {
+                key 'equipment';
+                leaf equipment {
+                    type leafref {
+                        path '/core-model:equipment/core-model:uuid';
+                    }
+                    description "none";
+                }
+                container equipment-capability {
+                    config false;
+                    uses equipment-capability-g;
+                    description "none";
+                }
+                container equipment-configuration {
+                    uses equipment-configuration-g;
+                    description "none";
+                }
+                container equipment-status {
+                    config false;
+                    uses equipment-status-g;
+                    description "none";
+                }
+                container equipment-current-problems {
+                    config false;
+                    uses equipment-current-problems-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping equipment-capability-g {
+                leaf-list supported-alarms {
+                    type string;
+                    config false;
+                    description "Available alarms to be listed. Names are to be separated by commas.";
+                }
+                description "none";
+            }
+            grouping equipment-configuration-g {
+                list problem-type-severity-list {
+                    key 'problem-type-name';
+                    uses problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "none";
+            }
+            grouping equipment-status-g {
+                description "none";
+            }
+            grouping equipment-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+
+        /***********************
+        * package holder
+        **********************/ 
+            list holder-pac {
+                key 'holder';
+                leaf holder {
+                    type leafref {
+                        path '/core-model:equipment/core-model:contained-holder/core-model:uuid';
+                    }
+                    description "none";
+                }
+                container holder-capability {
+                    config false;
+                    uses holder-capability-g;
+                    description "none";
+                }
+                container holder-configuration {
+                    uses holder-configuration-g;
+                    description "none";
+                }
+                container holder-status {
+                    config false;
+                    uses holder-status-g;
+                    description "none";
+                }
+                container holder-current-problems {
+                    config false;
+                    uses holder-current-problems-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping holder-capability-g {
+                leaf-list supported-alarms {
+                    type string;
+                    config false;
+                    description "Available alarms to be listed. Names are to be separated by commas.";
+                }
+                description "none";
+            }
+            grouping holder-configuration-g {
+                list problem-type-severity-list {
+                    key 'problem-type-name';
+                    uses problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                description "none";
+            }
+            grouping holder-status-g {
+                description "none";
+            }
+            grouping holder-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+
+        /***********************
+        * package connector
+        **********************/ 
+            list connector-pac {
+                key 'connector';
+                leaf connector {
+                    type leafref {
+                        path '/core-model:equipment/core-model:exposed-cable/core-model:connector/core-model:uuid';
+                    }
+                    description "none";
+                }
+                container connector-capability {
+                    config false;
+                    uses connector-capability-g;
+                    description "none";
+                }
+                container connector-configuration {
+                    uses connector-configuration-g;
+                    description "none";
+                }
+                container connector-status {
+                    config false;
+                    uses connector-status-g;
+                    description "none";
+                }
+                container connector-current-problems {
+                    config false;
+                    uses connector-current-problems-g;
+                    description "none";
+                }
+                description "none";
+            }
+            grouping connector-capability-g {
+                leaf-list supported-alarms {
+                    type string;
+                    config false;
+                    description "Available alarms to be listed. Names are to be separated by commas.";
+                }
+                description "none";
+            }
+            grouping connector-configuration-g {
+                list problem-type-severity-list {
+                    key 'problem-type-name';
+                    uses problem-severity-type-g;
+                    description "Severity of the problem to be configured.";
+                }
+                leaf remote-end-point {
+                    type string;
+                    description "A network wide identifier of the remote connector. The value is used for topology discovery. 
+Please see also ConnectorStatus::localEndPoint.";
+                }
+                description "none";
+            }
+            grouping connector-status-g {
+                leaf local-end-point {
+                    type string;
+                    description "A network wide global identifier of the this connector, which can be used to discover the physical connectivitiy.
+The value should contain the network element name, because the network element software can assume that the network element name is unique in the network. 
+The value should be formated:
+<connector:uuid>@<network-element-name>
+
+Please see also ConnectorConfiguration::remoteEndPoint";
+                }
+                description "none";
+            }
+            grouping connector-current-problems-g {
+                list current-problem-list {
+                    key 'sequence-number';
+                    config false;
+                    uses current-problem-type-g;
+                    description "none";
+                }
+                description "none";
+            }
+
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ethernet-conditional-packages@2017-04-02.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ethernet-conditional-packages@2017-04-02.yang
new file mode 100644
index 000000000..4d6fb7c25
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ethernet-conditional-packages@2017-04-02.yang
@@ -0,0 +1,88 @@
+module onf-ethernet-conditional-packages {
+    namespace "urn:onf:params:xml:ns:yang:onf-ethernet-conditional-packages";
+    prefix onf-ethernet-conditional-packages;
+    import core-model {
+        prefix core-model;
+    }
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             WG Chair: Giorgio Cazzaniga
+                       <mailto:giorgio.cazzaniga@sm-optics.com>
+             Editors:  Thorsten Heinze
+                       <mailto:thorsten.heinze@telefonica.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This model adds conditional packages to the ONF CoreModel in order address Ethernet use cases.";
+    revision 2017-04-02 {
+        description "Initial version";
+        reference "ONF TR 532: A YANG Data Model for Wireless Networks.";
+    }
+    /***********************
+    * package object-classes
+    **********************/ 
+        list ethernet-pac {
+            key 'layer-protocol';
+            leaf layer-protocol {
+                type leafref {
+                    path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                }
+                description "none";
+            }
+            container ethernet-capability {
+                config false;
+                uses ethernet-capability-g;
+                description "none";
+            }
+            container ethernet-configuration {
+                uses ethernet-configuration-g;
+                description "none";
+            }
+            container ethernet-status {
+                config false;
+                uses ethernet-status-g;
+                description "none";
+            }
+            container ethernet-current-problems {
+                config false;
+                uses ethernet-current-problems-g;
+                description "none";
+            }
+            container ethernet-current-performance {
+                config false;
+                uses ethernet-current-performance-g;
+                description "none";
+            }
+            container ethernet-historical-performances {
+                config false;
+                uses ethernet-historical-performances-g;
+                description "none";
+            }
+            description "none";
+        }
+        grouping ethernet-capability-g {
+            description "none";
+        }
+        grouping ethernet-configuration-g {
+            leaf vlan-id {
+                type int16;
+                description "value = 0: frames on ingress must be untagged, frames on egress get untagged; value = any other positive integer < 4096: frames on ingress must be tagged with this VLAN ID, frames on egress either already have or get this VLAN ID attached;";
+            }
+            description "none";
+        }
+        grouping ethernet-status-g {
+            description "none";
+        }
+        grouping ethernet-current-problems-g {
+            description "none";
+        }
+        grouping ethernet-current-performance-g {
+            description "none";
+        }
+        grouping ethernet-historical-performances-g {
+            description "none";
+        }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-otn-odu-conditional-packages@2017-10-20.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-otn-odu-conditional-packages@2017-10-20.yang
new file mode 100644
index 000000000..89d6cbfcf
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-otn-odu-conditional-packages@2017-10-20.yang
@@ -0,0 +1,361 @@
+module onf-otn-odu-conditional-packages {
+    namespace "urn:onf:params:xml:ns:yang:onf-otn-odu-conditional-packages";
+    prefix onf-otn-odu-conditional-packages;
+    import core-model {
+        prefix core-model;
+    }
+    organization "ONF (Open Networking Foundation) Open Transport Working Group";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             Editors:  Mohit Chamania 
+                       <MChamania@advaoptical.com>
+                       Dzmitry Khomchanka
+                       <dzmitry.khomchanka@vpi-minsk.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This model adds conditional packages to the ONF CoreModel 1.2 
+                 in order address OTN ODU use cases. It is a temorary model for 
+                 demontration purposes and bases on the ideas an concepts of
+                 TAPI. However, modifications for a pure southbound were
+                 nessesary.";
+    revision 2017-10-20 {
+        description "Initial version";
+        reference "ONF TR 512: Core Model.";
+    }
+    /***********************
+    * package type-definitions (copied from TAPI; revision: 2017-05-31)
+    **********************/ 
+        typedef mapping-type {
+            type enumeration {
+                enum amp {
+                    description "none";
+                }
+                enum bmp {
+                    description "none";
+                }
+                enum gfp-f {
+                    description "none";
+                }
+                enum gmp {
+                    description "none";
+                }
+                enum ttp-gfp-bmp {
+                    description "none";
+                }
+                enum null {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef odu-named-payload-type {
+            type enumeration {
+                enum unknown {
+                    description "none";
+                }
+                enum uninterpretable {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef odu-slot-size {
+            type enumeration {
+                enum 1-g-25 {
+                    description "none";
+                }
+                enum 2-g-5 {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef odu-type {
+            type enumeration {
+                enum odu-0 {
+                    description "none";
+                }
+                enum odu-1 {
+                    description "none";
+                }
+                enum odu-2 {
+                    description "none";
+                }
+                enum odu-2-e {
+                    description "none";
+                }
+                enum odu-3 {
+                    description "none";
+                }
+                enum odu-4 {
+                    description "none";
+                }
+                enum odu-flex {
+                    description "none";
+                }
+                enum odu-cn {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        grouping odu-payload-type-g {
+            leaf named-payload-type {
+                type odu-named-payload-type;
+                description "none";
+            }
+            leaf hex-payload-type {
+                type uint64;
+                description "none";
+            }
+            description "none";
+        }
+    /***********************
+    * package object-classes
+    **********************/ 
+
+        /***********************
+         * OTN ODU Connection (ODU-CTP)
+         **********************/ 
+        list otn-odu-connection-pac {
+            key 'layer-protocol';
+            leaf layer-protocol {
+                type leafref {
+                    path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                }
+                description "none";
+            }
+            container otn-odu-connection-capability {
+                config false;
+                uses otn-odu-connection-capability-g;
+                description "none";
+            }
+            container otn-odu-connection-configuration {
+                uses otn-odu-connection-configuration-g;
+                description "none";
+            }
+            container otn-odu-connection-status {
+                config false;
+                uses otn-odu-connection-status-g;
+                description "none";
+            }
+            container otn-odu-connection-current-problems {
+                config false;
+                uses otn-odu-connection-current-problems-g;
+                description "none";
+            }
+            container otn-odu-connection-current-performance {
+                config false;
+                uses otn-odu-connection-current-performance-g;
+                description "none";
+            }
+            container otn-odu-connection-historical-performances {
+                config false;
+                uses otn-odu-connection-historical-performances-g;
+                description "none";
+            }
+            description "none";
+        }
+        grouping otn-odu-connection-capability-g {
+            container accepted-payload-type {
+                uses odu-payload-type-g;
+                description 
+                    "This attribute is applicable when the ODU CTP object 
+                     instance represents a lower order ODU CTP Sink at the 
+                     client layer of the ODUP/ODU[i]j or ODUP/ODUj-21 adaptation
+                     function. 
+                     This attribute is a 2-digit Hex code that indicates the new
+                     accepted payload type.
+                     Valid values are defined in Table 15-8 of ITU-T 
+                     Recommendation G.709 with one additional value 
+                     UN_INTERPRETABLE.";
+            }
+            description "none";
+        }
+        grouping otn-odu-connection-configuration-g {
+            leaf-list tributary-slot-list {
+                type uint64;
+                description 
+                    "This attribute contains a set of distinct (i.e. unique) 
+                     integers (e.g. 2, 3, 5, 9, 15 representing the tributary 
+                     slots TS2, TS3, TS5, TS9 and TS15) which represents the 
+                     resources occupied by the Low Order ODU Link Connection 
+                     (e.g. carrying an ODUflex with a bit rate of 6.25G). 
+                     This attribute applies when the LO ODU_ConnectionTerminationPoint 
+                     connects with an HO ODU_TrailTerminationPoint object. 
+                     It will not apply if this ODU_ConnectionTerminationPoint 
+                     object directly connects to an OTU_TrailTerminationPoint 
+                     object (i.e. OTU has no trib slots). 
+                     The upper bound of the integer allowed in this set is a 
+                     function of the HO-ODU server layer to which the ODU 
+                     connection has been mapped (adapted). 
+                     Thus, for example, M=8/32/80 for ODU2/ODU3/ODU4 server 
+                     layers (respectively). Note that the value of this 
+                     attribute can be changed only in the case of ODUflex and 
+                     has to be through specific operations (i.e. not be changing
+                     the attribute tributarySlotList directly).";
+            }
+            leaf tributary-port-number {
+                type uint64;
+                description 
+                    "This attribute identifies the tributary port number that is
+                     associated with the ODU CTP. 
+                     range of type : The value range depends on the size of the 
+                     Tributary Port Number (TPN) field used which depends on th 
+                     server-layer ODU or OTU.
+                     In case of ODUk mapping into OTUk, there is no TPN field, 
+                     so the tributaryPortNumber shall be zero.
+                     In case of LO ODUj mapping over ODU1, ODU2 or ODU3, the TPN
+                     is encoded in a 6-bit field so the value range is 0-63. 
+                     See clause 14.4.1/G.709-2016.
+                     In case of LO ODUj mapping over ODU4, the TPN is encoded in 
+                     a 7-bit field so the value range is 0-127. 
+                     See clause 14.4.1.4/G.709-2016.
+                     In case of ODUk mapping over ODUCn, the TPN is encoded in a
+                     14-bit field so the value range is 0-16383. See clause 
+                     20.4.1.1/G.709-2016.
+                    ";
+            }
+            leaf accepted-m-si {
+                type string;
+                description 
+                    "This attribute is applicable when the ODU CTP object 
+                     instance represents a lower order ODU1 or ODU2 CTP Sink at 
+                     the client layer of the ODU3P/ODU12 adaptation function or 
+                     represents a lower order ODUj CTP Sink at the client layer 
+                     of the ODUP/ODUj-21 adaptation function. This attribute is 
+                     a 1-byte field that represents the accepted multiplex 
+                     structure of the adaptation function. ";
+            }
+            leaf opu-tributary-slot-size {
+                type odu-slot-size;
+                description 
+                    "This attribute is applicable for ODU2 and ODU3 CTP only.
+                     [sko] Why that? 
+                     It indicates the slot size of the ODU CTP.";
+            }
+            leaf auto-payload-type {
+                type boolean;
+                description 
+                    "This attribute is applicable when the ODU CTP object 
+                     instance represents a lower order ODU CTP Source at the 
+                     client layer of the ODUP/ODUj-21 adaptation function. The 
+                     value of true of this attribute configures that the 
+                     adaptation source function shall fall back to the payload 
+                     type PT=20 if the conditions specified in 14.3.10.1/G.798 
+                     are satisfied. ";
+            }
+            leaf configured-mapping-type {
+                type mapping-type;
+                description 
+                    "This attributes indicates the configured mapping type.";
+            }
+            leaf configured-client-type {
+                type string;
+                description 
+                    "This attribute configures the type of the client CTP of the
+                     server ODU TTP.";
+            }
+            description 
+               "This Pac contains the attributes associated with the ODU-CTP.";
+        }
+        grouping otn-odu-connection-status-g {
+            description "none";
+        }
+        grouping otn-odu-connection-current-problems-g {
+            description "none";
+        }
+        grouping otn-odu-connection-current-performance-g {
+            description "none";
+        }
+        grouping otn-odu-connection-historical-performances-g {
+            description "none";
+        }
+
+
+        /***********************
+         * OTN ODU Termination (ODU-TTP)
+         **********************/ 
+        list otn-odu-termination-pac {
+            key 'layer-protocol';
+            leaf layer-protocol {
+                type leafref {
+                    path '/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid';
+                }
+                description "none";
+            }
+            container otn-odu-termination-capability {
+                config false;
+                uses otn-odu-termination-capability-g;
+                description "none";
+            }
+            container otn-odu-termination-configuration {
+                uses otn-odu-termination-configuration-g;
+                description "none";
+            }
+            container otn-odu-termination-status {
+                config false;
+                uses otn-odu-termination-status-g;
+                description "none";
+            }
+            container otn-odu-termination-current-problems {
+                config false;
+                uses otn-odu-termination-current-problems-g;
+                description "none";
+            }
+            container otn-odu-termination-current-performance {
+                config false;
+                uses otn-odu-termination-current-performance-g;
+                description "none";
+            }
+            container otn-odu-termination-historical-performances {
+                config false;
+                uses otn-odu-termination-historical-performances-g;
+                description "none";
+            }
+            description "none";
+        }
+        grouping otn-odu-termination-capability-g {
+            description "none";
+        }
+        grouping otn-odu-termination-configuration-g {
+            leaf odu-type {
+                type odu-type;
+                description "This attribute specifies the type of the ODU 
+                             termination point.";
+            }
+            leaf odu-rate {
+                type uint64;
+                description "This attribute indicates the rate of the ODU 
+                             terminatinon point. 
+                             This attribute is Set at create; i.e., once created
+                             it cannot be changed directly. 
+                             In case of resizable ODU flex, its value can be 
+                             changed via HAO (not directly on the attribute).";
+            }
+            leaf odu-rate-tolerance {
+                type uint64;
+                units "ppm";
+                description "This attribute indicates the rate tolerance of the 
+                             ODU termination point. 
+                             Valid values are real value in the unit of ppm. 
+                             Standardized values are defined in Table 7-2/G.709.
+                             ";
+            }
+            description "none";
+        }
+        grouping otn-odu-termination-status-g {
+            description "none";
+        }
+        grouping otn-odu-termination-current-problems-g {
+            description "none";
+        }
+        grouping otn-odu-termination-current-performance-g {
+            description "none";
+        }
+        grouping otn-odu-termination-historical-performances-g {
+            description "none";
+        }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ptp-dataset@2017-05-08.yang b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ptp-dataset@2017-05-08.yang
new file mode 100644
index 000000000..41a1c3935
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/main/yang/onf/onf-ptp-dataset@2017-05-08.yang
@@ -0,0 +1,125 @@
+module onf-ptp-dataset {
+    namespace "urn:onf:params:xml:ns:yang:onf-ptp-dataset";
+    prefix ptp-ex;
+
+    import ietf-yang-types {
+        prefix yang;
+    }
+    import core-model {
+        prefix core-model;
+    }
+    import ietf-ptp-dataset {
+        prefix ptp;
+    }
+
+    organization "ONF (Open Networking Foundation) Open Transport Working Group - Wireless Transport Project";
+    contact "WG Web: <https://www.opennetworking.org/technical-communities/areas/specification/1931-optical-transport>
+             WG List:  <mailto:wireless-transport@login.opennetworking.org>
+             WG Chair: Lyndon Ong
+                       <mailto:lyong@ciena.com>
+             Editors:  Alfons Mittermaier
+                       <mailto:alfons.mittermaier@@highstreet-technologies.com>
+                       Martin Skorupski
+                       <mailto:martin.skorupski@highstreet-technologies.com>";
+    description "This module contains a collection of YANG definitions to extent ptp-dataset.";
+    revision 2017-05-08 {
+        description "Initial version";
+        reference "A YANG Data Model extending ptp-dataset.";
+    }
+
+    augment "/ptp:instance-list/ptp:default-ds" {
+        description
+            "Addition of data nodes for the default data set of the clock.";
+
+        leaf local-priority {
+            type uint8;
+            default 128;
+            description
+                "none";
+            reference 
+                "ITU-T G.8275.1 Precision time protocol telecom profile for phase/time 
+                 synchronization with full timing support from the network
+                 Chapter 6.3.2";
+        }
+
+        leaf max-steps-removed {
+            type uint8;
+            default 128;
+            description
+                "none";
+            reference 
+                "ITU-T G.8275.1 Precision time protocol telecom profile for phase/time 
+                 synchronization with full timing support from the network
+                 Chapter 6.3";
+        }
+
+        leaf multicast-mac-address {
+            type yang:mac-address;
+            description
+                "none";
+        }
+        
+        leaf designated-enabled {
+            type boolean;
+            default true;
+            description
+                "A PTP Clock needs to be enabled by management.";
+        }
+    }
+
+    augment "/ptp:instance-list/ptp:port-ds-list" {
+        description
+            "Addition of data nodes for the default data set of the clock.";
+
+        leaf master-only {
+            type boolean;
+            default true;
+            description
+                "Indicates that port can only be a master.";
+        }
+
+        leaf local-priority {
+            type uint8;
+            default 128;
+            description
+                "Local priority as used for alternate BMCA";
+            reference 
+                "ITU-T G.8275.1 Precision time protocol telecom profile for phase/time 
+                 synchronization with full timing support from the network
+                 Chapter 6.3.2";
+        }
+
+        leaf designated-enabled {
+            type boolean;
+            default true;
+            description
+                "A PTP Port needs to be enabled by management.";
+            reference 
+                "IEEE 1588-2008 IEEE Standard for a Precision Clock Synchronization Protocol 
+                 for Networked Measurement and Control Systems
+                 Chapter 9.2";
+        }
+
+        leaf delay-asymmetry {
+            type int64;
+            default 0;
+            description
+                "As per PTP	Known path asymmetry in ns.";
+            reference 
+                "ITU-T G.8275.1 Precision time protocol telecom profile for phase/time 
+                 synchronization with full timing support from the network
+                 Chapter 7.4.2";
+        }
+        
+        leaf logical-termination-point {
+            type leafref {
+                path '/core-model:network-element/core-model:ltp/core-model:uuid';
+            }
+            description
+                "A reference to a LTP of layer-protocol-name 'ETY' or 'MWPS', which is used 
+                 to discover the PTP topology.";
+        }
+
+    }
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/AllPmTest.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/AllPmTest.java
deleted file mode 100644
index 538dcd47a..000000000
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/AllPmTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START=======================================================
- * ONAP : ccsdk feature sdnr wt
- *  ================================================================================
- * Copyright (C) 2019 Nokia 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=========================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance24Hours;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-
-public class AllPmTest {
-
-    private AllPm allPm;
-
-    @Before
-    public void setUp(){
-        allPm = AllPm.getEmpty();
-    }
-
-    @Test
-    public void shouldCreateEmptyInstance() {
-        assertEquals(0, allPm.size());
-    }
-
-
-    @Test
-    public void shouldBePossibleToAdd15MinutesPerformanceMeasurements() {
-        // given
-        final EsHistoricalPerformance15Minutes esHistoricalPerformance15Minutes_1 = mock(EsHistoricalPerformance15Minutes.class);
-        final EsHistoricalPerformance15Minutes esHistoricalPerformance15Minutes_2 = mock(EsHistoricalPerformance15Minutes.class);
-
-        allPm.add(esHistoricalPerformance15Minutes_1);
-        allPm.add(esHistoricalPerformance15Minutes_2);
-
-
-        // when
-        final List<EsHistoricalPerformance15Minutes> pm15size = allPm.getPm15();
-        final List<EsHistoricalPerformance24Hours> pm24size = allPm.getPm24();
-
-        // then
-        assertEquals(2, pm15size.size());
-        assertEquals(0, pm24size.size());
-    }
-
-    @Test
-    public void shouldBePossibleToAdd24HoursPerformanceMeasurements() {
-        // given
-        final EsHistoricalPerformance24Hours esHistoricalPerformance24Hours_1 = mock(EsHistoricalPerformance24Hours.class);
-        final EsHistoricalPerformance24Hours esHistoricalPerformance24Hours_2 = mock(EsHistoricalPerformance24Hours.class);
-
-        allPm.add(esHistoricalPerformance24Hours_1);
-        allPm.add(esHistoricalPerformance24Hours_2);
-
-
-        // when
-        final List<EsHistoricalPerformance15Minutes> pm15size = allPm.getPm15();
-        final List<EsHistoricalPerformance24Hours> pm24size = allPm.getPm24();
-
-        // then
-        assertEquals(0, pm15size.size());
-        assertEquals(2, pm24size.size());
-    }
-
-    @Test
-    public void shouldBePossibleToAddPerformanceMeasurements() {
-        // given
-        final EsHistoricalPerformance15Minutes esHistoricalPerformance15Minutes = mock(EsHistoricalPerformance15Minutes.class);
-        final EsHistoricalPerformance24Hours esHistoricalPerformance24Hours = mock(EsHistoricalPerformance24Hours.class);
-
-        allPm.add(esHistoricalPerformance15Minutes);
-        allPm.add(esHistoricalPerformance24Hours);
-
-        // when
-        final int size = allPm.size();
-
-        // then
-        assertEquals(2, size);
-    }
-
-
-}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAai.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAai.java
index c01685053..a94c80c22 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAai.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAai.java
@@ -37,14 +37,15 @@ import java.util.concurrent.Executors;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.AaiProviderClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AaiConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.config.AaiConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.ResourceFileLoader;
 
-@SuppressWarnings("restriction")
 public class TestAai {
 
+    private static final String CONFIGURATIONTESTFILE = "test.properties"; // for
     private static final String ENABLEDAAI_TESTCONFIG_FILENAME = "test2.properties";
     private static final File ENABLEDAAI_TESTCONFIG_FILE = new File(ENABLEDAAI_TESTCONFIG_FILENAME);
     private static final int AAI_SERVER_PORT=45454;
@@ -98,11 +99,13 @@ public class TestAai {
             "";
     private HttpServer server;
     private ExecutorService httpThreadPool;
-    private HtDevicemanagerConfiguration globalCfg;
+    private ConfigurationFileRepresentation globalCfg;
 
     @Test
     public void test() {
-        HtDevicemanagerConfiguration cfg=HtDevicemanagerConfiguration.getTestConfiguration();
+
+		String testConfigurationFileName = ResourceFileLoader.getFile(this, CONFIGURATIONTESTFILE).getAbsolutePath();
+		ConfigurationFileRepresentation cfg=new ConfigurationFileRepresentation(testConfigurationFileName);
 
         AaiProviderClient provider = new AaiProviderClient(cfg, null);
 
@@ -173,12 +176,13 @@ public class TestAai {
         } catch (IOException e1) {
             fail(e1.getMessage());
         }
-        globalCfg=HtDevicemanagerConfiguration.getTestConfiguration(ENABLEDAAI_TESTCONFIG_FILENAME,true);
-        AaiConfig.reload();
+        //globalCfg=HtDevicemanagerConfiguration.getTestConfiguration(ENABLEDAAI_TESTCONFIG_FILENAME,true);
+        globalCfg = new ConfigurationFileRepresentation(ENABLEDAAI_TESTCONFIG_FILENAME);
         this.server = HttpServer.create(new InetSocketAddress(AAI_SERVER_PORT), 0);
         this.httpThreadPool = Executors.newFixedThreadPool(5);
         this.server.setExecutor(this.httpThreadPool);
-        this.server.createContext(globalCfg.getAai().getBaseUri(), new MyHandler());
+        AaiConfig config = new AaiConfig(globalCfg);
+        this.server.createContext(config.getBaseUri(), new MyHandler());
         //server.createContext("/", new MyRootHandler());
         this.server.setExecutor(null); // creates a default executor
         this.server.start();
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAkkaConfig.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAkkaConfig.java
index 3d690116d..7bc30550f 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAkkaConfig.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestAkkaConfig.java
@@ -23,9 +23,8 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 import static org.junit.Assert.fail;
 import java.io.File;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AaiConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AkkaConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.util.ClusterNodeInfo;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka.AkkaConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlAkka.ClusterNodeInfo;
 
 public class TestAkkaConfig {
 
@@ -134,11 +133,4 @@ public class TestAkkaConfig {
             fail(failMessage);
         }
     }
-
-    @Test
-    public void test4() {
-        AaiConfig cfg = AaiConfig.getDefaultConfiguration();
-        cfg.hashCode();
-    }
-
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestConfiguration.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestConfiguration.java
new file mode 100644
index 000000000..596196faa
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestConfiguration.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * ============LICENSE_START======================================================= ONAP : ccsdk
+ * feature sdnr wt ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
+
+import java.io.File;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.exception.ConfigurationException;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.ResourceFileLoader;
+
+public class TestConfiguration {
+
+    private static final String CONFIGURATIONTESTFILE = "test.properties"; // for
+
+    @Test
+    public void test1() throws ConfigurationException {
+
+		System.out.println("Configuration file " + CONFIGURATIONTESTFILE);
+
+		File testConfigurationFile = ResourceFileLoader.getFile(this, CONFIGURATIONTESTFILE);
+		System.out.println("Located at: "+testConfigurationFile.getAbsolutePath());
+
+		ConfigurationFileRepresentation configuration = new ConfigurationFileRepresentation(testConfigurationFile);
+
+		System.out.println("Configuration: " + configuration.getSection(EsConfig.SECTION_MARKER_ES));
+		EsConfig esConfig1 = new EsConfig(configuration);
+
+		System.out.println("ES config getArchiveLifetimeSeconds: "+esConfig1.getArchiveLifetimeSeconds());
+
+
+		// fail("Not yet implemented");
+    }
+
+    @Test
+    public void test2() {
+
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDatabaseClient.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDatabaseClient.java
new file mode 100644
index 000000000..faea46180
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDatabaseClient.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.ExtRestClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.InvalidProtocolException;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo.Protocol;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.CreateIndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.GetIndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.IndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.CreateIndexResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.IndexResponse;
+
+public class TestDatabaseClient {
+
+
+	private static ExtRestClient client;
+
+	@BeforeClass
+	public static void init() throws InvalidProtocolException {
+
+		 client = ExtRestClient.createInstance("localhost",9200,Protocol.HTTP);
+
+	}
+	@AfterClass
+	public static void deinit() {
+		try {
+			client.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+    @Ignore
+	@Test
+	public void testIndexExists() {
+
+		 GetIndexRequest request =new GetIndexRequest("mwtn");
+		 try {
+				boolean response = client.indicesExists(request);
+				assertTrue(response);
+			} catch (IOException e) {
+				fail(e.getMessage());
+			}
+		 request =new GetIndexRequest("mwrn");
+		 try {
+				boolean response = client.indicesExists(request);
+				assertFalse(response);
+			} catch (IOException e) {
+				fail(e.getMessage());
+			}
+
+	}
+    @Ignore
+	@Test
+	public void testIndexCreate() {
+		CreateIndexRequest request = new CreateIndexRequest("mwtn");
+		try {
+			CreateIndexResponse response = client.createIndex(request);
+			assertTrue(response.isAcknowledged());
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+	}
+    @Ignore
+	@Test
+	public void testAddPmEntry() {
+		String json="{\"node-name\":\"sim12600\",\"uuid-interface\":\"LP-MWPS-TTP-01\",\"layer-protocol-name\":\"MWPS\",\"radio-signal-id\":\"Test11\",\"time-stamp\":\"2017-07-04T00:00:00.0Z\",\"granularity-period\":\"PERIOD_24HOURS\",\"scanner-id\":\"PM_RADIO_24H_1\",\"performance-data\":{\"rx-level-avg\":-41,\"time2-states\":-1,\"time4-states-s\":9,\"time4-states\":0,\"time8-states\":0,\"time16-states-s\":-1,\"time16-states\":0,\"time32-states\":1,\"time64-states\":1,\"time128-states\":2,\"time256-states\":38319,\"time512-states\":-1,\"time512-states-l\":-1,\"time1024-states\":-1,\"time1024-states-l\":-1,\"time2048-states\":-1,\"time2048-states-l\":-1,\"time4096-states\":-1,\"time4096-states-l\":-1,\"time8192-states\":-1,\"time8192-states-l\":-1,\"snir-min\":-99,\"unavailability\":504,\"tx-level-max\":25,\"tx-level-avg\":25,\"rx-level-min\":-41,\"rx-level-max\":-41,\"ses\":2,\"tx-level-min\":20,\"snir-max\":-99,\"snir-avg\":-99,\"xpd-min\":-99,\"xpd-max\":-99,\"xpd-avg\":-99,\"rf-temp-min\":-99,\"rf-temp-max\":-99,\"rf-temp-avg\":-99,\"defect-blocks-sum\":-1,\"time-period\":86400,\"cses\":0,\"es\":5},\"suspect-interval-flag\":true}";
+		IndexRequest request=new IndexRequest("historicalperformance24h", "historicalperformance24h","sim12600/LP-MWPS-TTP-01/2017-07-04T00:00:00.0+00:00");
+		request.source(json);
+		try {
+			IndexResponse response = client.index(request);
+
+			assertTrue(response.isCreated() || response.isUpdated());
+		} catch (IOException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDcae.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDcae.java
index 1c0a889b4..2b8f4b890 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDcae.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDcae.java
@@ -21,10 +21,7 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
 import static org.junit.Assert.fail;
-import com.google.common.io.Files;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,16 +31,20 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InventoryInformation;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DcaeConfig;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.DcaeProviderClient;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.legacy.InventoryInformation;
+import com.google.common.io.Files;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 
 @SuppressWarnings("restriction")
 public class TestDcae {
@@ -102,14 +103,13 @@ public class TestDcae {
             "";
     private HttpServer server;
     private ExecutorService httpThreadPool;
-    private HtDevicemanagerConfiguration cfg;
+    private ConfigurationFileRepresentation cfg;
 
     @Test
     public void test2() {
         try {
             Thread.sleep(3000);
         } catch (InterruptedException e1) {
-            // TODO Auto-generated catch block
             e1.printStackTrace();
         }
         DcaeProviderClient provider = new DcaeProviderClient(cfg,"mountpoint",null);
@@ -125,7 +125,7 @@ public class TestDcae {
         new InventoryInformation(type, model, vendor, ipv4, ipv6, ifInfos);
         System.out.println("registering device");
         boolean neDeviceAlarm = false;
-        ProblemNotificationXml notification = new ProblemNotificationXml(mountPointName, "network-element", "problemName", InternalSeverity.Critical,"123", InternalDateAndTime.getTestpattern());
+        ProblemNotificationXml notification = new ProblemNotificationXml(mountPointName, "network-element", "problemName", InternalSeverity.Critical,123, InternalDateAndTime.getTestpattern());
         provider.sendProblemNotification(mountPointName, notification, neDeviceAlarm);
 
         try {
@@ -139,6 +139,7 @@ public class TestDcae {
             e.printStackTrace();
         }
     }
+
     @Before
     public void initDcaeTestWebserver() throws IOException {
         try {
@@ -146,19 +147,21 @@ public class TestDcae {
         } catch (IOException e1) {
             fail(e1.getMessage());
         }
-        cfg=HtDevicemanagerConfiguration.getTestConfiguration(ENABLEDDCAE_TESTCONFIG_FILENAME,true);
-        DcaeConfig.reload();
-        try
-        {
-        this.server = HttpServer.create(new InetSocketAddress(DCAE_SERVER_PORT), 0);
-        }
-        catch(Exception e) {
+        cfg = new ConfigurationFileRepresentation(ENABLEDDCAE_TESTCONFIG_FILENAME);
+        // cfg.reload(ENABLEDDCAE_TESTCONFIG_FILENAME);
+        /*
+         * cfg = new HtDevicemanagerConfiguration(ENABLEDDCAE_TESTCONFIG_FILENAME);
+         * DcaeConfig.reload();
+         */
+        try {
+            this.server = HttpServer.create(new InetSocketAddress(DCAE_SERVER_PORT), 0);
+        } catch (Exception e) {
             fail(e.getMessage());
         }
         this.httpThreadPool = Executors.newFixedThreadPool(5);
         this.server.setExecutor(this.httpThreadPool);
         this.server.createContext(URI, new MyHandler());
-        //server.createContext("/", new MyRootHandler());
+        // server.createContext("/", new MyRootHandler());
         this.server.setExecutor(null); // creates a default executor
         this.server.start();
         System.out.println("http server started");
@@ -169,12 +172,13 @@ public class TestDcae {
         if (this.server != null) {
             this.server.stop(0);
             this.httpThreadPool.shutdownNow();
-            System.out.println("http server stopped" );
+            System.out.println("http server stopped");
         }
         if (ENABLEDDCAE_TESTCONFIG_FILE.exists()) {
             ENABLEDDCAE_TESTCONFIG_FILE.delete();
         }
     }
+
     static class MyHandler implements HttpHandler {
         @Override
         public void handle(HttpExchange t) throws IOException {
@@ -182,22 +186,20 @@ public class TestDcae {
             System.out.println("req method: " + method);
             OutputStream os = null;
             try {
-                String res="";
+                String res = "";
                 if (method.equals("POST")) {
-                    t.sendResponseHeaders(200,res.length() );
+                    t.sendResponseHeaders(200, res.length());
                     os = t.getResponseBody();
                     os.write(res.getBytes());
-               } else {
+                } else {
                     t.sendResponseHeaders(404, 0);
                 }
                 System.out.println("req handled successful");
 
             } catch (Exception e) {
                 System.out.println(e.getMessage());
-            }
-            finally {
-                if (os != null)
-                {
+            } finally {
+                if (os != null) {
                     os.close();
                 }
             }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDevMgrPropertiesFile.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDevMgrPropertiesFile.java
index 5242bac1c..3fe4f1abf 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDevMgrPropertiesFile.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDevMgrPropertiesFile.java
@@ -20,7 +20,9 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,25 +31,32 @@ import java.nio.charset.StandardCharsets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.HtDevicemanagerConfiguration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.AaiConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.DcaeConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.EsConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.PmConfig;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.ToggleAlarmConfig;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl.config.AaiConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice.ArchiveCleanService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.dcaeconnector.impl.config.DcaeConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.config.PmConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.conf.ToggleAlarmConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.io.Files;
 
 public class TestDevMgrPropertiesFile {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ArchiveCleanService.class);
+
     private static final File FILENAME = new File("test.properties");
     private static final File AAIPROP_FILE=new File("aaiclient.properties");
-    protected int hasChanged;
+    private int hasChanged;
 
     @Before
     public void init() {
-        delete(FILENAME);
-        delete(AAIPROP_FILE);
+    	//if (! LOG.isDebugEnabled()) {
+    		delete(FILENAME);
+    		delete(AAIPROP_FILE);
+    	//}
     }
     @After
     public void deinit() {
@@ -61,22 +70,24 @@ public class TestDevMgrPropertiesFile {
         writeFile(AAIPROP_FILE, this.getAaiPropertiesConfig());
 
         System.out.println("Read and verify");
-        HtDevicemanagerConfiguration cfg=HtDevicemanagerConfiguration.getTestConfiguration(FILENAME.getPath());
-
-        assertNotNull(cfg.getAai());
-        assertNotNull(cfg.getDcae());
-        assertNotNull(cfg.getPm());
-        assertNotNull(cfg.getEs());
-        assertNotNull(cfg.getToggleAlarm());
-        assertTrue(AaiConfig.isInstantiated());
-        assertTrue(DcaeConfig.isInstantiated());
-        assertTrue(PmConfig.isInstantiated());
-        assertTrue(EsConfig.isInstantiated());
-        assertTrue(ToggleAlarmConfig.isInstantiated());
-
-        System.out.println("Verify\n"+cfg.getAai()+"\n"+AaiConfig.getDefaultConfiguration());
+        ConfigurationFileRepresentation cfg = new ConfigurationFileRepresentation(FILENAME.getPath());
+        ConfigurationFileRepresentation cfg2 = cfg;
+
+        AaiConfig aaiConfig = new AaiConfig(cfg2);
+        assertNotNull(aaiConfig);
+        DcaeConfig dcaeConfig = new DcaeConfig(cfg2);
+        assertNotNull(dcaeConfig);
+        PmConfig pmConfig = new PmConfig(cfg2);
+        assertNotNull(pmConfig);
+        EsConfig esConfig = new EsConfig(cfg2);
+        assertNotNull(esConfig);
+        ToggleAlarmConfig toggleAlarmConfig = new ToggleAlarmConfig(cfg2);
+        assertNotNull(toggleAlarmConfig);
+
+        System.out.println("Verify\n"+aaiConfig+"\n");
         @SuppressWarnings("unused")
 		boolean res;
+        /*
         res = cfg.getAai().equals(AaiConfig.getDefaultConfiguration());
         res = cfg.getDcae().equals(DcaeConfig.getDefaultConfiguration());
         res = cfg.getPm().equals(PmConfig.getDefaultConfiguration());
@@ -88,60 +99,40 @@ public class TestDevMgrPropertiesFile {
         res = cfg.getPm().hashCode() == PmConfig.getDefaultConfiguration().hashCode();
         res = cfg.getEs().hashCode() == EsConfig.getDefaultConfiguration().hashCode();
         res = cfg.getToggleAlarm().hashCode() == ToggleAlarmConfig.getDefaultConfiguration().hashCode();
-
+        */
     }
 
     //-- Observer not working with all testcases, because config does not support different file types.
-    //@Test
+    @Test
     public void test2() {
 
         hasChanged=0;
         writeFile(FILENAME, this.getContent1());
         writeFile(AAIPROP_FILE, this.getAaiPropertiesConfig());
 
-
         System.out.println("Read and verify");
-        HtDevicemanagerConfiguration cfg=HtDevicemanagerConfiguration.getTestConfiguration(FILENAME.getPath());
-
-        assertNotNull(cfg.getAai());
-        assertNotNull(cfg.getDcae());
-        assertNotNull(cfg.getPm());
-        assertNotNull(cfg.getEs());
-        assertNotNull(cfg.getToggleAlarm());
-        assertTrue(AaiConfig.isInstantiated());
-        assertTrue(DcaeConfig.isInstantiated());
-        assertTrue(PmConfig.isInstantiated());
-        assertTrue(EsConfig.isInstantiated());
-        assertTrue(ToggleAlarmConfig.isInstantiated());
-
-        System.out.println("Verify456\n"+cfg.getAai()+"\n"+AaiConfig.getDefaultConfiguration());
-        cfg.getAai().equals(AaiConfig.getDefaultConfiguration());
-        cfg.getDcae().equals(DcaeConfig.getDefaultConfiguration());
-        cfg.getPm().equals(PmConfig.getDefaultConfiguration());
-        cfg.getEs().equals(EsConfig.getDefaultConfiguration());
-        cfg.getToggleAlarm().equals(ToggleAlarmConfig.getDefaultConfiguration());
-
-        cfg.registerConfigChangedListener(() -> {
+        ConfigurationFileRepresentation cfg2 = new ConfigurationFileRepresentation(FILENAME.getPath());
+
+        AaiConfig aaiConfig = new AaiConfig(cfg2);
+        assertNotNull(aaiConfig);
+        DcaeConfig dcaeConfig = new DcaeConfig(cfg2);
+        assertNotNull(dcaeConfig);
+        PmConfig pmConfig = new PmConfig(cfg2);
+        assertNotNull(pmConfig);
+        EsConfig esConfig = new EsConfig(cfg2);
+        assertNotNull(esConfig);
+        ToggleAlarmConfig toggleAlarmConfig = new ToggleAlarmConfig(cfg2);
+        assertNotNull(toggleAlarmConfig);
+
+        cfg2.registerConfigChangedListener(() -> {
             hasChanged++;
             System.out.println("file changed listener triggered: "+hasChanged);
-            AaiConfig.reload();
-            DcaeConfig.reload();
-            PmConfig.reload();
-            EsConfig.reload();
-            ToggleAlarmConfig.reload();
-
         });
-        System.out.println("Listerner registered.");
-        System.out.println(cfg.getAai().toString());
-        System.out.println(cfg.getDcae().toString());
-        System.out.println(cfg.getPm().toString());
-        System.out.println(cfg.getEs().toString());
-        System.out.println(cfg.getToggleAlarm().toString());
 
-        sleep(5000);
+        sleep(1000);
         System.out.println("Write new content. Changes "+hasChanged);
         writeFile(FILENAME, this.getContent2());
-        sleep(5000);
+        sleep(1000);
 
         int i=10;
         while(hasChanged == 0 && i-- > 0) {
@@ -151,14 +142,6 @@ public class TestDevMgrPropertiesFile {
         System.out.println("Changes "+hasChanged);
 
         assertTrue("fileChanged counter"+hasChanged, hasChanged > 0);
-        assertFalse(cfg.getAai().hashCode()==AaiConfig.getDefaultConfiguration().hashCode());
-        assertFalse(cfg.getDcae().hashCode()==DcaeConfig.getDefaultConfiguration().hashCode());
-        assertFalse(cfg.getPm().hashCode()==PmConfig.getDefaultConfiguration().hashCode());
-        assertFalse(cfg.getEs().hashCode()==EsConfig.getDefaultConfiguration().hashCode());
-        assertFalse(cfg.getToggleAlarm().hashCode()==ToggleAlarmConfig.getDefaultConfiguration().hashCode());
-
-        HtDevicemanagerConfiguration.clear();
-
         System.out.println("Test done");
 
     }
@@ -289,11 +272,11 @@ public class TestDevMgrPropertiesFile {
                 "";
     }
     private String getAaiPropertiesConfig() {
-        return "org.onap.ccsdk.sli.adaptors.aai.ssl.key=\"\"\n" +
-                "org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=\"\"\n" +
+        return "org.onap.ccsdk.sli.adaptors.aai.ssl.key=keykey\"\"\n" +
+                "org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=psswdpsswd\"\"\n" +
                 "org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=\"false\"\n" +
-                "org.onap.ccsdk.sli.adaptors.aai.application=\"\"\n" +
-                "org.onap.ccsdk.sli.adaptors.aai.uri=\"\"\n" +
+                "org.onap.ccsdk.sli.adaptors.aai.application=appxyz\"\"\n" +
+                "org.onap.ccsdk.sli.adaptors.aai.uri=uriu\"\"\n" +
                 "connection.timeout=60000\n" +
                 "read.timeout=60000";
     }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDeviceManagerWithDatabase.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDeviceManagerWithDatabase.java
index 24c605e8f..d9561e484 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDeviceManagerWithDatabase.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestDeviceManagerWithDatabase.java
@@ -26,51 +26,57 @@ import java.io.StringWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.ResourcesFromDeviceManager;
+import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.database.config.EsConfig;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice.ArchiveCleanService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtDatabaseWebAPIClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerService.Action;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.NetconfNodeService.Action;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.ClusterSingletonServiceProviderMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.DataBrokerNetconfMock;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.DataProviderMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.MountPointMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.MountPointServiceMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.NotificationPublishServiceMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock.RpcProviderRegistryMock;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.DBCleanServiceHelper;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.ReadOnlyTransactionMountpoint1211Mock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.ReadOnlyTransactionMountpoint1211pMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.ReadOnlyTransactionMountpoint12Mock;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("deprecation")
 public class TestDeviceManagerWithDatabase {
 
-    private static int DATABASETIMEOUTSECONDS = 30;
-
     private static Path KARAF_ETC = Paths.get("etc");
     private static DeviceManagerImpl deviceManager;
     private static MountPointMock mountPoint;
     private static DataBrokerNetconfMock dataBrokerNetconf;
+    private static IEntityDataProvider dataProvider = new IEntityDataProvider() {
 
-    private static final Logger LOG = LoggerFactory.getLogger(TestDeviceManagerWithDatabase.class);
+        @Override
+        public void setReadyStatus(boolean status) {
 
+        }
 
+        @Override
+        public DataProvider getDataProvider() {
+            return  new DataProviderMock();
+        }
+    };
+    private static final Logger LOG = LoggerFactory.getLogger(TestDeviceManagerWithDatabase.class);
 
     @BeforeClass
     public static void before() throws InterruptedException, IOException {
@@ -82,7 +88,12 @@ public class TestDeviceManagerWithDatabase {
 
         System.out.println("Create empty:" + etc.toString());
         Files.createDirectories(etc);
+        //write db config for testing
+        ConfigurationFileRepresentation configfile = new ConfigurationFileRepresentation(etc.resolve("devicemanager.properties").toFile());
+        EsConfig dbConfig = new EsConfig(configfile);
+           dbConfig.setHosts(new HostInfo[] {new HostInfo("localhost",Integer.valueOf(System.getProperty("databaseport")!=null?System.getProperty("databaseport"):"49200")) });
 
+        configfile.save();
         // Create mocks
         ReadOnlyTransactionMountpoint12Mock readOnlyTransaction = new ReadOnlyTransactionMountpoint12Mock();
         dataBrokerNetconf = new DataBrokerNetconfMock();
@@ -90,9 +101,9 @@ public class TestDeviceManagerWithDatabase {
         mountPoint = new MountPointMock();
         mountPoint.setReadOnlyTransaction(readOnlyTransaction);
         ClusterSingletonServiceProvider clusterSingletonService = new ClusterSingletonServiceProviderMock();
-		MountPointService mountPointService = new MountPointServiceMock(mountPoint);
+        MountPointService mountPointService = new MountPointServiceMock(mountPoint);
         NotificationPublishService notificationPublishService = new NotificationPublishServiceMock();
-        RpcProviderRegistry rpcProviderRegistry = new RpcProviderRegistryMock();
+        RpcProviderService rpcProviderRegistry = new RpcProviderRegistryMock();
 
         // start using blueprint interface
         String msg = "";
@@ -104,6 +115,7 @@ public class TestDeviceManagerWithDatabase {
             deviceManager.setNotificationPublishService(notificationPublishService);
             deviceManager.setRpcProviderRegistry(rpcProviderRegistry);
             deviceManager.setClusterSingletonService(clusterSingletonService);
+            deviceManager.setEntityDataProvider(dataProvider);
             deviceManager.init();
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
@@ -134,18 +146,6 @@ public class TestDeviceManagerWithDatabase {
     }
 
     @Test
-    public void test0() throws InterruptedException {
-        HtDatabaseWebAPIClient client = new HtDatabaseWebAPIClient();
-        try {
-            String response = client.sendRequest("/mwtn/mediator-server/_search", "GET",
-                    new JSONObject("{\"match\":{\"id\":id}}"));
-            System.out.println(response);
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
     public void test2() {
         System.out.println("Test2: slave mountpoint");
 
@@ -189,7 +189,7 @@ public class TestDeviceManagerWithDatabase {
             e.printStackTrace();
             fail("Exception received.");
         }
-
+        System.out.println("Devicemanager started ----");
         readOnlyTransaction.sendProblemNotification();
         try {
             Thread.sleep(500);
@@ -273,7 +273,7 @@ public class TestDeviceManagerWithDatabase {
 
         System.out.println("Test6: Write zip data file file");
         File testFile = new File("etc/elasticsearch_update.zip");
-        Resources.extractFileTo("elasticsearch_update.zip", testFile);
+        ResourcesFromDeviceManager.extractFileTo("elasticsearch_update.zip", testFile);
         int wait = 130;
         while (testFile.exists() && wait-- > 0) {
             System.out.println("Waiting " + wait);
@@ -289,6 +289,7 @@ public class TestDeviceManagerWithDatabase {
 
     }
 
+    /*
     @Test
     public void test7() throws Exception {
         final int NUM = 5;
@@ -309,7 +310,7 @@ public class TestDeviceManagerWithDatabase {
         System.out.println("Status of elements is: "+service.countOldEntries());
 
         // create old data and check if the will be cleaned completely
-        int elements = helper.writeDataToLogs(NUM, ARCHIVE_DAYS+5, 0 /*Hours*/);
+        int elements = helper.writeDataToLogs(NUM, ARCHIVE_DAYS+5, 0 ); //Hours
         System.out.println("Written elements are: "+elements);
 
         waitForDeletion(service, 2 * ARCHIVE_INTERVAL_SEC, elements, "Entries are not cleared completely as expected");
@@ -326,9 +327,10 @@ public class TestDeviceManagerWithDatabase {
 
         service.close();
     }
-
+*/
     // ********************* Private
 
+    @SuppressWarnings("unused")
     private void waitForDeletion(ArchiveCleanService service, long timeout, long numberAtBeginning, String faultMessage) {
         int numberEntries = 0;
         while (timeout-- > 0) {
@@ -346,7 +348,7 @@ public class TestDeviceManagerWithDatabase {
 
 
     private static void waitfordatabase() throws InterruptedException {
-
+/*
         System.out.println("Test1: Wait for database");
         int timeout = DATABASETIMEOUTSECONDS;
         while (!deviceManager.isDatabaseInitializationFinished() && timeout-- > 0) {
@@ -354,6 +356,7 @@ public class TestDeviceManagerWithDatabase {
             Thread.sleep(1000); // On second
         }
         System.out.println("Ddatabase initialized");
+*/
     }
 
     private static void sleep(int millis) {
@@ -383,6 +386,7 @@ public class TestDeviceManagerWithDatabase {
         }
     }
 
+    @SuppressWarnings("unused")
     private String getContent(long archiveLimitSeconds, long esArchiveCheckIntervalSeconds) {
         return "[dcae]\n" + "dcaeUserCredentials=admin:admin\n" + "dcaeUrl=http://localhost:45/abc\n"
                 + "dcaeHeartbeatPeriodSeconds=120\n" + "dcaeTestCollector=no\n" + "\n" + "[aots]\n"
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestEquipment.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestEquipment.java
index 9875a8f43..f48395648 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestEquipment.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestEquipment.java
@@ -20,24 +20,71 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment.ExtendedEquipment;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ExtendedEquipment;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsMapper;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.EquipmentBuilder;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolder;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolderBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolderKey;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.Extension;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.ExtensionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryEntity;
 
-public class TestEquipment extends Mockito {
+import com.fasterxml.jackson.core.JsonProcessingException;
 
-    @Test
-    public void test() {
+public class TestEquipment extends Mockito {
 
+	YangToolsMapper yangtoolsMapper = new YangToolsMapper();
 
-        EquipmentBuilder equipmentBuilder = new EquipmentBuilder();
-        equipmentBuilder.setUuid( new UniversalId("EquipmentId"));
-        ExtendedEquipment extendedEquipment = new ExtendedEquipment("Parent",equipmentBuilder.build(),1);
+    @Test
+    public void test1() {
 
+    	ExtendedEquipment extendedEquipment = getTestEquipment(1);
         String extendedEquipmentString = extendedEquipment.toString();
         System.out.println(extendedEquipmentString);
     }
 
+	@Test
+	public void test2() {
+
+		List<ExtendedEquipment> equipmentList = new ArrayList<>();
+		equipmentList.add(getTestEquipment(2));
+		equipmentList.add(getTestEquipment(3));
+
+		InventoryEntity esEquipment;
+		for (ExtendedEquipment equipment1 : equipmentList) {
+			esEquipment = equipment1.getCreateInventoryInput();
+			try {
+				String json = yangtoolsMapper.writeValueAsString(esEquipment);
+				System.out.println("JSON: "+json);
+			} catch (JsonProcessingException e) {
+				e.printStackTrace();
+			}
+			// eventRWEquipment.write(esEquipment,equipment1.getNodeId()+"/"+equipment1.getParentUuid());
+		}
+	}
+
+	private ExtendedEquipment getTestEquipment(int number) {
+		// Move to InventoryEntity
+		EquipmentBuilder equipmentBuilder = new EquipmentBuilder();
+		equipmentBuilder.setUuid(new UniversalId("EquipmentId"));
+		ContainedHolderBuilder containedHolderBuilder = new ContainedHolderBuilder();
+		List<Extension> xy = new ArrayList<>();
+		xy.add(new ExtensionBuilder().setValueName("Test1").setValue("TestValue").build());
+		containedHolderBuilder.setExtension(xy);
+		containedHolderBuilder.withKey(new ContainedHolderKey(new UniversalId("MyKey" + number)));
+		List<ContainedHolder> z = new ArrayList<>();
+		z.add(containedHolderBuilder.build());
+		equipmentBuilder.setContainedHolder(z);
+
+		ExtendedEquipment extendedEquipment = new ExtendedEquipment("node" + number, "Parent", equipmentBuilder.build(),
+				"X/" + number, number);
+		return extendedEquipment;
+	}
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestGeoConfig.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestGeoConfig.java
index 5b00cbb78..6474a1eb6 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestGeoConfig.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestGeoConfig.java
@@ -22,7 +22,7 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.config.impl.GeoConfig;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.conf.odlGeo.GeoConfig;
 
 public class TestGeoConfig {
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMaintenanceTimeFilter.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMaintenanceTimeFilter.java
index 1d97eb85b..932ad52d2 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMaintenanceTimeFilter.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMaintenanceTimeFilter.java
@@ -25,7 +25,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import java.time.ZonedDateTime;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.database.types.EsMaintenanceFilter;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.maintenance.impl.MaintenanceCalculator;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 
 public class TestMaintenanceTimeFilter {
 
@@ -34,49 +35,25 @@ public class TestMaintenanceTimeFilter {
 
     @Test
     public void test1() {
-        EsMaintenanceFilter fi = new EsMaintenanceFilter();
-        String fiAsString;
-
-        fiAsString = fi.toString();
-        System.out.println("Default 1: " + fiAsString);
-        if (! fiAsString.equals(DEFAULT1)) {
-            fail("Time conversion not OK");
-        }
-    }
-    @Test
-    public void test2() {
-        EsMaintenanceFilter fi = new EsMaintenanceFilter();
-        String fiAsString;
-
-        fi.setEndAsString("2018-01-01T10:00:00+05:00");
-        fiAsString = fi.toString();
-        System.out.println("Default 2: " + fi);
-        System.out.println("As String: " + fi.getEndAsString());
-        if (! fiAsString.equals(DEFAULT2)) {
-            fail("Time conversion not OK");
-        }
-    }
-    @Test
-    public void test3() {
 
         boolean res;
 
-        ZonedDateTime start = ZonedDateTime.parse("2018-01-01T10:00:00+05:00");
-        ZonedDateTime end = ZonedDateTime.parse("2019-01-01T10:00:00+05:00");
+        DateAndTime start = new DateAndTime("2018-01-01T10:00:00+05:00");
+        DateAndTime end = new DateAndTime("2019-01-01T10:00:00+05:00");
         ZonedDateTime now;
 
         now = ZonedDateTime.parse("2017-05-01T10:00:00+05:00");
-        res = EsMaintenanceFilter.isInPeriod(start, end, now);
+        res = MaintenanceCalculator.isInPeriod(start, end, now);
         System.out.println("Before: " + res);
         assertFalse("before period", res);
 
         now = ZonedDateTime.parse("2018-05-01T10:00:00+05:00");
-        res = EsMaintenanceFilter.isInPeriod(start, end, now);
+        res = MaintenanceCalculator.isInPeriod(start, end, now);
         System.out.println("Within: " + res);
         assertTrue("within period",res);
 
         now = ZonedDateTime.parse("2019-05-01T10:00:00+05:00");
-        res = EsMaintenanceFilter.isInPeriod(start, end, now);
+        res = MaintenanceCalculator.isInPeriod(start, end, now);
         System.out.println("After: " + res);
         assertFalse("after period", res);
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMapper.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMapper.java
index d532f4256..837784aec 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMapper.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestMapper.java
@@ -15,11 +15,8 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
-import java.util.Arrays;
-import java.util.List;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.HtMapper;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.JsonMapperBase;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.HtMapper;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.performancemanager.impl.database.types.EsHistoricalPerformance15Minutes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.LayerProtocolName;
@@ -63,18 +60,4 @@ public class TestMapper {
 
         // fail("Not yet implemented");
     }
-
-    @Test
-    public void test2() {
-
-        for (int t = 0; t < 5; t++) {
-            JsonMapperBase baseMapper = new JsonMapperBase(0);
-            Integer o = new Integer(6);
-            List<Integer> oList = Arrays.asList(o);
-            String json = baseMapper.objectListToJson(oList);
-            System.out.println(json);
-        }
-    }
-
-
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoderTest.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNameSpace.java
index cc4a43677..4a85299d7 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/aaiconnector/impl/URLParamEncoderTest.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNameSpace.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : ccsdk feature sdnr wt
  *  ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property.
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
  * All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,21 +18,26 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.aaiconnector.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
 import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
+import org.opendaylight.yangtools.yang.common.QName;
 
-import static org.junit.Assert.assertEquals;
+public class TestNameSpace {
 
+    @Test
+    public void test() {
 
-public class URLParamEncoderTest {
+        QName qname = QName.create("(urn:o-ran:hardware:1.0?revision=2019-03-28)o-ran-hardware");
+
+        System.out.println("QName getNamespace"+qname.getNamespace());
+        System.out.println("QName getRevision"+qname.getRevision());
 
-    @Test
-    public void shouldEncodeStringsToFormatAcceptableByURL(){
-        assertEquals("test", URLParamEncoder.encode("test"));
-        assertEquals("test%20str", URLParamEncoder.encode("test str"));
-        assertEquals("test%23%24str", URLParamEncoder.encode("test#$str"));
-        assertEquals("test%20%25%24%26%2B%2C%2F%3A%3B%3D%3F%40%3C%3E%23%25str", URLParamEncoder.encode("test %$&+,/:;=?@<>#%str"));
+
+        System.out.println(NetworkElement.QNAME.getNamespace().toString());
 
     }
+
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNotification.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNotification.java
index f32f35723..7e54f16b1 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNotification.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestNotification.java
@@ -21,7 +21,7 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.toggleAlarmFilter.NotificationWithServerTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.toggleAlarmFilter.NotificationWithServerTimeStamp;
 
 public class TestNotification {
 
@@ -37,4 +37,5 @@ public class TestNotification {
 
     }
 
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestYangCloning.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestYangCloning.java
new file mode 100644
index 000000000..363d84f3a
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestYangCloning.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+import org.onap.ccsdk.features.sdnr.wt.yangtools.YangToolsCloner;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.AdministrativeState;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.Equipment;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.EquipmentBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g.ContainedHolderBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Faultcurrent;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryEntity;
+
+public class TestYangCloning {
+
+    @Test
+    public void testEquipment() {
+        EquipmentBuilder equipmentBuilder = new EquipmentBuilder();
+        equipmentBuilder.setUuid( new UniversalId("EquipmentId"));
+        equipmentBuilder.setContainedHolder(Arrays.asList(new ContainedHolderBuilder()
+                .setUuid(new UniversalId("HolderId"))
+                .setAdministrativeState(AdministrativeState.Locked)
+                .setSupportedEquipment(Arrays.asList("eq1"))
+                .build()));
+        Equipment equipment = equipmentBuilder.build();
+        InventoryEntity output = YangToolsCloner.instance().cloneToBuilder(equipment,  new InventoryBuilder())
+                .setNodeId("node1").setUuid("a.a.a").setId("node1"+"/"+"a.a.a").build();
+
+
+        System.out.println("source:");
+        System.out.println(equipment);
+        System.out.println("result:");
+        System.out.println(output);
+
+
+    }
+    @Test
+    public void testFaultCurrent() {
+        ProblemNotificationXml source = new ProblemNotificationXml("node", "uuid", "problem", InternalSeverity.Critical,54,InternalDateAndTime.getTestpattern());
+        FaultcurrentEntity output = YangToolsCloner.instance().clone(source,Faultcurrent.class);
+
+          System.out.println("source:");
+            System.out.println(source);
+            System.out.println("result:");
+            System.out.println(output);
+    }
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsCapability.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsCapability.java
index d4353d9da..3108aa5ce 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsCapability.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsCapability.java
@@ -21,11 +21,12 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev170324;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev170324;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.Model12ObjectMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsNectconfDateTime.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsNectconfDateTime.java
index b753ceb70..fc01274c0 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsNectconfDateTime.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/TestsNectconfDateTime.java
@@ -25,75 +25,75 @@ import static org.junit.Assert.assertTrue;
 import java.util.Date;
 
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util.NetconfTimeStampOld;
 
 public class TestsNectconfDateTime {
 
-	private static String[] testPatterPostive = {
-			"2017-01-18T11:44:49.482-0500",
-			"2017-01-18T11:44:49.482-05:00",
-			"20170118114449.123Z",
-			"20170118114449.1Z",
-			"20170118114449.1-0500",
-			"2017-01-23T13:32:38-05:00",
-			"2017-01-23T13:32-05:00",
-			"2017-01-18T11:44:49Z"
-	};
-	private static String[] testPatterProblem = {
-			"2017-01-18T11:44:49"
-	};
+    private static String[] testPatterPostive = {
+            "2017-01-18T11:44:49.482-0500",
+            "2017-01-18T11:44:49.482-05:00",
+            "20170118114449.123Z",
+            "20170118114449.1Z",
+            "20170118114449.1-0500",
+            "2017-01-23T13:32:38-05:00",
+            "2017-01-23T13:32-05:00",
+            "2017-01-18T11:44:49Z"
+    };
+    private static String[] testPatterProblem = {
+            "2017-01-18T11:44:49"
+    };
 
 
-	private NetconfTimeStampOld netconfTimeConverterOld = NetconfTimeStampOld.getConverter();
-	private NetconfTimeStamp netconfTimeConverterNew = NetconfTimeStamp.getConverter();
+    private final NetconfTimeStampOld netconfTimeConverterOld = NetconfTimeStampOld.getConverter();
+    private final NetconfTimeStamp netconfTimeConverterNew = NetconfTimeStamp.getConverter();
 
     @Test
     public void test1() {
 
-    	int t = 1;
-    	String timeNew, timeOld;
-    	for (String testTime : testPatterPostive) {
-    		timeNew = netconfTimeConverterNew.getTimeStampFromNetconf(testTime);
-    		timeOld = netconfTimeConverterOld.getTimeStampFromNetconf(testTime);
+        int t = 1;
+        String timeNew, timeOld;
+        for (String testTime : testPatterPostive) {
+            timeNew = netconfTimeConverterNew.getTimeStampFromNetconf(testTime);
+            timeOld = netconfTimeConverterOld.getTimeStampFromNetconf(testTime);
 
-    		System.out.println("No "+(t++)+" Pattern: "+testTime);
-    		System.out.println(" to old "+timeOld);
-    		System.out.println(" to new "+timeNew);
-    		System.out.println();
+            System.out.println("No "+t+++" Pattern: "+testTime);
+            System.out.println(" to old "+timeOld);
+            System.out.println(" to new "+timeNew);
+            System.out.println();
 
             assertTrue("Old/New implementation not same "+timeOld+"/"+timeNew, timeOld.equals(timeNew));
-    	}
+        }
 
-    	for (String testTime : testPatterProblem) {
-    		timeNew = netconfTimeConverterNew.getTimeStampFromNetconf(testTime);
-    		timeOld = netconfTimeConverterOld.getTimeStampFromNetconf(testTime);
+        for (String testTime : testPatterProblem) {
+            timeNew = netconfTimeConverterNew.getTimeStampFromNetconf(testTime);
+            timeOld = netconfTimeConverterOld.getTimeStampFromNetconf(testTime);
 
-    		System.out.println("No "+(t++)+" Pattern: "+testTime);
-    		System.out.println(" to old "+timeOld);
-    		System.out.println(" to new "+timeNew);
-    		System.out.println();
+            System.out.println("No "+t+++" Pattern: "+testTime);
+            System.out.println(" to old "+timeOld);
+            System.out.println(" to new "+timeNew);
+            System.out.println();
 
             assertTrue("Old/New implementation not same "+timeOld+"/"+timeNew, timeOld.equals(timeNew));
-    	}
+        }
     }
 
     @Test
     public void test2() {
 
-    	int t = 1;
-    	Long timeNew, timeOld;
-    	for (String testTime : testPatterPostive) {
-    		timeNew = netconfTimeConverterNew.getTimeStampFromNetconfAsMilliseconds(testTime);
-    		timeOld = netconfTimeConverterOld.getTimeStampFromNetconfAsMilliseconds(testTime);
+        int t = 1;
+        Long timeNew, timeOld;
+        for (String testTime : testPatterPostive) {
+            timeNew = netconfTimeConverterNew.getTimeStampFromNetconfAsMilliseconds(testTime);
+            timeOld = netconfTimeConverterOld.getTimeStampFromNetconfAsMilliseconds(testTime);
 
-    		System.out.println("No "+(t++)+" Pattern: "+testTime);
-    		System.out.println(" to old "+timeOld);
-    		System.out.println(" to new "+timeNew);
-    		System.out.println();
+            System.out.println("No "+t+++" Pattern: "+testTime);
+            System.out.println(" to old "+timeOld);
+            System.out.println(" to new "+timeNew);
+            System.out.println();
 
             assertTrue("Old/New implementation not same "+timeOld+"/"+timeNew, timeOld.equals(timeNew));
-    	}
+        }
 
     }
 
@@ -101,11 +101,11 @@ public class TestsNectconfDateTime {
     @Test
     public void test3() {
 
-    	Date now = new Date();
-    	String timeNew = netconfTimeConverterNew.getTimeStampAsNetconfString(now);
-    	String timeOld = netconfTimeConverterOld.getTimeStampAsNetconfString(now);
+        Date now = new Date();
+        String timeNew = netconfTimeConverterNew.getTimeStampAsNetconfString(now);
+        String timeOld = netconfTimeConverterOld.getTimeStampAsNetconfString(now);
 
-    	System.out.println("Old/New: "+timeOld+"/"+timeNew);
+        System.out.println("Old/New: "+timeOld+"/"+timeNew);
 
         assertTrue("Old/New implementation not same "+timeOld+"/"+timeNew, timeOld.equals(timeNew));
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/ClusterSingletonServiceProviderMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/ClusterSingletonServiceProviderMock.java
index 30b64817a..a215e1883 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/ClusterSingletonServiceProviderMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/ClusterSingletonServiceProviderMock.java
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
@@ -8,7 +26,7 @@ public class ClusterSingletonServiceProviderMock implements ClusterSingletonServ
 
 	@Override
 	public void close() throws Exception {
-	
+
 	}
 
 	@Override
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerMountpointMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerMountpointMock.java
index 34c5959bd..2bd5a9272 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerMountpointMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerMountpointMock.java
@@ -20,15 +20,16 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
-import org.opendaylight.controller.md.sal.binding.api.BindingService;
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
@@ -39,35 +40,35 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 @SuppressWarnings("deprecation")
 public class DataBrokerMountpointMock implements DataBroker, BindingService {
 
-    ReadOnlyTransaction readOnlyTransaction;
+    ReadTransaction readOnlyTransaction;
 
-    public void setReadOnlyTransaction(ReadOnlyTransaction readOnlyTransaction) {
+    public void setReadOnlyTransaction(ReadTransaction readOnlyTransaction) {
         this.readOnlyTransaction = readOnlyTransaction;
     }
 
     @Override
-    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L> registerDataTreeChangeListener(
-            DataTreeIdentifier<T> arg0, L arg1) {
-        return null;
+    public @NonNull ReadTransaction newReadOnlyTransaction() {
+        return readOnlyTransaction;
     }
 
     @Override
-    public BindingTransactionChain createTransactionChain(TransactionChainListener listener) {
+    public @NonNull ReadWriteTransaction newReadWriteTransaction() {
         return null;
     }
 
     @Override
-    public ReadOnlyTransaction newReadOnlyTransaction() {
-        return readOnlyTransaction;
+    public @NonNull WriteTransaction newWriteOnlyTransaction() {
+        return null;
     }
 
     @Override
-    public ReadWriteTransaction newReadWriteTransaction() {
-         return null;
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> @NonNull ListenerRegistration<L> registerDataTreeChangeListener(
+            @NonNull DataTreeIdentifier<T> treeId, @NonNull L listener) {
+        return null;
     }
 
     @Override
-    public WriteTransaction newWriteOnlyTransaction() {
+    public @NonNull TransactionChain createTransactionChain(@NonNull TransactionChainListener listener) {
         return null;
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerNetconfMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerNetconfMock.java
index c9455cc9c..0b5052632 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerNetconfMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataBrokerNetconfMock.java
@@ -20,14 +20,15 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
@@ -39,35 +40,35 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 public class DataBrokerNetconfMock implements DataBroker {
 
 
-    ReadOnlyTransaction readOnlyTransaction;
+    ReadTransaction readOnlyTransaction;
 
-    public void setReadOnlyTransaction(ReadOnlyTransaction readOnlyTransaction) {
+    public void setReadOnlyTransaction(ReadTransaction readOnlyTransaction) {
         this.readOnlyTransaction = readOnlyTransaction;
     }
 
-    @Override
-    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L> registerDataTreeChangeListener(
-            DataTreeIdentifier<T> arg0, L arg1) {
-        return null;
+     @Override
+    public @NonNull ReadTransaction newReadOnlyTransaction() {
+        return readOnlyTransaction;
     }
 
     @Override
-    public BindingTransactionChain createTransactionChain(TransactionChainListener listener) {
+    public @NonNull ReadWriteTransaction newReadWriteTransaction() {
         return null;
     }
 
     @Override
-    public ReadOnlyTransaction newReadOnlyTransaction() {
-        return readOnlyTransaction;
+    public @NonNull WriteTransaction newWriteOnlyTransaction() {
+        return null;
     }
 
     @Override
-    public ReadWriteTransaction newReadWriteTransaction() {
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> @NonNull ListenerRegistration<L> registerDataTreeChangeListener(
+            @NonNull DataTreeIdentifier<T> treeId, @NonNull L listener) {
         return null;
     }
 
     @Override
-    public WriteTransaction newWriteOnlyTransaction() {
+    public @NonNull TransactionChain createTransactionChain(@NonNull TransactionChainListener listener) {
         return null;
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataProviderMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataProviderMock.java
new file mode 100644
index 000000000..5fbef21f3
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/DataProviderMock.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2019 Red Hat, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultcurrentEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionEntity;
+
+public class DataProviderMock implements DataProvider {
+
+    @Override
+    public void writeConnectionLog(ConnectionlogEntity event) {
+    }
+
+    @Override
+    public void writeEventLog(EventlogEntity event) {
+    }
+
+    @Override
+    public void writeFaultLog(FaultlogEntity fault) {
+    }
+
+    @Override
+    public void updateFaultCurrent(FaultcurrentEntity fault) {
+    }
+
+    @Override
+    public int clearFaultsCurrentOfNode(String nodeName) {
+        return 0;
+    }
+
+    @Override
+    public int clearFaultsCurrentOfNodeWithObjectId(String nodeName, String objectId) {
+        return 0;
+    }
+
+    @Override
+    public List<String> getAllNodesWithCurrentAlarms() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void writeInventory(Inventory internalEquipment) {
+    }
+
+    @Override
+    public void updateNetworkConnectionDeviceType(NetworkElementConnectionEntity networkElementConnectionEntitiy,
+            String nodeId) {
+    }
+
+    @Override
+    public void updateNetworkConnection22(NetworkElementConnectionEntity networkElementConnectionEntitiy,
+            String nodeId) {
+    }
+
+    @Override
+    public void removeNetworkConnection(String nodeId) {
+    }
+
+    @Override
+    public int doIndexClean(Date olderAreOutdated) {
+        return 0;
+    }
+
+    @Override
+    public int getNumberOfOldObjects(Date olderAreOutdated) {
+        return 0;
+    }
+
+	@Override
+	public List<NetworkElementConnectionEntity> getNetworkElementConnections() {
+		return new ArrayList<>();
+	}
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointMock.java
index f2065c622..73d32e418 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointMock.java
@@ -21,11 +21,11 @@
 
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
-import com.google.common.base.Optional;
-import org.opendaylight.controller.md.sal.binding.api.BindingService;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import java.util.Optional;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
@@ -63,7 +63,7 @@ public class MountPointMock implements MountPoint {
         Optional<?> res;
         if (service.isInstance(dataBroker)) {
             System.out.println("Delivering databroker");
-            res =  databrokerAbsent ? Optional.absent() : Optional.of(dataBroker);
+            res =  databrokerAbsent ? Optional.empty() : Optional.of(dataBroker);
         } else if (service.isInstance(rpcConsumerRegistry)) {
             System.out.println("Delivering RpcConsumerRegistryMock");
             res = Optional.of(rpcConsumerRegistry);
@@ -72,7 +72,7 @@ public class MountPointMock implements MountPoint {
             res = Optional.of(setReadOnlyTransaction);
         } else {
             System.out.println("Delivering no service");
-            res = Optional.absent();
+            res = Optional.empty();
         }
         return (Optional<T>)res;
     }
@@ -81,7 +81,7 @@ public class MountPointMock implements MountPoint {
         this.databrokerAbsent = state;
     }
 
-    public <T extends NotificationService&ReadOnlyTransaction>void setReadOnlyTransaction(T readOnlyTransaction) {
+    public <T extends NotificationService&ReadTransaction>void setReadOnlyTransaction(T readOnlyTransaction) {
         this.setReadOnlyTransaction = readOnlyTransaction;
         dataBroker.setReadOnlyTransaction(readOnlyTransaction);
     }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointServiceMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointServiceMock.java
index ebb501bc3..113ead29f 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointServiceMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/MountPointServiceMock.java
@@ -20,9 +20,9 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
-import com.google.common.base.Optional;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
+import java.util.Optional;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -30,17 +30,16 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
 public class MountPointServiceMock implements MountPointService {
 
-    private final MountPointMock mountpoint;
+    private final MountPoint mountpoint;
 
-    public MountPointServiceMock(MountPointMock mountpoint) {
+    public MountPointServiceMock(MountPoint mountpoint) {
         this.mountpoint = mountpoint;
     }
 
     @Override
-    public Optional<MountPoint> getMountPoint(InstanceIdentifier<?> mountPoint) {
+    public Optional<MountPoint> getMountPoint(InstanceIdentifier<?> instanceId) {
 
         Optional<MountPoint> optional = Optional.of(mountpoint);
         return optional;
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/NotificationPublishServiceMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/NotificationPublishServiceMock.java
index 9099a4a87..fc3318b9e 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/NotificationPublishServiceMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/NotificationPublishServiceMock.java
@@ -22,14 +22,13 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.TimeUnit;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
 /**
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
 public class NotificationPublishServiceMock implements NotificationPublishService {
 
     @Override
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/RpcProviderRegistryMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/RpcProviderRegistryMock.java
index b95da853b..4aaa1ed48 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/RpcProviderRegistryMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/mock/RpcProviderRegistryMock.java
@@ -20,40 +20,24 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.mock;
 
-import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import java.util.Set;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
-@SuppressWarnings("deprecation")
-public class RpcProviderRegistryMock implements RpcProviderRegistry {
+public class RpcProviderRegistryMock implements RpcProviderService {
 
     @Override
-    public <T extends RpcService> T getRpcService(Class<T> serviceInterface) {
-        return null;
-    }
-
-   @Override
-    public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L> registerRouteChangeListener(
-            L listener) {
-        return null;
-    }
-
-
-    @Override
-    public <T extends RpcService> RoutedRpcRegistration<T> addRoutedRpcImplementation(Class<T> serviceInterface,
-            T implementation) throws IllegalStateException {
+    public <S extends RpcService, T extends S> ObjectRegistration<T> registerRpcImplementation(Class<S> type,
+            T implementation) {
+        System.out.println("Register class "+implementation);
         return null;
     }
 
     @Override
-    public <T extends RpcService> RpcRegistration<T> addRpcImplementation(Class<T> serviceInterface, T implementation)
-            throws IllegalStateException {
-        System.out.println("Register class "+serviceInterface);
+    public <S extends RpcService, T extends S> ObjectRegistration<T> registerRpcImplementation(Class<S> type,
+            T implementation, Set<InstanceIdentifier<?>> paths) {
         return null;
     }
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/DBCleanServiceHelper.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/DBCleanServiceHelper.java
index 4e46e1800..2ac81ce46 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/DBCleanServiceHelper.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/DBCleanServiceHelper.java
@@ -19,22 +19,20 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalSeverity;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.base.netconf.util.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.service.HtDatabaseEventsService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalSeverity;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ObjectCreationNotificationXml;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.database.types.EsEventOdluxLog;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.index.impl.IndexMwtnService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 
 public class DBCleanServiceHelper {
 
     private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStamp.getConverter();
 
-    private final HtDatabaseEventsService databaseEventService;
-    private final IndexMwtnService mwtnService;
+    private final DataProvider databaseEventService;
 
     /**
      * Helper to fill data into the database
@@ -42,7 +40,6 @@ public class DBCleanServiceHelper {
      */
     public DBCleanServiceHelper(DeviceManagerImpl deviceManager) {
         this.databaseEventService = deviceManager.getDatabaseClientEvents();
-        this.mwtnService = deviceManager.getMwtnService();
     }
 
     /**
@@ -56,21 +53,15 @@ public class DBCleanServiceHelper {
         int res = 0;
         for (Integer t=0; t < number; t++) { //Test "sdnevents", "eventlog"
             ObjectCreationNotificationXml notificationXml = new ObjectCreationNotificationXml(
-                    "Testpoint"+t, t.toString(), getInternalDateAndTime(days, hours+t), "ObjectId"+t);
-            databaseEventService.writeEventLog(notificationXml);
+                    "Testpoint"+t, t, getInternalDateAndTime(days, hours+t), "ObjectId"+t);
+            databaseEventService.writeConnectionLog(notificationXml.getConnectionlogEntity());
             res++;
         }
 
         for (Integer t=0; t < number; t++) { //Test "sdnevents", "faultlog"
             ProblemNotificationXml fault = new ProblemNotificationXml(
-                    "ProblemNode"+t, "Problemuuid", "Problemname", InternalSeverity.Major, t.toString(), getInternalDateAndTime(days, hours+t));
-            databaseEventService.writeFaultLog(fault);
-            res++;
-        }
-
-        for (Integer t=0; t < number; t++) { //Test "mwtn", "log"
-            EsEventOdluxLog odluxEvent = new EsEventOdluxLog("Odluxevent"+t, "Problemuuid", "Message", getInternalDateAndTime(days, hours+t));
-            mwtnService.writeOdluxEventForTestpurpose(odluxEvent);
+                    "ProblemNode"+t, "Problemuuid", "Problemname", InternalSeverity.Major, t, getInternalDateAndTime(days, hours+t));
+            databaseEventService.writeFaultLog(fault.getFaultlog(SourceType.Unknown));
             res++;
         }
 
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211ObjectMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211ObjectMock.java
index 156aabdcb..124ac984a 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211ObjectMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211ObjectMock.java
@@ -19,9 +19,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev180907;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev180907;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElementBuilder;
@@ -51,7 +55,8 @@ public class Model1211ObjectMock {
         NetconfNodeBuilder nNodeBuilder = new NetconfNodeBuilder();
         nNodeBuilder.setAvailableCapabilities(availableCapabilitiesBuilder.build());
         nNodeBuilder.setConnectionStatus(ConnectionStatus.Connected);
-
+        nNodeBuilder.setHost(new Host(new IpAddress(new Ipv4Address("1.2.3.4"))));
+        nNodeBuilder.setPort(new PortNumber(2230));
         // build
         NetconfNode nNode = nNodeBuilder.build();
         return nNode;
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211pObjectMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211pObjectMock.java
index 46b66aebc..b042fd82a 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211pObjectMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model1211pObjectMock.java
@@ -19,9 +19,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev181010;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev181010;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElementBuilder;
@@ -51,7 +55,8 @@ public class Model1211pObjectMock {
         NetconfNodeBuilder nNodeBuilder = new NetconfNodeBuilder();
         nNodeBuilder.setAvailableCapabilities(availableCapabilitiesBuilder.build());
         nNodeBuilder.setConnectionStatus(ConnectionStatus.Connected);
-
+        nNodeBuilder.setHost(new Host(new IpAddress(new Ipv4Address("1.2.3.4"))));
+        nNodeBuilder.setPort(new PortNumber(2230));
         // build
         NetconfNode nNode = nNodeBuilder.build();
         return nNode;
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model12ObjectMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model12ObjectMock.java
index 9d7c0f3b0..8383812ef 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model12ObjectMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/Model12ObjectMock.java
@@ -24,9 +24,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.InternalDateAndTime;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.wrapperc.WrapperMicrowaveModelRev170324;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.wrapperc.WrapperMicrowaveModelRev170324;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElementBuilder;
@@ -59,7 +63,8 @@ public class Model12ObjectMock {
         NetconfNodeBuilder nNodeBuilder = new NetconfNodeBuilder();
         nNodeBuilder.setAvailableCapabilities(availableCapabilitiesBuilder.build());
         nNodeBuilder.setConnectionStatus(ConnectionStatus.Connected);
-
+        nNodeBuilder.setHost(new Host(new IpAddress(new Ipv4Address("1.2.3.4"))));
+        nNodeBuilder.setPort(new PortNumber(2230));
         // build
         NetconfNode nNode = nNodeBuilder.build();
         return nNode;
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ObjectBuilder.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ObjectBuilder.java
index b2faa5667..cc33060f2 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ObjectBuilder.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ObjectBuilder.java
@@ -23,7 +23,7 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container.ONFLayerProtocolName;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.onfcore.container.ONFLayerProtocolName;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.LayerProtocolName;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.UniversalId;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g.Extension;
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211Mock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211Mock.java
index 5dbffa3b2..327472703 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211Mock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211Mock.java
@@ -20,16 +20,12 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import com.google.common.util.concurrent.FluentFuture;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.MicrowaveModelListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
@@ -45,7 +41,7 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener;
  *
  */
 @SuppressWarnings("deprecation")
-public class ReadOnlyTransactionMountpoint1211Mock implements ReadOnlyTransaction, NotificationService {
+public class ReadOnlyTransactionMountpoint1211Mock implements ReadTransaction, NotificationService {
 
     private final Model1211ObjectMock mock = new Model1211ObjectMock();
     private MicrowaveModelListener modelListener;
@@ -61,8 +57,8 @@ public class ReadOnlyTransactionMountpoint1211Mock implements ReadOnlyTransactio
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T extends DataObject> CheckedFuture<Optional<T>, ReadFailedException> read(LogicalDatastoreType store,
-            InstanceIdentifier<T> path) {
+    public <T extends DataObject> @NonNull FluentFuture<java.util.Optional<T>> read(@NonNull LogicalDatastoreType store,
+            @NonNull InstanceIdentifier<T> path) {
 
         System.out.println("READ: " + path + " Store: " + store);
 
@@ -139,52 +135,10 @@ public class ReadOnlyTransactionMountpoint1211Mock implements ReadOnlyTransactio
 
         } else {
             System.err.println("Nothing to deliver for" + path.getTargetType());
-            res1 = Optional.absent();
+            res1 = Optional.empty();
         }
 
-
-        CheckedFuture<Optional<T>, ReadFailedException> res = new CheckedFuture<Optional<T>, ReadFailedException>() {
-
-            @Override
-            public void addListener(Runnable arg0, Executor arg1) {}
-
-            @Override
-            public boolean cancel(boolean mayInterruptIfRunning) {
-                return false;
-            }
-
-            @Override
-            public Optional<T> get() throws InterruptedException, ExecutionException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> get(long timeout, TimeUnit unit)
-                    throws InterruptedException, ExecutionException, TimeoutException {
-                return null;
-            }
-
-            @Override
-            public boolean isCancelled() {
-                return false;
-            }
-
-            @Override
-            public boolean isDone() {
-                return false;
-            }
-
-            @Override
-            public Optional<T> checkedGet() throws ReadFailedException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> checkedGet(long arg0, TimeUnit arg1) throws TimeoutException, ReadFailedException {
-                return null;
-            }
-
-        };
+        FluentFuture<Optional<T>> res = FluentFuture.from(com.google.common.util.concurrent.Futures.immediateFuture(res1));
         return res;
 
     }
@@ -205,4 +159,5 @@ public class ReadOnlyTransactionMountpoint1211Mock implements ReadOnlyTransactio
         modelListener.onProblemNotification(mock.getProblemNotification());
     }
 
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211pMock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211pMock.java
index 9b49c5b99..7a074ce30 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211pMock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint1211pMock.java
@@ -20,16 +20,12 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import com.google.common.util.concurrent.FluentFuture;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.MicrowaveModelListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
@@ -45,7 +41,7 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener;
  *
  */
 @SuppressWarnings("deprecation")
-public class ReadOnlyTransactionMountpoint1211pMock implements ReadOnlyTransaction, NotificationService {
+public class ReadOnlyTransactionMountpoint1211pMock implements ReadTransaction, NotificationService {
 
     private final Model1211pObjectMock mock = new Model1211pObjectMock();
     private MicrowaveModelListener modelListener;
@@ -60,9 +56,10 @@ public class ReadOnlyTransactionMountpoint1211pMock implements ReadOnlyTransacti
     }
 
     @SuppressWarnings("unchecked")
+
     @Override
-    public <T extends DataObject> CheckedFuture<Optional<T>, ReadFailedException> read(LogicalDatastoreType store,
-            InstanceIdentifier<T> path) {
+    public <T extends DataObject> @NonNull FluentFuture<java.util.Optional<T>> read(@NonNull LogicalDatastoreType store,
+            @NonNull InstanceIdentifier<T> path) {
 
         System.out.println("READ: " + path + " Store: " + store);
 
@@ -140,52 +137,10 @@ public class ReadOnlyTransactionMountpoint1211pMock implements ReadOnlyTransacti
 
         } else {
             System.err.println("Nothing to deliver for" + path.getTargetType());
-            res1 = Optional.absent();
+            res1 = Optional.empty();
         }
 
-
-        CheckedFuture<Optional<T>, ReadFailedException> res = new CheckedFuture<Optional<T>, ReadFailedException>() {
-
-            @Override
-            public void addListener(Runnable arg0, Executor arg1) {}
-
-            @Override
-            public boolean cancel(boolean mayInterruptIfRunning) {
-                return false;
-            }
-
-            @Override
-            public Optional<T> get() throws InterruptedException, ExecutionException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> get(long timeout, TimeUnit unit)
-                    throws InterruptedException, ExecutionException, TimeoutException {
-                return null;
-            }
-
-            @Override
-            public boolean isCancelled() {
-                return false;
-            }
-
-            @Override
-            public boolean isDone() {
-                return false;
-            }
-
-            @Override
-            public Optional<T> checkedGet() throws ReadFailedException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> checkedGet(long arg0, TimeUnit arg1) throws TimeoutException, ReadFailedException {
-                return null;
-            }
-
-        };
+        FluentFuture<Optional<T>> res = FluentFuture.from(com.google.common.util.concurrent.Futures.immediateFuture(res1));
         return res;
 
     }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint12Mock.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint12Mock.java
index 45c0f3900..d27330328 100644
--- a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint12Mock.java
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ReadOnlyTransactionMountpoint12Mock.java
@@ -20,16 +20,12 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import com.google.common.util.concurrent.FluentFuture;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.MicrowaveModelListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
@@ -44,8 +40,7 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener;
  * @author herbert
  *
  */
-@SuppressWarnings("deprecation")
-public class ReadOnlyTransactionMountpoint12Mock implements ReadOnlyTransaction, NotificationService {
+public class ReadOnlyTransactionMountpoint12Mock implements ReadTransaction, NotificationService {
 
     private final Model12ObjectMock mock = new Model12ObjectMock();
     private MicrowaveModelListener modelListener;
@@ -61,8 +56,8 @@ public class ReadOnlyTransactionMountpoint12Mock implements ReadOnlyTransaction,
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T extends DataObject> CheckedFuture<Optional<T>, ReadFailedException> read(LogicalDatastoreType store,
-            InstanceIdentifier<T> path) {
+    public <T extends DataObject> @NonNull FluentFuture<java.util.Optional<T>> read(@NonNull LogicalDatastoreType store,
+            @NonNull InstanceIdentifier<T> path) {
 
         System.out.println("READ: " + path + " Store: " + store);
 
@@ -131,52 +126,9 @@ public class ReadOnlyTransactionMountpoint12Mock implements ReadOnlyTransaction,
 
         } else {
             System.err.println("Nothing to deliver for" + path.getTargetType());
-            res1 = Optional.absent();
+            res1 = Optional.empty();
         }
-
-
-        CheckedFuture<Optional<T>, ReadFailedException> res = new CheckedFuture<Optional<T>, ReadFailedException>() {
-
-            @Override
-            public void addListener(Runnable arg0, Executor arg1) {}
-
-            @Override
-            public boolean cancel(boolean mayInterruptIfRunning) {
-                return false;
-            }
-
-            @Override
-            public Optional<T> get() throws InterruptedException, ExecutionException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> get(long timeout, TimeUnit unit)
-                    throws InterruptedException, ExecutionException, TimeoutException {
-                return null;
-            }
-
-            @Override
-            public boolean isCancelled() {
-                return false;
-            }
-
-            @Override
-            public boolean isDone() {
-                return false;
-            }
-
-            @Override
-            public Optional<T> checkedGet() throws ReadFailedException {
-                return res1;
-            }
-
-            @Override
-            public Optional<T> checkedGet(long arg0, TimeUnit arg1) throws TimeoutException, ReadFailedException {
-                return null;
-            }
-
-        };
+        FluentFuture<Optional<T>> res = FluentFuture.from(com.google.common.util.concurrent.Futures.immediateFuture(res1));
         return res;
 
     }
@@ -193,7 +145,10 @@ public class ReadOnlyTransactionMountpoint12Mock implements ReadOnlyTransaction,
 
     public void sendProblemNotification() {
         System.out.println("Send out Problemnotification");
-        modelListener.onProblemNotification(mock.getProblemNotification());
+        modelListener.onProblemNotification(
+                mock.getProblemNotification()
+                );
     }
 
+
 }
diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ResourceFileLoader.java b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ResourceFileLoader.java
new file mode 100644
index 000000000..6c944e4c1
--- /dev/null
+++ b/sdnr/wt/devicemanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/test/util/ResourceFileLoader.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.test.util;
+
+import java.io.File;
+
+public class ResourceFileLoader {
+
+	public static File getFile(Object o, String fileName) {
+		ClassLoader classLoader = o.getClass().getClassLoader();
+		return new File(classLoader.getResource(fileName).getFile());
+	}
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties
index eec5d3a4c..bdc3c1009 100644
--- a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties
+++ b/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties
@@ -11,7 +11,9 @@ org.slf4j.simpleLogger.defaultLogLevel=info
 # If not specified, the default logging detail level is used.
 # org.slf4j.simpleLogger.log.xxx.yyy=debug
 org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
 org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
 org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
 
diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml
deleted file mode 100755
index f19c6b86d..000000000
--- a/sdnr/wt/devicemodel/installer/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- * ============LICENSE_START=======================================================
- * ONAP : CCSDK.sdnr.wt.devicemodel.installer
- * ================================================================================
- * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemodel-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <properties>
-    <application.name>sdnr-wt-devicemodel</application.name>
-    <include.transitive.dependencies>false</include.transitive.dependencies>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>sdnr-wt-devicemodel-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml
deleted file mode 100644
index 3ee29cb4c..000000000
--- a/sdnr/wt/devicemodel/model/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- * ============LICENSE_START=======================================================
- * ONAP : CCSDK.sdnr.wt.devicemodel.model
- * ================================================================================
- * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-devicemodel-model</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <properties>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
-  </properties>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-topology</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/gen/**</exclude>
-            <exclude>**/generated-sources/**</exclude>
-            <exclude>**/yang-gen-sal/**/*</exclude>
-            <exclude>**/pax/**</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index 493b01d19..e1501e978 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -20,76 +20,99 @@
  * ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-feature-aggregator</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-feature-aggregator</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencyManagement>
     <dependencies>
-      
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-apigateway-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-helpserver-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-websocketmanager2-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-data-provider-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-onf-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-gran-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-core-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-apps-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-apigateway-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-helpserver-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-websocketmanager2-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-devicemanager-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-odlux-core-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-odlux-apps-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index 6eae7c22a..be29408c3 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -20,129 +20,160 @@
  * ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-feature-aggregator</application.name>
-    <include.transitive.dependencies>true</include.transitive.dependencies>
-    <ccsdk.features.version>${project.version}</ccsdk.features.version>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>*</groupId> -->
-<!--           <artifactId>*</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-    </dependency>
-  </dependencies>
+    <properties>
+        <application.name>sdnr-wt-feature-aggregator</application.name>
+        <include.transitive.dependencies>true</include.transitive.dependencies>
+        <ccsdk.features.version>${project.version}</ccsdk.features.version>
+    </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-<!--           <execution> -->
-<!--             <id>copy-dependencies</id> -->
-<!--             <goals> -->
-<!--               <goal>copy-dependencies</goal> -->
-<!--             </goals> -->
-<!--             <phase>prepare-package</phase> -->
-<!--             <configuration> -->
-<!--               <transitive>false</transitive> -->
-<!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-<!--               <overWriteReleases>false</overWriteReleases> -->
-<!--               <overWriteSnapshots>true</overWriteSnapshots> -->
-<!--               <overWriteIfNewer>true</overWriteIfNewer> -->
-<!--               <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--               <addParentPoms>false</addParentPoms> -->
-<!--               <copyPom>false</copyPom> -->
-<!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
-<!--               <scope>provided</scope> -->
-<!--             </configuration> -->
-<!--           </execution> -->
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-cache-schema</id>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                  <artifactId>sdnr-wt-devicemanager-provider</artifactId>
-                  <version>${project.version}</version>
-                  <type>jar</type>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-              <includes>preload.cache.schema/**</includes>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <!--       <exclusions> -->
+            <!--         <exclusion> -->
+            <!--           <groupId>*</groupId> -->
+            <!--           <artifactId>*</artifactId> -->
+            <!--         </exclusion> -->
+            <!--       </exclusions> -->
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!--           <execution> -->
+                    <!--             <id>copy-dependencies</id> -->
+                    <!--             <goals> -->
+                    <!--               <goal>copy-dependencies</goal> -->
+                    <!--             </goals> -->
+                    <!--             <phase>prepare-package</phase> -->
+                    <!--             <configuration> -->
+                    <!--               <transitive>false</transitive> -->
+                    <!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
+                    <!--               <overWriteReleases>false</overWriteReleases> -->
+                    <!--               <overWriteSnapshots>true</overWriteSnapshots> -->
+                    <!--               <overWriteIfNewer>true</overWriteIfNewer> -->
+                    <!--               <useRepositoryLayout>true</useRepositoryLayout> -->
+                    <!--               <addParentPoms>false</addParentPoms> -->
+                    <!--               <copyPom>false</copyPom> -->
+                    <!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
+                    <!--               <scope>provided</scope> -->
+                    <!--             </configuration> -->
+                    <!--           </execution> -->
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- Copy yang schema preload for schema cache -->
+                        <id>unpack-cache-schema</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+                                    <artifactId>sdnr-wt-devicemanager-provider</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <includes>preload.cache.schema/**</includes>
+                                    <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- Copy database initialization script -->
+                        <id>unpack-es-init</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+                                    <artifactId>sdnr-wt-data-provider-database</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <includes>es-init.sh</includes>
+                                    <outputDirectory>${project.build.directory}/assembly/opt/onap/sdnc/bin</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index e6e058774..a9576bda9 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -20,24 +20,24 @@
  * ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-feature-aggregator-top</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-feature-aggregator-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <modules>
-    <module>feature</module>
-    <module>installer</module>
-  </modules>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
+    <modules>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
 </project>
diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml
index 88af2c785..a03f08865 100644
--- a/sdnr/wt/helpserver/feature/pom.xml
+++ b/sdnr/wt/helpserver/feature/pom.xml
@@ -22,29 +22,29 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-helpserver-feature</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
-
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  
-  <dependencies>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-helpserver-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-helpserver-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-helpserver-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
 </project>
diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml
index 368f495d7..53bceff85 100755
--- a/sdnr/wt/helpserver/installer/pom.xml
+++ b/sdnr/wt/helpserver/installer/pom.xml
@@ -1,113 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-helpserver-installer</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-helpserver-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<properties>
-		<application.name>sdnr-wt-helpserver</application.name>
-		<include.transitive.dependencies>false</include.transitive.dependencies>
-	</properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-	<dependencies>
+    <properties>
+        <application.name>sdnr-wt-helpserver</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-		<dependency>
-			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-			<artifactId>${application.name}-feature</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-			<artifactId>${application.name}-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		</dependencies>
+    <dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>maven-repo-zip</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<attach>true</attach>
-							<finalName>stage/${application.name}-${project.version}</finalName>
-							<descriptors>
-								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>true</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<!-- <execution> -->
-					<!-- <id>copy-dependencies</id> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <phase>prepare-package</phase> -->
-					<!-- <configuration> -->
-					<!-- <transitive>true</transitive> -->
-					<!-- <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-					<!-- <overWriteReleases>false</overWriteReleases> -->
-					<!-- <overWriteSnapshots>true</overWriteSnapshots> -->
-					<!-- <overWriteIfNewer>true</overWriteIfNewer> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- <addParentPoms>false</addParentPoms> -->
-					<!-- <copyPom>false</copyPom> -->
-					<!-- <includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
-					<!-- <scope>provided</scope> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<execution>
-						<id>copy-nested-dependencies</id>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<phase>prepare-package</phase>
-						<configuration>
-							<transitive>true</transitive>
-							<outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<useRepositoryLayout>true</useRepositoryLayout>
-							<addParentPoms>false</addParentPoms>
-							<copyPom>false</copyPom>
-							<!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
-							<!--<scope>provided</scope> -->
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!-- <execution> -->
+                    <!-- <id>copy-dependencies</id> -->
+                    <!-- <goals> -->
+                    <!-- <goal>copy-dependencies</goal> -->
+                    <!-- </goals> -->
+                    <!-- <phase>prepare-package</phase> -->
+                    <!-- <configuration> -->
+                    <!-- <transitive>true</transitive> -->
+                    <!-- <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
+                    <!-- <overWriteReleases>false</overWriteReleases> -->
+                    <!-- <overWriteSnapshots>true</overWriteSnapshots> -->
+                    <!-- <overWriteIfNewer>true</overWriteIfNewer> -->
+                    <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+                    <!-- <addParentPoms>false</addParentPoms> -->
+                    <!-- <copyPom>false</copyPom> -->
+                    <!-- <includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
+                    <!-- <scope>provided</scope> -->
+                    <!-- </configuration> -->
+                    <!-- </execution> -->
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
+                            <!--<scope>provided</scope> -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml
index fd0a68cbb..d11cb94ac 100755
--- a/sdnr/wt/helpserver/pom.xml
+++ b/sdnr/wt/helpserver/pom.xml
@@ -22,29 +22,29 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-    	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-helpserver-top</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-helpserver-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-	<modules>
-		<module>feature</module>
-		<module>provider</module>
-		<module>installer</module>
-	</modules>
+    <modules>
+        <module>feature</module>
+        <module>provider</module>
+        <module>installer</module>
+    </modules>
 
-	<properties>
-		<feature-name>sdnr-wt-helpserver</feature-name>
-	</properties>
+    <properties>
+        <feature-name>sdnr-wt-helpserver</feature-name>
+    </properties>
 </project>
diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml
index 80c27d318..1b2367eda 100644
--- a/sdnr/wt/helpserver/provider/pom.xml
+++ b/sdnr/wt/helpserver/provider/pom.xml
@@ -11,24 +11,27 @@
     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========================================================= -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-helpserver-provider</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-    <packaging>bundle</packaging>
-    <properties>
-        <checkstyle.skip>true</checkstyle.skip>
-     </properties>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-helpserver-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -57,6 +60,7 @@
         </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <!-- fixed bug for sonarcube -->
diff --git a/sdnr/wt/helpserver/provider/src/main/resources/help/meta.json b/sdnr/wt/helpserver/provider/src/main/resources/help/meta.json
index c8dc5ce78..53dbbfb68 100644
--- a/sdnr/wt/helpserver/provider/src/main/resources/help/meta.json
+++ b/sdnr/wt/helpserver/provider/src/main/resources/help/meta.json
@@ -61,7 +61,7 @@
                 },
                 "label": "Config"
             },
-            "performanceApp": {
+            "performanceHistoryApp": {
                 "versions": {
                     "0.4.0": {
                         "date": "2018-02-24",
@@ -76,7 +76,7 @@
                 },
                 "label": "Performance"
             },
-            "pnfInventory": {
+            "inventoryApp": {
                 "versions": {
                     "0.4.0": {
                         "date": "2018-02-24",
@@ -121,28 +121,52 @@
         },
         "label": "SDN-R"
     },
-    "mediatorserver":{
-        "nodes":{
-            "installation":{
-                "versions":{
-                    "0.4.0":{"date":"","path":"mediatorserver/installation/README.md","label":""},
-                    "current":{"date":"","path":"mediatorserver/installation/README.md","label":""}
+    "mediatorserver": {
+        "nodes": {
+            "installation": {
+                "versions": {
+                    "0.4.0": {
+                        "date": "",
+                        "path": "mediatorserver/installation/README.md",
+                        "label": ""
+                    },
+                    "current": {
+                        "date": "",
+                        "path": "mediatorserver/installation/README.md",
+                        "label": ""
+                    }
                 },
-                "label":"Installation"
+                "label": "Installation"
             },
-            "mediator":{
-                "versions":{
-                    "0.4.0":{"date":"","path":"mediatorserver/mediator/README.md","label":""},
-                    "current":{"date":"","path":"mediatorserver/mediator/README.md","label":""}
+            "mediator": {
+                "versions": {
+                    "0.4.0": {
+                        "date": "",
+                        "path": "mediatorserver/mediator/README.md",
+                        "label": ""
+                    },
+                    "current": {
+                        "date": "",
+                        "path": "mediatorserver/mediator/README.md",
+                        "label": ""
+                    }
                 },
-                "label":"Mediator"
+                "label": "Mediator"
             }
         },
-        "versions":{
-            "0.4.0":{"date":"","path":"mediatorserver/README.md","label":""},
-            "current":{"date":"","path":"mediatorserver/README.md","label":""}
+        "versions": {
+            "0.4.0": {
+                "date": "",
+                "path": "mediatorserver/README.md",
+                "label": ""
+            },
+            "current": {
+                "date": "",
+                "path": "mediatorserver/README.md",
+                "label": ""
+            }
         },
-        "label":"MediatorServer"
+        "label": "MediatorServer"
     },
     "faq": {
         "versions": {
@@ -174,4 +198,4 @@
         },
         "label": "Abbreviations"
     }
-}
+}
\ No newline at end of file
diff --git a/sdnr/wt/netconfnode-state-service/feature/pom.xml b/sdnr/wt/netconfnode-state-service/feature/pom.xml
new file mode 100644
index 000000000..8becb3bcb
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/feature/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.feature
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-netconfnode-state-service-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencies>
+        <!--     <dependency> -->
+        <!--       <groupId>org.yaml</groupId> -->
+        <!--       <artifactId>snakeyaml</artifactId> -->
+        <!--     </dependency> -->
+        <!--     <dependency> -->
+        <!--       <groupId>${project.groupId}</groupId> -->
+        <!--       <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId> -->
+        <!--       <version>${project.version}</version> -->
+        <!--     </dependency> -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sdnr/wt/netconfnode-state-service/installer/pom.xml b/sdnr/wt/netconfnode-state-service/installer/pom.xml
new file mode 100755
index 000000000..332fd16ef
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/installer/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.installer
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-netconfnode-state-service-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-netconfnode-state-service</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644
index 000000000..c4eb9aa25
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -0,0 +1,49 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : CCSDK
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>repo</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sdnr/wt/netconfnode-state-service/model/pom.xml b/sdnr/wt/netconfnode-state-service/model/pom.xml
new file mode 100644
index 000000000..5a41e293c
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.netconfnode-state-service.model
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-data-provider-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen-sal/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/Capabilities.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java
index d64996c65..ba80d305f 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/base/netconf/container/Capabilities.java
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/Capabilities.java
@@ -19,7 +19,7 @@
  * Convert capabilities of netconfnode into internal format. Boron and Carbon are providing
  * different versions
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container;
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -30,8 +30,11 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.UnavailableCapabilities;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,13 +54,14 @@ public class Capabilities {
 
     private Capabilities() {}
 
-    public static Capabilities getAvailableCapabilities(NetconfNode nnode) {
+    @SuppressWarnings("null")
+    public static Capabilities getAvailableCapabilities(@Nullable NetconfNode nnode) {
         LOG.info("GetAvailableCapabilities for node");
         Capabilities capabilities = new Capabilities();
         if (nnode != null) {
             AvailableCapabilities availableCapabilites = nnode.getAvailableCapabilities();
             if (availableCapabilites != null) {
-                capabilities.constructor(availableCapabilites.getAvailableCapability());
+                   capabilities.constructor(availableCapabilites.getAvailableCapability());
             } else {
                 LOG.debug("empty capabilites");
             }
@@ -67,6 +71,24 @@ public class Capabilities {
         return capabilities;
     }
 
+    @SuppressWarnings("null")
+    public static Capabilities getUnavailableCapabilities(NetconfNode nnode) {
+        LOG.info("GetAvailableCapabilities for node");
+        Capabilities capabilities = new Capabilities();
+        if (nnode != null) {
+            UnavailableCapabilities availableCapabilites = nnode.getUnavailableCapabilities();
+            if (availableCapabilites != null) {
+                   capabilities.constructor(availableCapabilites.getUnavailableCapability());
+            } else {
+                LOG.debug("empty capabilites");
+            }
+        } else {
+            LOG.debug("No node provided");
+        }
+        return capabilities;
+    }
+
+
     /**
      * Does all construction steps
      *
@@ -75,13 +97,12 @@ public class Capabilities {
      *        - Boron: List<code><String></code> <br>
      *        - Carbon: List<AvailableCapability>
      */
-    private void constructor(List<?> pcapabilities) {
+    private void constructor(List<@NonNull ?> pcapabilities) {
         if (pcapabilities != null) {
             Method methodGetCapability;
 
             for (Object capability : pcapabilities) {
-
-                if (capability instanceof String) { // ODL Boron specific
+               if (capability instanceof String) { // ODL Boron specific
                     this.capabilities.add((String) capability);
                 } else { // Carbon specific part .. handled via generics
                     try {
@@ -100,22 +121,76 @@ public class Capabilities {
     }
 
     /**
+     * Get Capabilites
+     * @return List<String> with capabilites
+     */
+    public List<String> getCapabilities() {
+        return capabilities;
+    }
+
+    /**
+     * Verify if the namespace is supported
+     * @param qCapability from model
+     * @return true if namespace is supported
+     */
+    public boolean isSupportingNamespace(QName qCapability) {
+
+        String namespace = qCapability.getNamespace().toString();
+
+        return isSupportingNamespaceAndRevision(namespace, null);
+
+    }
+
+    /**
      * check if the namespace and its revision are supported by the given capabilities
      *
      * @param qCapability capability from the model
-     * @return true if supporting the model
+     * @return true if supporting the model AND revision<br>
+     * false if revision not available or both not found.
      */
     public boolean isSupportingNamespaceAndRevision(QName qCapability) {
+
         String namespace = qCapability.getNamespace().toString();
-        String revision;
+        String revision = getRevisionString(qCapability);
+        return revision == null ? false : isSupportingNamespaceAndRevision(namespace, revision);
+    }
+
+    /**
+     *
+     * @param namespace requested
+     * @param revision request or null for any revision
+     * @return true if existing
+     */
+    private boolean isSupportingNamespaceAndRevision(String namespace, @Nullable String revision) {
+        LOG.trace("isSupportingNamespaceAndRevision: Model namespace {}?[revision {}]", namespace, revision);
+        for (String capability : capabilities) {
+            if (capability.contains(namespace) && (revision == null || capability.contains(revision))) {
+                LOG.trace("Verify true with: {}", capability);
+                return true;
+            } else {
+                LOG.trace("Verify false with: {}", capability);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Provide revision as String from QName, considering older formats.
+     * @param qCapability that specifies the revision
+     * @return String with revisiondate or null
+     */
+    private String getRevisionString(QName qCapability) {
         Object revisionObject = qCapability.getRevision();
+        String revision = null;
         if (revisionObject instanceof Optional) {
             if (((Optional<?>) revisionObject).isPresent()) {
                 revisionObject = ((Optional<?>) revisionObject).get();
-                LOG.info("Unwrapp Optional: {}", revisionObject.getClass());
+                LOG.info("Unwrapp Optional: {}", revisionObject != null ? revisionObject.getClass() : null);
             }
         }
-        if (revisionObject instanceof String) {
+        if (revisionObject == null) {
+            // Cover null case
+        } else if (revisionObject instanceof String) {
             revision = (String) revisionObject;
         } else if (revisionObject instanceof Date) {
             revision = formatter.format((Date) revisionObject);
@@ -124,16 +199,22 @@ public class Capabilities {
             LOG.debug("Revision number type not supported. Use toString().String:{} Class:{} ", revisionObject,
                     revisionObject.getClass().getName());
         }
-        LOG.trace("isSupportingNamespaceAndRevision: Model namespace {}?[revision {}]", namespace, revision);
-        for (String capability : capabilities) {
-            if (capability.contains(namespace) && capability.contains(revision)) {
-                LOG.trace("Verify true with: {}", capability);
-                return true;
-            } else {
-                LOG.trace("Verify false with: {}", capability);
+        return revision;
+    }
+
+    /**
+     * Get revision of first entry of related capability
+     * @param qCapability that specifies the namespace
+     * @return String with date or
+     */
+    public String getRevisionForNamespace(QName qCapability) {
+        String namespace = qCapability.getNamespace().toString();
+       for (String capability : capabilities) {
+            if (capability.contains(namespace)) {
+                return QName.create(capability).getRevision().get().toString();
             }
         }
-        return false;
+        return "Unsupported";
     }
 
 
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/INetconfAcessor.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/INetconfAcessor.java
new file mode 100644
index 000000000..a186b3c6e
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/INetconfAcessor.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+
+/**
+  * Interface handling netconf connection.
+ */
+public interface INetconfAcessor {
+
+    /**
+     * @return the nodeId
+     */
+    NodeId getNodeId();
+
+    /**
+     * @return NetconfNode of this connection
+     */
+    NetconfNode getNetconfNode();
+
+    /**
+     * @return Capabilites
+     */
+    Capabilities getCapabilites();
+
+    /**
+     * @return the dataBroker
+     */
+    DataBroker getDataBroker();
+
+    /**
+     * @return the MDSAL Mountpoint service
+     **/
+    MountPoint getMountpoint();
+
+    /**
+     * @Return TransAction
+     */
+    TransactionUtils getTransactionUtils();
+
+
+    /**
+     * Register netconf notification listener for related mountpoint
+     *
+     * @param <T>        specific child class of NotificationListener
+     * @param listener   listener to be called
+     * @return handler to manager registration
+     */
+    <T extends NotificationListener> ListenerRegistration<NotificationListener> doRegisterNotificationListener(
+            @NonNull T listener);
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfAccessor.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfAccessor.java
new file mode 100644
index 000000000..c80c7befc
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfAccessor.java
@@ -0,0 +1,109 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.NotificationListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NetconfAccessor implements INetconfAcessor {
+
+    private static final Logger log = LoggerFactory.getLogger(NetconfAccessor.class);
+
+    private final NodeId nodeId;
+    private final DataBroker dataBroker;
+    private final TransactionUtils transactionUtils;
+    private final MountPoint mountpoint;
+    private final NetconfNode netconfNode;
+    private final Capabilities capabilities;
+
+    /**
+     * @param nodeId     of managed netconf node
+     * @param dataBroker to access node
+     */
+    public NetconfAccessor(NodeId nodeId, NetconfNode netconfNode, DataBroker dataBroker, MountPoint mountpoint,
+            TransactionUtils transactionUtils) {
+        super();
+        this.nodeId = nodeId;
+        this.netconfNode = netconfNode;
+        this.dataBroker = dataBroker;
+        this.mountpoint = mountpoint;
+        this.transactionUtils = transactionUtils;
+
+        ConnectionStatus csts = netconfNode != null ? netconfNode.getConnectionStatus() : null;
+        this.capabilities = Capabilities.getAvailableCapabilities(csts != null ? netconfNode : null);
+    }
+
+    /**
+     * @param nodeId     with uuid of managed netconf node
+     * @param dataBroker to access node
+     */
+    public NetconfAccessor(String nodeId, NetconfNode netconfNode, DataBroker dataBroker, MountPoint mountpoint,
+            TransactionUtils transactionUtils) {
+        this(new NodeId(nodeId), netconfNode, dataBroker, mountpoint, transactionUtils);
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return nodeId;
+    }
+
+    @Override
+    public DataBroker getDataBroker() {
+        return dataBroker;
+    }
+    @Override
+    public MountPoint getMountpoint() {
+        return mountpoint;
+    }
+    @Override
+    public TransactionUtils getTransactionUtils() {
+        return transactionUtils;
+    }
+    @Override
+    public NetconfNode getNetconfNode() {
+        return netconfNode;
+    }
+    @Override
+    public Capabilities getCapabilites() {
+        return capabilities;
+    }
+
+    @Override
+    public @NonNull <T extends NotificationListener> ListenerRegistration<NotificationListener> doRegisterNotificationListener(@NonNull T listener) {
+        log.info("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString());
+        final Optional<NotificationService> optionalNotificationService = mountpoint
+                .getService(NotificationService.class);
+        final NotificationService notificationService = optionalNotificationService.get();
+        final ListenerRegistration<NotificationListener> ranListenerRegistration = notificationService
+                .registerNotificationListener(listener);
+        log.info("End registration listener for Mountpoint {} Listener: {} Result: {}",
+                mountpoint.getIdentifier().toString(), optionalNotificationService, ranListenerRegistration);
+        return ranListenerRegistration;
+    }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeConnectListener.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeConnectListener.java
new file mode 100644
index 000000000..942e29f19
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeConnectListener.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import java.util.EventListener;
+
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+/**
+ *  Indicate if device is connected or not.
+ *  A NetconfNode (Mountpoint) is providing the status.
+ *  If this is Master and connected, this function is calles.
+ */
+
+public interface NetconfNodeConnectListener extends EventListener, AutoCloseable {
+
+	/**
+	 * Called if device state changes to "connected" for a netconf master node.
+	 * @param nNodeId name of mount point
+	 * @param netconfNode with related information
+	 * @param netconfNodeDataBroker to access connected netconf device
+	 */
+	public void onEnterConnected(NodeId nNodeId, NetconfNode netconfNode, DataBroker netconfNodeDataBroker);
+
+	/**
+	 * Notify of device state change to "not connected" mount point supervision.
+	 * HINT: This callback could be called multiple times also the onEnterConnected state was not called.
+	 * @param nNodeId name of mount point
+	 */
+	public void onLeaveConnected(NodeId nNodeId);
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeStateListener.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeStateListener.java
new file mode 100644
index 000000000..253af0598
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeStateListener.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import java.util.EventListener;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+/**
+ * Indicate all state changes of NetconfNode (Mountpoint). Cleans up and
+ * summarizes the
+ */
+public interface NetconfNodeStateListener extends EventListener {
+
+	/**
+	 * New NetconfNode has been created
+	 * @param nNodeId of Node
+	 * @param netconfNode object
+	 */
+
+	void onCreated(NodeId nNodeId, NetconfNode netconfNode);
+
+	/**
+	 * New NetconfNode has been created
+	 * @param nNodeId of node
+	 * @param netconfNode object after change
+	 */
+	void onStateChange(NodeId nNodeId, NetconfNode netconfNode);
+
+	/**
+	 * NetconfNode has been removed
+	 * @param nNodeId of related node
+	 */
+	void onRemoved(NodeId nNodeId);
+
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsFaultLog.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeStateService.java
index e15aba5b2..0105c36e8 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/EsFaultLog.java
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfNodeStateService.java
@@ -15,42 +15,34 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types;
 
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.base.database.EsObject;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml.ProblemNotificationXml;
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
 
-/**
- *
- * Event from Network to be recorded in the database
- *
- */
-
-public class EsFaultLog extends EsObject {
-
-    public static final String ESDATATYPENAME = "faultlog";
-
-    private static final String FAULTLOG_FIELD_TIMESTAMP = "fault.timeStamp";
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
 
-    private ProblemNotificationXml fault;
+public interface NetconfNodeStateService extends Registration {
 
-    public ProblemNotificationXml getProblem() {
-        return fault;
-    }
+    /**
+     * Register for indication that Master NetconNode is entering or leaving Connected state.
+     * @param netconfNodeConnectListener
+     * @return managing object for listener
+     */
+    @NonNull <L extends NetconfNodeConnectListener> ListenerRegistration<L> registerNetconfNodeConnectListener(@NonNull L netconfNodeConnectListener);
 
-    public void setProblem(ProblemNotificationXml fault) {
-        this.fault = fault;
-    }
+    /**
+     * Register for all NetconfNode specific state changes
+     * @param netconfNodeStateListener
+     * @return managing object for listener
+     */
+    @NonNull <L extends NetconfNodeStateListener> ListenerRegistration<L> registerNetconfNodeStateListener(@NonNull L netconfNodeStateListener);
 
     /**
-     * Get older Elements
-     * @param netconfTimeStamp to identify query elements older than this timestamp.
-     * @return QueryBuilder for related elements
+     * Register for Ves/DmaaP provided messages
+     * @param netconfNodeStateListener
+     * @return managing object for listener
      */
-    public static QueryBuilder getQueryForTimeStamp(String netconfTimeStamp) {
-        return new RangeQueryBuilder(FAULTLOG_FIELD_TIMESTAMP).lt(netconfTimeStamp);
-    }
+    @NonNull <L extends VesNotificationListener> ListenerRegistration<L> registerVesNotifications(@NonNull L netconfNodeStateListener);
 
- }
+}
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/TransactionUtils.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/TransactionUtils.java
new file mode 100644
index 000000000..da8da5c7f
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/TransactionUtils.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * @author herbert
+ *
+ */
+public interface TransactionUtils {
+
+	/**
+	 * Deliver the data back or null. Warning
+	 *
+	 * @param <T> SubType of the DataObject to be handled
+	 * @param dataBroker for accessing data
+	 * @param dataStoreType to address datastore
+	 * @param iid id to access data
+	 * @return null or object
+	 */
+	@Nullable
+	<T extends DataObject> T readData(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
+			InstanceIdentifier<T> iid);
+
+	/**
+	 * Deliver the data back or null
+	 *
+	 * @param <T> SubType of the DataObject to be handled
+	 * @param dataBroker for accessing data
+	 * @param dataStoreType to address datastore
+	 * @param iid id to access data
+	 * @param noErrorIndication (Output) true if data could be read and are available and is not null
+	 * @param statusIndicator (Output) String with status indications during the read.
+	 * @return null or object
+	 */
+	@Nullable
+	<T extends DataObject> T readDataOptionalWithStatus(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
+			InstanceIdentifier<T> iid, AtomicBoolean noErrorIndication, AtomicReference<String> statusIndicator);
+
+}
\ No newline at end of file
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/VesNotificationListener.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/VesNotificationListener.java
new file mode 100644
index 000000000..e7d2481b8
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/VesNotificationListener.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice;
+
+import java.util.EventListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.AttributeChangeNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.FaultNotification;
+
+/**
+ *  Indicate if device is connected or not.
+ *  A NetconfNode (Mountpoint) is providing the status.
+ *  If this is Master and connected, this function is calles.
+ */
+
+public interface VesNotificationListener extends EventListener, AutoCloseable {
+
+    /**
+     * Called in case of fault notification
+     * @param faultNotification to handle
+     */
+    public void onNotification(FaultNotification faultNotification);
+
+    /**
+     * Called in case of attributeChange notification
+     * @param attributeChangeNotification to handle
+     */
+    public void onNotification(AttributeChangeNotification attributeChangeNotification);
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/yang/netconfnodestateservice.yang b/sdnr/wt/netconfnode-state-service/model/src/main/yang/netconfnodestateservice.yang
new file mode 100644
index 000000000..737f858de
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/yang/netconfnodestateservice.yang
@@ -0,0 +1,64 @@
+module netconfnode-state {
+
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:netconfnode-state";
+    prefix "netconfnode-state";
+
+    import data-provider { prefix "data-provider"; }
+
+    description
+        "sdnr-wt-netconfnode-state-service Api Module";
+
+    revision "2019-10-11" {
+        description
+            "Initial revision";
+    }
+
+    container fault-notification {
+        description
+            "Handle fault problem notification of a network-element";
+        uses data-provider:object-change-reference;
+        uses data-provider:fault;
+    }
+    container attribute-change-notification {
+        description
+            "Handle  attribute change notification of a network-element";
+            uses data-provider:object-change-reference;
+            uses data-provider:attribute-change;
+    }
+    rpc push-fault-notification {
+        description
+            "Forward fault problem notification of a network-element";
+        input {
+            uses data-provider:object-change-reference;
+            uses data-provider:fault;
+        }
+    }
+    rpc push-attribute-change-notification {
+        description
+            "Forward attribute change notification of a network-element";
+        input {
+            uses data-provider:object-change-reference;
+            uses data-provider:attribute-change;
+        }
+    }
+
+    rpc get-status {
+        description
+                "Returns status information";
+
+        output {
+            list status {
+                description "Provides a key value list with status information";
+                key key;
+                leaf key {
+                    type string;
+                }
+                leaf value {
+                    type string;
+                }
+            }
+        }
+    }
+}
+
diff --git a/sdnr/wt/netconfnode-state-service/pom.xml b/sdnr/wt/netconfnode-state-service/pom.xml
new file mode 100755
index 000000000..65be6bf15
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.sdnr.wt.netconfnode-state-service
+ * ================================================================================
+ * Copyright (C) 2018 highstreet technologies GmbH 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-netconfnode-state-service-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>sdnr-wt-netconfnode-state-service</feature-name>
+    </properties>
+</project>
diff --git a/sdnr/wt/netconfnode-state-service/provider/copyright b/sdnr/wt/netconfnode-state-service/provider/copyright
new file mode 100644
index 000000000..754b6218f
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/copyright
@@ -0,0 +1,17 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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/sdnr/wt/netconfnode-state-service/provider/pom.xml b/sdnr/wt/netconfnode-state-service/provider/pom.xml
new file mode 100644
index 000000000..cead46878
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    ONAP : CCSDK / SDNR / WT / netconfnode-state-service
+    ================================================================================
+    Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-netconfnode-state-service-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <buildtime>${maven.build.timestamp} UTC</buildtime>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-actor_2.12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-cluster_2.12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java
new file mode 100644
index 000000000..0af35e569
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/NetconfNodeStateServiceImpl.java
@@ -0,0 +1,586 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeConnectListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.VesNotificationListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka.AkkaConfig;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo.GeoConfig;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc.NetconfnodeStateServiceRpcApiImpl;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc.RpcApigetStateCallback;
+import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.ClusteredConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NetconfNodeStateServiceImpl implements NetconfNodeStateService, RpcApigetStateCallback, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfNodeStateServiceImpl.class);
+    private static final String APPLICATION_NAME = "NetconfNodeStateService";
+    @SuppressWarnings("unused")
+    private static final String CONFIGURATIONFILE = "etc/netconfnode-status-service.properties";
+
+
+    private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
+            InstanceIdentifier.create(NetworkTopology.class).child(Topology.class,
+                    new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
+
+    private static final InstanceIdentifier<Node> NETCONF_NODE_TOPO_IID =
+            InstanceIdentifier.create(NetworkTopology.class)
+                    .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())))
+                    .child(Node.class);
+
+    private static final DataTreeIdentifier<Node> NETCONF_NODE_TOPO_TREE_ID =
+            DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, NETCONF_NODE_TOPO_IID);
+
+    // Name of ODL controller NETCONF instance
+    private static final NodeId CONTROLLER = new NodeId("controller-config");
+
+    // -- OSGi services, provided
+    private DataBroker dataBroker;
+    private MountPointService mountPointService;
+    private RpcProviderService rpcProviderRegistry;
+    @SuppressWarnings("unused")
+    private NotificationPublishService notificationPublishService;
+    @SuppressWarnings("unused")
+    private ClusterSingletonServiceProvider clusterSingletonServiceProvider;
+
+    // -- Parameter
+    private ListenerRegistration<L1> listenerL1;
+    private ListenerRegistration<L2> listenerL2;
+    @SuppressWarnings("unused")
+    private ClusterSingletonServiceRegistration cssRegistration;
+
+    private NetconfnodeStateServiceRpcApiImpl rpcApiService;
+
+    /** Indication if init() function called and fully executed **/
+    private Boolean initializationSuccessful;
+
+    /** List of all registered listeners **/
+    private final List<NetconfNodeConnectListener> netconfNodeConnectListenerList;
+
+    /** List of all registered listeners **/
+    private final List<NetconfNodeStateListener> netconfNodeStateListenerList;
+
+    /** List of all registered listeners **/
+    private final List<VesNotificationListener> vesNotificationListenerList;
+
+    /** Indicates if running in cluster configuration **/
+    private boolean isCluster;
+
+    /** Indicates the name of the cluster **/
+    private String clusterName;
+
+    /** Blueprint **/
+    public NetconfNodeStateServiceImpl() {
+        LOG.info("Creating provider for {}", APPLICATION_NAME);
+
+        this.dataBroker = null;
+        this.mountPointService = null;
+        this.rpcProviderRegistry = null;
+        this.notificationPublishService = null;
+        this.clusterSingletonServiceProvider = null;
+
+        this.listenerL1 = null;
+        this.listenerL2 = null;
+        this.initializationSuccessful= false;
+        this.netconfNodeConnectListenerList = new CopyOnWriteArrayList<>();
+        this.netconfNodeStateListenerList = new CopyOnWriteArrayList<>();
+        this.vesNotificationListenerList = new CopyOnWriteArrayList<>();
+    }
+
+    public void setDataBroker(DataBroker dataBroker) {
+        this.dataBroker = dataBroker;
+    }
+
+    public void setRpcProviderRegistry(RpcProviderService rpcProviderRegistry) {
+        this.rpcProviderRegistry = rpcProviderRegistry;
+    }
+
+    public void setNotificationPublishService(NotificationPublishService notificationPublishService) {
+        this.notificationPublishService = notificationPublishService;
+    }
+
+    public void setMountPointService(MountPointService mountPointService) {
+        this.mountPointService = mountPointService;
+    }
+    public void setClusterSingletonService(ClusterSingletonServiceProvider clusterSingletonService) {
+        this.clusterSingletonServiceProvider = clusterSingletonService;
+    }
+
+    /** Blueprint initialization **/
+    public void init() {
+
+        LOG.info("Session Initiated start {}", APPLICATION_NAME);
+
+        // Start RPC Service
+        this.rpcApiService = new NetconfnodeStateServiceRpcApiImpl(rpcProviderRegistry, vesNotificationListenerList);
+
+        // Get configuration
+        // ConfigurationFileRepresentation config = new ConfigurationFileRepresentation(CONFIGURATIONFILE);
+        // Akka setup
+        AkkaConfig akkaConfig = getAkkaConfig();
+        this.isCluster = akkaConfig == null ? false : akkaConfig.isCluster();
+        this.clusterName = akkaConfig == null ? "" : akkaConfig.getClusterConfig().getClusterSeedNodeName("abc");
+
+        // RPC Service for specific services
+        this.rpcApiService.setStatusCallback(this);
+
+        LOG.debug("start NetconfSubscriptionManager Service");
+        //this.netconfChangeListener = new NetconfChangeListener(this, dataBroker);
+        //this.netconfChangeListener.register();
+        //DataTreeIdentifier<Node> treeId = new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, NETCONF_NODE_TOPO_IID);
+
+        listenerL1 = dataBroker.registerDataTreeChangeListener(NETCONF_NODE_TOPO_TREE_ID, new L1());
+        listenerL2 = dataBroker.registerDataTreeChangeListener(NETCONF_NODE_TOPO_TREE_ID, new L2());
+
+        this.initializationSuccessful = true;
+
+        LOG.info("Session Initiated end. Initialization done {}", initializationSuccessful);
+
+    }
+    /** Blueprint destroy-method method */
+    public void destroy() {
+        close();
+    }
+
+    /**
+     * Getter
+     * @return NetconfnodeStateServiceRpcApiImpl
+     */
+    public NetconfnodeStateServiceRpcApiImpl getNetconfnodeStateServiceRpcApiImpl() {
+        return rpcApiService;
+    }
+
+    @Override
+    public GetStatusOutputBuilder getStatus(GetStatusInput input) {
+        return new GetStatusOutputBuilder();
+    }
+
+    @Override
+    public <L extends NetconfNodeConnectListener> @NonNull ListenerRegistration<L> registerNetconfNodeConnectListener(
+            final @NonNull L netconfNodeConnectListener) {
+        LOG.info("Register connect listener {}",netconfNodeConnectListener.getClass().getName());
+        netconfNodeConnectListenerList.add(netconfNodeConnectListener);
+
+        return new ListenerRegistration<L>() {
+            @Override
+            public @NonNull L getInstance() {
+                return netconfNodeConnectListener;
+            }
+
+            @Override
+            public void close() {
+                LOG.info("Remove connect listener {}",netconfNodeConnectListener);
+                netconfNodeConnectListenerList.remove(netconfNodeConnectListener);
+            }
+        };
+    }
+
+    @Override
+    public <L extends NetconfNodeStateListener> @NonNull ListenerRegistration<L> registerNetconfNodeStateListener(
+            @NonNull L netconfNodeStateListener) {
+        LOG.info("Register state listener {}",netconfNodeStateListener.getClass().getName());
+        netconfNodeStateListenerList.add(netconfNodeStateListener);
+
+        return new ListenerRegistration<L>() {
+            @Override
+            public @NonNull L getInstance() {
+                return netconfNodeStateListener;
+            }
+
+            @Override
+            public void close() {
+                LOG.info("Remove state listener {}",netconfNodeStateListener);
+                netconfNodeStateListenerList.remove(netconfNodeStateListener);
+            }
+        };
+    }
+
+    @Override
+    public <L extends VesNotificationListener> @NonNull ListenerRegistration<L> registerVesNotifications(
+            @NonNull L vesNotificationListener) {
+        LOG.info("Register Ves notification listener {}",vesNotificationListener.getClass().getName());
+        vesNotificationListenerList.add(vesNotificationListener);
+
+        return new ListenerRegistration<L>() {
+            @Override
+            public @NonNull L getInstance() {
+                return vesNotificationListener;
+            }
+
+            @Override
+            public void close() {
+                LOG.info("Remove Ves notification listener {}",vesNotificationListener);
+                vesNotificationListenerList.remove(vesNotificationListener);
+            }
+        };
+    }
+
+    @Override
+    public void close() {
+        LOG.info("Closing start ...");
+        try {
+            close(rpcApiService, listenerL1, listenerL2);
+        } catch (Exception e) {
+            LOG.debug("Closing", e);
+        }
+        LOG.info("Closing done");
+    }
+
+    /**
+     * Used to close all Services, that should support AutoCloseable Pattern
+     *
+     * @param toClose
+     * @throws Exception
+     */
+    private void close(AutoCloseable... toCloseList) throws Exception {
+        for (AutoCloseable element : toCloseList) {
+            if (element != null) {
+                element.close();
+            }
+        }
+    }
+
+    /**
+     * Indication if init() of this bundle successfully done.
+     * @return true if init() was successful. False if not done or not successful.
+     */
+    public boolean isInitializationSuccessful() {
+        return this.initializationSuccessful;
+    }
+
+    /*-------------------------------------------------------------------------------------------
+     * Functions for interface DeviceManagerService
+     */
+
+    /**
+     * For each mounted device a mountpoint is created and this listener is called.
+     * Mountpoint was created or existing. Managed device is now fully connected to node/mountpoint.
+     * @param nNodeId id of the mountpoint
+     * @param netconfNode mountpoint contents
+     */
+    private void enterConnectedState(NodeId nNodeId, NetconfNode netconfNode) {
+
+        String mountPointNodeName = nNodeId.getValue();
+        LOG.info("Starting Event listener on Netconf for mountpoint {}", mountPointNodeName);
+
+        boolean preConditionMissing = false;
+        if (mountPointService == null) {
+            preConditionMissing = true;
+            LOG.warn("No mountservice available.");
+        }
+        if (!initializationSuccessful) {
+            preConditionMissing = true;
+            LOG.warn("Devicemanager initialization still pending.");
+        }
+        if (preConditionMissing) {
+            return;
+        }
+
+        if (isNetconfNodeMaster(netconfNode)) {
+
+            InstanceIdentifier<Node> instanceIdentifier = NETCONF_TOPO_IID.child(Node.class,
+                    new NodeKey(new NodeId(mountPointNodeName)));
+
+            Optional<MountPoint> optionalMountPoint = null;
+            int timeout = 10000;
+            while (!(optionalMountPoint = mountPointService.getMountPoint(instanceIdentifier)).isPresent()
+                    && timeout > 0) {
+                LOG.info("Event listener waiting for mount point for Netconf device :: Name : {}", mountPointNodeName);
+                sleepMs(1000);
+                timeout -= 1000;
+            }
+
+            if (!optionalMountPoint.isPresent()) {
+                LOG.warn("Event listener timeout while waiting for mount point for Netconf device :: Name : {} ",
+                        mountPointNodeName);
+            } else {
+                // Mountpoint is present for sure
+                MountPoint mountPoint = optionalMountPoint.get();
+                // BindingDOMDataBrokerAdapter.BUILDER_FACTORY;
+                LOG.info("Mountpoint with id: {}", mountPoint.getIdentifier());
+
+                Optional<DataBroker> optionalNetconfNodeDatabroker = mountPoint.getService(DataBroker.class);
+
+                if (!optionalNetconfNodeDatabroker.isPresent()) {
+                    LOG.info("Slave mountpoint {} without databroker", mountPointNodeName);
+                } else {
+                    LOG.info("Master mountpoint {}", mountPointNodeName);
+                    DataBroker netconfNodeDataBroker = optionalNetconfNodeDatabroker.get();
+
+                    /*
+                     * --> Call Listers for onConnect() Indication
+                       for (all)
+                     */
+                    netconfNodeConnectListenerList.forEach(item -> {
+                        try {
+                            item.onEnterConnected(nNodeId, netconfNode, netconfNodeDataBroker);
+                        } catch (Exception e) {
+                            LOG.info("Exception during onEnterConnected listener call", e);
+                        }
+                    });
+
+                    LOG.info("Connect indication forwarded for {}", mountPointNodeName);
+                }
+            }
+        }
+    }
+
+    /**
+     * Leave the connected status to a non connected or removed status
+     * @param action that occurred
+     * @param nNodeId id of the mountpoint
+     * @param nNode mountpoint contents
+     */
+    private void leaveConnectedState(NodeId nNodeId) {
+        LOG.info("netconfNode id {}", nNodeId);
+        netconfNodeConnectListenerList.forEach(item -> {
+            try {
+                if (item != null) {
+                    item.onLeaveConnected(nNodeId);
+                } else {
+                    LOG.warn("Unexpeced null item during onleave");
+                }
+            } catch (Exception e) {
+                LOG.info("Exception during onLeaveConnected listener call", e);
+            }
+        });
+    }
+
+    // ---- subclasses for listeners
+
+    /**
+     * Clustered listener function to select the right node from
+     * DataObjectModification
+     */
+    private class L1 implements ClusteredDataTreeChangeListener<Node> {
+        @Override
+        public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) {
+            LOG.info("L1 TreeChange, changes:{}", changes.size());
+
+            for (final DataTreeModification<Node> change : changes) {
+
+                final DataObjectModification<Node> root = change.getRootNode();
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Handle this modificationType:{} path:{} root:{}", root.getModificationType(),
+                            change.getRootPath(), root);
+                }
+
+                // Catch potential nullpointer exceptions ..
+                try {
+                    ModificationType modificationTyp = root.getModificationType();
+                    Node node = modificationTyp == ModificationType.DELETE ? root.getDataBefore()
+                            : root.getDataAfter();
+                    NodeId nodeId = node != null ? node.getNodeId() : null;
+                    if (nodeId != null) {
+                        if (nodeId.equals(CONTROLLER)) {
+                            // Do not forward any controller related events to devicemanager
+                            LOG.debug("Stop processing for [{}]", nodeId);
+                        } else {
+                            if (modificationTyp != null) {
+                                switch (modificationTyp) {
+                                case SUBTREE_MODIFIED: // Create or modify sub level node
+                                case WRITE: // Create or modify top level node
+                                    // Treat an overwrite as an update
+                                    // leaveconnected state.before = connected; state.after != connected
+                                    // enterConnected state.after == connected
+                                    // => Here create or update by checking root.getDataBefore() != null
+
+                                    boolean connectedBefore, connectedAfter;
+                                    NetconfNode nNodeAfter = getNetconfNode(root.getDataAfter());
+                                    connectedAfter = isConnected(nNodeAfter);
+                                    if (root.getDataBefore() != null) {
+                                        // It is an update
+                                        NetconfNode nodeBefore = getNetconfNode(root.getDataBefore());
+                                        connectedBefore = isConnected(nodeBefore);
+                                    } else {
+                                        // It is a create
+                                        connectedBefore = false;
+                                    }
+
+                                    LOG.info(
+                                            "L1 NETCONF Node change with id {} ConnectedBefore {} connectedAfter {} cluster status {} akkaIsCluster",
+                                            nodeId, connectedBefore, connectedAfter,
+                                            getClusteredConnectionStatus(nNodeAfter), isCluster);
+
+                                    if (!connectedBefore && connectedAfter) {
+                                        netconfNodeStateListenerList.forEach(item -> {
+                                            try {
+                                                item.onCreated(nodeId, nNodeAfter);
+                                            } catch (Exception e) {
+                                                LOG.info("Exception during onCreated listener call", e);
+                                            }
+                                        });
+                                        enterConnectedState(nodeId, nNodeAfter);
+                                    } else {
+                                        LOG.debug("State change {} {}", connectedBefore, connectedAfter);
+                                        if (connectedBefore && !connectedAfter) {
+                                            leaveConnectedState(nodeId);
+                                        }
+                                        netconfNodeStateListenerList.forEach(item -> {
+                                            try {
+                                                item.onStateChange(nodeId, nNodeAfter);
+                                            } catch (Exception e) {
+                                                LOG.info("Exception during onStateChange listener call", e);
+                                            }
+                                        });
+                                    }
+                                    // doProcessing(update ? Action.UPDATE : Action.CREATE, nodeId, root);
+                                    break;
+                                case DELETE:
+                                    // Node removed
+                                    // leaveconnected state.before = connected;
+                                    leaveConnectedState(nodeId);
+                                    netconfNodeStateListenerList.forEach(item -> {
+                                        try {
+                                            item.onRemoved(nodeId);
+                                        } catch (Exception e) {
+                                            LOG.info("Exception during onRemoved listener call", e);
+                                        }
+                                   });
+                                    // doProcessing(Action.REMOVE, nodeId, root);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } catch (NullPointerException e) {
+                    LOG.info("Data not available at ", e);
+                }
+            }
+        }
+    }
+
+    private static @Nullable NetconfNode getNetconfNode(Node node) {
+          return node != null ? node.augmentation(NetconfNode.class) : null;
+    }
+
+    private static boolean isConnected(NetconfNode nNode) {
+        return nNode != null ? ConnectionStatus.Connected.equals(nNode.getConnectionStatus()) : false;
+    }
+
+    private static @Nullable ClusteredConnectionStatus getClusteredConnectionStatus(NetconfNode node) {
+        return node != null ? node.getClusteredConnectionStatus() : null;
+    }
+    /**
+     * Normal listener function to select the right node from DataObjectModification
+     */
+    private class L2 implements DataTreeChangeListener<Node> {
+
+        @Override
+        public void onDataTreeChanged(@NonNull Collection<DataTreeModification<Node>> changes) {
+            LOG.info("L2 TreeChange, changes:{}", changes.size());
+        }
+    }
+
+    /* -- LOG related functions -- */
+
+    /** Analyze configuration **/
+    private static @Nullable AkkaConfig getAkkaConfig() {
+        AkkaConfig akkaConfig;
+        try {
+            akkaConfig = AkkaConfig.load();
+            LOG.debug("akka.conf loaded: " + akkaConfig.toString());
+        } catch (Exception e1) {
+            akkaConfig = null;
+            LOG.warn("problem loading akka.conf: " + e1.getMessage());
+        }
+        if (akkaConfig != null && akkaConfig.isCluster()) {
+            LOG.info("cluster mode detected");
+            if (GeoConfig.fileExists()) {
+                try {
+                    LOG.debug("try to load geoconfig");
+                    GeoConfig.load();
+                } catch (Exception err) {
+                    LOG.warn("problem loading geoconfig: " + err.getMessage());
+                }
+            } else {
+                LOG.debug("no geoconfig file found");
+            }
+        } else {
+            LOG.info("single node mode detected");
+        }
+        return akkaConfig;
+    }
+
+    private boolean isNetconfNodeMaster(NetconfNode nNode) {
+        if (this.isCluster) {
+            LOG.debug("check if me is responsible for node");
+            ClusteredConnectionStatus ccs = nNode.getClusteredConnectionStatus();
+            @SuppressWarnings("null")
+            @NonNull String masterNodeName = ccs == null || ccs.getNetconfMasterNode() == null ? "null" : ccs.getNetconfMasterNode();
+            LOG.debug("sdnMasterNode=" + masterNodeName + " and sdnMyNode=" + this.clusterName);
+            if (!masterNodeName.equals(this.clusterName)) {
+                LOG.debug("netconf change but me is not master for this node");
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    private void sleepMs(int milliseconds) {
+        try {
+            Thread.sleep(milliseconds);
+        } catch (InterruptedException e) {
+            LOG.debug("Interrupted sleep");
+            // Restore interrupted state...
+            Thread.currentThread().interrupt();
+        }
+    }
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/AkkaConfig.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/AkkaConfig.java
new file mode 100644
index 000000000..d0ea0eb69
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/AkkaConfig.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+public class AkkaConfig {
+
+    @SuppressWarnings("unused")
+    private static final Logger LOG = LoggerFactory.getLogger(AkkaConfig.class);
+
+    private static final String DEFAULT_FILENAME = "configuration/initial/akka.conf";
+    private final String filename;
+    private ClusterConfig cluserConfig;
+
+    public ClusterConfig getClusterConfig() {
+        return this.cluserConfig;
+    }
+
+    private AkkaConfig(String filename) {
+        this.filename = filename;
+    }
+
+    public AkkaConfig() {
+        this(null);
+    }
+
+    @Override
+    public String toString() {
+        return "AkkaConfig [filename=" + filename + ", cluserConfig=" + cluserConfig + "]";
+    }
+
+    private void loadFromFile() throws Exception {
+        Config cfg = ConfigFactory.parseFile(new File(this.filename));
+        this.cluserConfig = new ClusterConfig(cfg.getConfig("odl-cluster-data").getConfig("akka").getConfig("cluster"));
+    }
+
+    public boolean isCluster() {
+        return this.cluserConfig != null ? this.cluserConfig.isCluster() : false;
+    }
+
+    public boolean isClusterAndFirstNode() {
+        return isSingleNode() || isCluster() && getClusterConfig().getRoleMemberIndex() == 1;
+    }
+
+    public static AkkaConfig load() throws Exception {
+        return load(DEFAULT_FILENAME);
+    }
+
+    public static AkkaConfig load(String filename) throws Exception {
+        AkkaConfig cfg = new AkkaConfig(filename);
+        cfg.loadFromFile();
+        return cfg;
+    }
+
+    public boolean isSingleNode() {
+        return !this.isCluster();
+    }
+     public static AkkaConfig parse(String content) throws Exception {
+        Config cfg = ConfigFactory.parseString(content);
+        AkkaConfig c = new AkkaConfig();
+        c.cluserConfig=new ClusterConfig(cfg.getConfig("odl-cluster-data").getConfig("akka").getConfig("cluster"));
+        return c;
+    }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterConfig.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterConfig.java
new file mode 100644
index 000000000..bdde30828
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterConfig.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo.ClusterRoleInfo;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo.ClusterRoleInfoCollection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.typesafe.config.Config;
+
+public class ClusterConfig {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ClusterConfig.class);
+
+    private final List<ClusterNodeInfo> seedNodes;
+    private final ClusterRoleInfoCollection roles;
+    private ClusterNodeInfo ismeInfo;
+
+    public static ClusterConfig defaultSingleNodeConfig()
+    {
+        ClusterConfig cfg=new ClusterConfig();
+        cfg.ismeInfo=ClusterNodeInfo.defaultSingleNodeInfo();
+        cfg.seedNodes.add(cfg.ismeInfo);
+        cfg.roles.add(ClusterRoleInfo.defaultSingleNodeRole());
+        return cfg;
+    }
+    public ClusterConfig()
+    {
+        this.seedNodes = new ArrayList<>();
+        this.roles = new ClusterRoleInfoCollection();
+
+    }
+    public ClusterConfig(Config o) throws Exception {
+        {
+            this.seedNodes = new ArrayList<>();
+            this.roles = new ClusterRoleInfoCollection();
+            List<String> a = o.getStringList("seed-nodes");
+            for (int i = 0; i < a.size(); i++) {
+                ClusterNodeInfo info = new ClusterNodeInfo(a.get(i));
+                this.seedNodes.add(info);
+            }
+            a = o.getStringList("roles");
+            for (int i = 0; i < a.size(); i++) {
+                ClusterRoleInfo s = new ClusterRoleInfo(a.get(i));
+                this.roles.add(s);
+            }
+            int idx = this.roles.get(0).getIndex() - 1;
+            if (idx >= 0 && idx < this.seedNodes.size()) {
+                this.ismeInfo = this.seedNodes.get(idx);
+            } else {
+                this.ismeInfo = null;
+            }
+        }
+
+    }
+
+    public boolean isCluster() {
+        return this.seedNodes != null ? this.seedNodes.size() > 1 : false;
+    }
+
+    public boolean isMe(ClusterNodeInfo i) {
+        return this.ismeInfo != null ? this.ismeInfo.equals(i) : false;
+    }
+
+    public List<ClusterNodeInfo> getSeedNodes() {
+        return this.seedNodes;
+    }
+
+    public String getHostName(String defaultValue) {
+        if (getRoleMemberIndex() > 0 && getRoleMemberIndex() <= seedNodes.size()) {
+            return this.seedNodes.get(getRoleMemberIndex()-1).getRemoteAddress();
+        } else {
+            LOG.warn("Seednode not available for roleMemberIndex {}. Using default {}",getRoleMember(), defaultValue);
+            return defaultValue;
+        }
+    }
+
+    public String getDBClusterName(String defaultValue) {
+        String r = null;
+        if (this.seedNodes != null && this.seedNodes.size() > 0) {
+            r = String.format("cluster-%s.%d", this.seedNodes.get(0).getRemoteAddress(), this.seedNodes.get(0).getPort());
+        }
+        if (r == null || r.isEmpty()) {
+            r = defaultValue;
+        }
+        return r;
+    }
+    public String getClusterSeedNodeName() {
+        return this.getClusterSeedNodeName("");
+    }
+    public String getClusterSeedNodeName(String defaultValue) {
+        int idx=this.getRoleMemberIndex()-1;
+        String r=null;
+        if(this.seedNodes!=null && idx>=0 && this.seedNodes.size()>0 && this.seedNodes.size()>idx)
+        {
+            r=this.seedNodes.get(idx).getSeedNodeName();
+        }
+        if (r == null || r.isEmpty()) {
+            r = defaultValue;
+        }
+        return r;
+    }
+    public int getRoleMemberIndex() {
+
+        ClusterRoleInfo role=this.roles.get("member");
+        return role!=null?role.getIndex():0;
+    }
+    public ClusterRoleInfo getRoleMember() {
+        return this.roles.get("member");
+    }
+
+    @Override
+    public String toString() {
+        return "ClusterConfig [seedNodes=" + seedNodes + ", roles=" + roles + ", ismeInfo=" + ismeInfo + "]";
+    }
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterNodeInfo.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterNodeInfo.java
new file mode 100644
index 000000000..ef161ad12
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlAkka/ClusterNodeInfo.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public  class ClusterNodeInfo {
+    private final String protocol;
+    private final String clusterName;
+    private final String remoteAdr;
+    private final int port;
+    private final String seedNodeName;
+
+    public static ClusterNodeInfo defaultSingleNodeInfo() {
+        return new ClusterNodeInfo("akka.tcp","opendaylight-cluster-data","127.0.0.1",2550);
+    }
+
+    public ClusterNodeInfo(String s) throws Exception {
+        final String regex = "([a-z.]*):\\/\\/([a-zA-Z0-9-]*)@([a-zA-Z0-9.-]*):([0-9]*)";
+        final Pattern pattern = Pattern.compile(regex);
+        final Matcher matcher = pattern.matcher(s);
+        if (!matcher.find()) {
+            throw new Exception("invalid seedNode format");
+        }
+        this.seedNodeName = matcher.group();
+        this.protocol = matcher.group(1);
+        this.clusterName = matcher.group(2);
+        this.remoteAdr = matcher.group(3);
+        this.port = Integer.parseInt(matcher.group(4));
+    }
+
+    public ClusterNodeInfo(String protocol, String clustername, String remoteadr, int port) {
+        this.protocol=protocol;
+        this.clusterName=clustername;
+        this.remoteAdr=remoteadr;
+        this.port=port;
+        this.seedNodeName=this.protocol+"://"+this.clusterName+"@"+this.remoteAdr+":"+this.port;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    public String getRemoteAddress() {
+        return remoteAdr;
+    }
+    public String getSeedNodeName() {
+        return seedNodeName;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    @Override
+    public String toString() {
+        return "ClusterNodeInfo [protocol=" + protocol + ", clusterName=" + clusterName + ", remoteAdr=" + remoteAdr
+                + ", port=" + port + ", seedNodeName=" + seedNodeName + "]";
+    }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfo.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfo.java
new file mode 100644
index 000000000..994ef548b
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfo.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ClusterRoleInfo {
+    private final String Role;
+    private final int Index;
+
+    public ClusterRoleInfo(String s) throws Exception {
+        final String regex = "([a-zA-Z]*)-([0-9]*)";
+        final Pattern pattern = Pattern.compile(regex);
+        final Matcher matcher = pattern.matcher(s);
+        if (!matcher.find()) {
+            throw new Exception("unexpected role format:"+s);
+        }
+        this.Role = matcher.group(1);
+        this.Index = Integer.parseInt(matcher.group(2));
+    }
+
+    private ClusterRoleInfo(String role, int idx) {
+        this.Role=role;
+        this.Index=idx;
+    }
+
+    public static ClusterRoleInfo defaultSingleNodeRole() {
+        return new ClusterRoleInfo("member",1);
+    }
+
+    public String getRole() {
+        return Role;
+    }
+    public int getIndex() {
+        return Index;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Index;
+        result = prime * result + (Role == null ? 0 : Role.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        ClusterRoleInfo other = (ClusterRoleInfo) obj;
+        if (Index != other.Index) {
+            return false;
+        }
+        if (Role == null) {
+            if (other.Role != null) {
+                return false;
+            }
+        } else if (!Role.equals(other.Role)) {
+            return false;
+        }
+        return true;
+    }
+    @Override
+    public String toString() {
+        return "ClusterRoleInfo [Role=" + Role + ", Index=" + Index + "]";
+    }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfoCollection.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfoCollection.java
new file mode 100644
index 000000000..478ed8394
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/ClusterRoleInfoCollection.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo;
+
+import java.util.ArrayList;
+
+public class ClusterRoleInfoCollection extends ArrayList<ClusterRoleInfo> {
+    private static final long serialVersionUID = 1L;
+
+    public ClusterRoleInfo get(String role) {
+        for (ClusterRoleInfo info : this) {
+            if (info.getRole().equals(role)) {
+                return info;
+            }
+        }
+        return null;
+    }
+
+    public boolean contains(ClusterRoleInfo info) {
+        if (info == null) {
+            return false;
+        }
+        for (ClusterRoleInfo i : this) {
+            if (i.equals(info)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/GeoConfig.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/GeoConfig.java
new file mode 100644
index 000000000..c25f3264b
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/conf/odlGeo/GeoConfig.java
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+public class GeoConfig {
+
+    private static final String DEFAULT_FILENAME = "configuration/initial/geo.conf";
+    private static final String LUMINA_ROOTNODENAME = "lumina-geo-cluster";
+    private final String filename;
+    private final String rootNodename;
+    private ClusterRoleInfoCollection primaryRoles;
+    private ClusterRoleInfoCollection secondayRoles;
+    private RolesTable rolesTable;
+
+    private GeoConfig() {
+        this(null);
+    }
+
+    private GeoConfig(String filename) {
+        this(filename, LUMINA_ROOTNODENAME);
+    }
+
+    private GeoConfig(String filename, String rootNodeName) {
+        this.filename = filename;
+        this.rootNodename = rootNodeName;
+    }
+
+    public static boolean fileExists() {
+        File f = new File(DEFAULT_FILENAME);
+        return f.exists();
+    }
+
+    public static GeoConfig load() throws Exception {
+        return load(DEFAULT_FILENAME);
+    }
+
+    public static GeoConfig load(String filename) throws Exception {
+        GeoConfig cfg = new GeoConfig(filename);
+        cfg._load();
+        return cfg;
+    }
+
+    private void _load() throws Exception {
+        this._load(ConfigFactory.parseFile(new File(this.filename)));
+    }
+
+    private void _load(Config cfg) throws Exception {
+        this.primaryRoles = new ClusterRoleInfoCollection();
+        List<String> a = cfg.getConfig(this.rootNodename).getStringList("primary_roles");
+
+        for (int i = 0; i < a.size(); i++) {
+            ClusterRoleInfo s = new ClusterRoleInfo(a.get(i));
+            this.primaryRoles.add(s);
+        }
+        this.secondayRoles = new ClusterRoleInfoCollection();
+        a = cfg.getConfig(this.rootNodename).getStringList("secondary_roles");
+        for (int i = 0; i < a.size(); i++) {
+            ClusterRoleInfo s = new ClusterRoleInfo(a.get(i));
+            this.secondayRoles.add(s);
+        }
+        this.checkDuplicateRoleEntries();
+        this.rolesTable = new RolesTable(cfg.getConfig(this.rootNodename).getConfigList("ip_roles_table"));
+    }
+
+    private void checkDuplicateRoleEntries() throws Exception {
+        ClusterRoleInfoCollection duplicateEntries = new ClusterRoleInfoCollection();
+        for (ClusterRoleInfo primaryRole : this.primaryRoles) {
+            if (this.secondayRoles.contains(primaryRole)) {
+                duplicateEntries.add(primaryRole);
+            }
+        }
+        if (duplicateEntries.size() > 0) {
+            throw new Exception("duplicate entries found: " + duplicateEntries.toString());
+        }
+
+    }
+
+    public static GeoConfig parse(String content) throws Exception {
+        GeoConfig cfg = new GeoConfig();
+        cfg._load(ConfigFactory.parseString(content));
+        return cfg;
+    }
+
+    public ClusterRoleInfoCollection getPrimaryRoles() {
+        return this.primaryRoles;
+    }
+
+    public ClusterRoleInfoCollection getSecondaryRoles() {
+        return this.secondayRoles;
+    }
+
+    public boolean isPrimary(ClusterRoleInfo roleMember) {
+        return !this.isSecondary(roleMember);
+    }
+
+    private boolean isSecondary(ClusterRoleInfo roleMember) {
+        if (roleMember == null) {
+            return false;
+        }
+        for (ClusterRoleInfo info : this.secondayRoles) {
+            if (info.equals(roleMember)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "GeoConfig [filename=" + filename + ", rootNodename=" + rootNodename + ", primaryRoles=" + primaryRoles
+                + ", secondayRoles=" + secondayRoles + ", rolesTable=" + rolesTable + "]";
+    }
+
+    public static class RolesTableEntry {
+        private final ClusterRoleInfo role;
+        private final String ip;
+
+        public RolesTableEntry(Config c) throws Exception {
+            this.role = new ClusterRoleInfo(c.getString("role"));
+            this.ip = c.getString("ip");
+        }
+
+        @Override
+        public String toString() {
+            return "RolesTableEntry [role=" + role + ", ip=" + ip + "]";
+        }
+    }
+    public static class RolesTable extends ArrayList<RolesTableEntry> {
+        private static final long serialVersionUID = -9146218864237487506L;
+
+        public RolesTable(List<? extends Config> configList) throws Exception {
+            for (Config c : configList) {
+                this.add(new RolesTableEntry(c));
+            }
+        }
+
+    }
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/NetconfnodeStateServiceRpcApiImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/NetconfnodeStateServiceRpcApiImpl.java
new file mode 100644
index 000000000..9215887ff
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/NetconfnodeStateServiceRpcApiImpl.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc;
+
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.VesNotificationListener;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.AttributeChangeNotificationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.FaultNotificationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.NetconfnodeStateService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushAttributeChangeNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushAttributeChangeNotificationOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushFaultNotificationInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushFaultNotificationOutput;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
+
+public class NetconfnodeStateServiceRpcApiImpl implements NetconfnodeStateService, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfnodeStateServiceRpcApiImpl.class);
+
+    private final ObjectRegistration<NetconfnodeStateServiceRpcApiImpl> rpcReg;
+    private RpcApigetStateCallback getStatusCallback;
+    private final List<VesNotificationListener> vesNotificationListenerList;
+
+    public NetconfnodeStateServiceRpcApiImpl(final RpcProviderService rpcProviderRegistry,
+            List<VesNotificationListener> vesNotificationListenerList) {
+
+        this.vesNotificationListenerList = vesNotificationListenerList;
+
+        // Register ourselves as the REST API RPC implementation
+        LOG.info("Register RPC Service " + NetconfnodeStateService.class.getSimpleName());
+        rpcReg = rpcProviderRegistry.registerRpcImplementation(NetconfnodeStateService.class, this);
+        this.getStatusCallback = null;
+    }
+
+    public NetconfnodeStateServiceRpcApiImpl setStatusCallback(RpcApigetStateCallback getStatusCallback) {
+        this.getStatusCallback = getStatusCallback;
+        return this;
+    }
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("Close RPC Service");
+        if (rpcReg != null) {
+            rpcReg.close();
+        }
+    }
+
+    /*-------------------------------
+     * Interfaces for getting information
+     */
+    @Override
+    public ListenableFuture<RpcResult<GetStatusOutput>> getStatus(GetStatusInput input) {
+
+        LOG.info("RPC Request: getStatus input: {}", input);
+        RpcResultBuilder<GetStatusOutput> result;
+
+        try {
+            GetStatusOutputBuilder outputBuilder = new GetStatusOutputBuilder();
+            getStatusCallback.getStatus(input);
+            result = RpcResultBuilder.success(outputBuilder);
+        } catch (Exception e) {
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, "Exception", e);
+        }
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PushFaultNotificationOutput>> pushFaultNotification(
+            PushFaultNotificationInput input) {
+
+        RpcResultBuilder<PushFaultNotificationOutput> result;
+        try {
+            FaultNotificationBuilder faultNotificationBuilder = new FaultNotificationBuilder();
+            faultNotificationBuilder.fieldsFrom(input);
+            vesNotificationListenerList.forEach(item -> item.onNotification(faultNotificationBuilder.build()));
+            result = RpcResultBuilder.success();
+        } catch (Exception e) {
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, "Exception", e);
+        }
+        return result.buildFuture();
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PushAttributeChangeNotificationOutput>> pushAttributeChangeNotification(
+            PushAttributeChangeNotificationInput input) {
+        RpcResultBuilder<PushAttributeChangeNotificationOutput> result;
+        try {
+            AttributeChangeNotificationBuilder attributeChangeNotificationBuilder = new AttributeChangeNotificationBuilder();
+            attributeChangeNotificationBuilder.fieldsFrom(input);
+            vesNotificationListenerList.forEach(item -> item.onNotification(attributeChangeNotificationBuilder.build()));
+            result = RpcResultBuilder.success();
+        } catch (Exception e) {
+            result = RpcResultBuilder.failed();
+            result.withError(ErrorType.APPLICATION, "Exception", e);
+        }
+        return result.buildFuture();
+    }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/RpcApigetStateCallback.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/RpcApigetStateCallback.java
new file mode 100644
index 000000000..1434cf41a
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/rpc/RpcApigetStateCallback.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutputBuilder;
+
+public interface RpcApigetStateCallback {
+
+	GetStatusOutputBuilder getStatus(GetStatusInput input);
+}
diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index b946e1035..46930ac9e 100644
--- a/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ============LICENSE_START=======================================================
-ONAP : ccsdk feature sdnr wt devicemanager
+ONAP : ccsdk feature sdnr wt netconfnode-service-provider
  ================================================================================
 Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
 All rights reserved.
@@ -23,24 +23,25 @@ limitations under the License.
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
 
-  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
     odl:type="default" />
 
   <reference id="notificationPublishService"
-             interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
              odl:type="default" />
 
   <reference id="mountPointService"
-             interface="org.opendaylight.controller.md.sal.binding.api.MountPointService"
+             interface="org.opendaylight.mdsal.binding.api.MountPointService"
              odl:type="default" />
 
-  <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
-    odl:type="default" />
-    
+  <reference id="rpcProviderRegistry"
+  			 interface="org.opendaylight.mdsal.binding.api.RpcProviderService"
+			 odl:type="default" />
+
   <reference id="clusterSingletonService"
-    interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+    		 interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
- <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl" init-method="init" destroy-method="close">
+ <bean id="netconfNodeStateService" class="org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.NetconfNodeStateServiceImpl" init-method="init" destroy-method="destroy" scope="singleton">
     <property name="dataBroker" ref="dataBroker"/>
     <property name="rpcProviderRegistry" ref="rpcProviderRegistry" />
     <property name="notificationPublishService" ref="notificationPublishService" />
@@ -48,5 +49,8 @@ limitations under the License.
     <property name="clusterSingletonService" ref="clusterSingletonService" />
   </bean>
 
+  <service id="registerNetconfNodeStateService"
+  		   interface="org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService"
+  		   ref="netconfNodeStateService" />
 
 </blueprint>
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties
new file mode 100644
index 000000000..80373399e
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/resources/version.properties
@@ -0,0 +1,3 @@
+# Proberties filled in by maven during build process
+version = ${project.version}
+build = ${buildtime}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestAkkaConfig.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestAkkaConfig.java
new file mode 100644
index 000000000..dd317c781
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestAkkaConfig.java
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka.AkkaConfig;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka.ClusterConfig;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlAkka.ClusterNodeInfo;
+
+public class TestAkkaConfig {
+
+    private static String getAkkaConfigSingleNodeText() {
+        return "\n" + "odl-cluster-data {\n" + "  akka {\n" + "    remote {\n" + "      artery {\n"
+                + "        enabled = off\n" + "        canonical.hostname = \"127.0.0.1\"\n"
+                + "        canonical.port = 2550\n" + "      }\n" + "      netty.tcp {\n"
+                + "        hostname = \"127.0.0.1\"\n" + "        port = 2550\n" + "      }\n"
+                + "      # when under load we might trip a false positive on the failure detector\n"
+                + "      # transport-failure-detector {\n" + "        # heartbeat-interval = 4 s\n"
+                + "        # acceptable-heartbeat-pause = 16s\n" + "      # }\n" + "    }\n" + "\n" + "    cluster {\n"
+                + "      # Remove \".tcp\" when using artery.\n"
+                + "      seed-nodes = [\"akka.tcp://opendaylight-cluster-data@127.0.0.1:2550\"]\n" + "\n"
+                + "      roles = [\n" + "        \"member-1\"\n" + "      ]\n" + "\n" + "    }\n" + "\n"
+                + "    persistence {\n"
+                + "      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by\n"
+                + "      # modifying the following two properties. The directory location specified may be a relative or absolute path. \n"
+                + "      # The relative path is always relative to KARAF_HOME.\n" + "\n"
+                + "      # snapshot-store.local.dir = \"target/snapshots\"\n"
+                + "      # journal.leveldb.dir = \"target/journal\"\n" + "\n" + "      journal {\n"
+                + "        leveldb {\n" + "          # Set native = off to use a Java-only implementation of leveldb.\n"
+                + "          # Note that the Java-only version is not currently considered by Akka to be production quality.\n"
+                + "\n" + "          # native = off\n" + "        }\n" + "      }\n" + "    }\n" + "  }\n" + "}";
+    }
+
+    private static String getAkkaConfigClusterNodeText() {
+        return "\n" + "odl-cluster-data {\n" + "\n" + "  akka {\n" + "    loglevel = \"\"\n" + "    remote {\n"
+                + "      netty.tcp {\n" + "        hostname = \"zltcmtn23arbc01.2f0377.mtn23a.tci.att.com\"\n"
+                + "        port = 2550\n" + "      }\n" + "    }\n" + "    actor {\n" + "    debug{\n"
+                + "        autoreceive = on\n" + "        lifecycle = on\n" + "        unhandled = on\n"
+                + "        fsm = on\n" + "        event-stream = on\n" + "     }\n" + "    }\n" + "    cluster {\n"
+                + "      seed-nodes = [\"akka.tcp://opendaylight-cluster-data@zltcmtn23arbc01.2f0377.mtn23a.tci.att.com:2550\", \"akka.tcp://opendaylight-cluster-data@zltcmtn23arbc02.2f0377.mtn23a.tci.att.com:2550\", \"akka.tcp://opendaylight-cluster-data@zltcmtn23arbc03.2f0377.mtn23a.tci.att.com:2550\", \"akka.tcp://opendaylight-cluster-data@zltcmtn23brbc01.f84e7a.mtn23b.tci.att.com:2550\", \"akka.tcp://opendaylight-cluster-data@zltcmtn23brbc02.f84e7a.mtn23b.tci.att.com:2550\", \"akka.tcp://opendaylight-cluster-data@zltcmtn23brbc03.f84e7a.mtn23b.tci.att.com:2550\"]\n"
+                + "      seed-node-timeout = 15s\n" + "      roles = [\"member-1\"]\n" + "\n" + "    }\n"
+                + "    persistence {\n" + "    journal-plugin-fallback {\n" + "         circuit-breaker {\n"
+                + "            max-failures = 10\n" + "            call-timeout = 60s\n"
+                + "            reset-timeout = 30s\n" + "         }\n" + "     }\n" + "    }\n" + "  }\n" + "}\n" + "\n"
+                + "odl-cluster-rpc {\n" + "\n" + "  akka {\n" + "    loglevel = \"\"\n" + "    remote {\n"
+                + "      netty.tcp {\n" + "        hostname = \"zltcmtn23arbc01.2f0377.mtn23a.tci.att.com\"\n"
+                + "        port = 2551\n" + "      }\n" + "    }\n" + "    actor {\n" + "    debug{\n"
+                + "        autoreceive = on\n" + "        lifecycle = on\n" + "        unhandled = on\n"
+                + "        fsm = on\n" + "        event-stream = on\n" + "     }\n" + "    }\n" + "    cluster {\n"
+                + " seed-nodes = [\"akka.tcp://odl-cluster-rpc@zltcmtn23arbc01.2f0377.mtn23a.tci.att.com:2551\", \"akka.tcp://odl-cluster-rpc@zltcmtn23arbc02.2f0377.mtn23a.tci.att.com:2551\", \"akka.tcp://odl-cluster-rpc@zltcmtn23arbc03.2f0377.mtn23a.tci.att.com:2551\", \"akka.tcp://odl-cluster-rpc@zltcmtn23brbc01.f84e7a.mtn23b.tci.att.com:2551\", \"akka.tcp://odl-cluster-rpc@zltcmtn23brbc02.f84e7a.mtn23b.tci.att.com:2551\", \"akka.tcp://odl-cluster-rpc@zltcmtn23brbc03.f84e7a.mtn23b.tci.att.com:2551\"]\n"
+                + "        seed-node-timeout = 15s\n" + "    }\n" + "    persistence {\n"
+                + "    journal-plugin-fallback {\n" + "         circuit-breaker {\n" + "            max-failures = 10\n"
+                + "            call-timeout = 60s\n" + "            reset-timeout = 30s\n" + "         }\n" + "     }\n"
+                + "     }\n" + "  }\n" + "}\n" + "\n" + "";
+    }
+
+    @Test
+    public void test1() {
+        AkkaConfig cfg;
+        try {
+            System.out.println("testing clusternode config1");
+            System.out.println("===========================");
+            cfg = AkkaConfig.parse(getAkkaConfigClusterNodeText());
+            System.out.println("succeeded: ");
+            System.out.println(cfg.toString());
+            System.out.println(String.format("found %d cluster nodes", cfg.getClusterConfig().getSeedNodes().size()));
+            for (ClusterNodeInfo n : cfg.getClusterConfig().getSeedNodes()) {
+                System.out.println(n.toString());
+            }
+        } catch (Exception e) {
+            String failMessage = "failed: " + e.getMessage();
+            System.out.println(failMessage);
+            fail(failMessage);
+        }
+    }
+
+    @Test
+    public void test2() {
+        AkkaConfig cfg;
+        try {
+            System.out.println("testing singlenode config1");
+            System.out.println("===========================");
+            cfg = AkkaConfig.parse(getAkkaConfigSingleNodeText());
+            System.out.println("succeeded: ");
+            System.out.println(cfg.toString());
+        } catch (Exception e) {
+            String failMessage = "failed: " + e.getMessage();
+            System.out.println(failMessage);
+            fail(failMessage);
+       }
+    }
+
+    @Test
+    public void test3() {
+        AkkaConfig cfg;
+
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource("captured-akka.conf").getFile());
+        System.out.println(file.getAbsolutePath());
+
+        try {
+            System.out.println("testing clusternode config1");
+            System.out.println("===========================");
+            cfg = AkkaConfig.load(file.getAbsolutePath());
+            System.out.println("succeeded: "+cfg.hashCode());
+            System.out.println(cfg.toString());
+            System.out.println(String.format("found %d cluster nodes", cfg.getClusterConfig().getSeedNodes().size()));
+            for (ClusterNodeInfo n : cfg.getClusterConfig().getSeedNodes()) {
+                System.out.println(n.toString());
+            }
+        } catch (Exception e) {
+            String failMessage = "failed: " + e.getMessage();
+            System.out.println(failMessage);
+            fail(failMessage);
+        }
+    }
+
+    @Test
+    public void test4() {
+        ClusterConfig cc = ClusterConfig.defaultSingleNodeConfig();
+        cc.getClusterSeedNodeName();
+        cc.getRoleMemberIndex();
+        cc.isCluster();
+        cc.isMe(null);
+    }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestGeoConfig.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestGeoConfig.java
new file mode 100644
index 000000000..915c88d50
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestGeoConfig.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.conf.odlGeo.GeoConfig;
+
+public class TestGeoConfig {
+
+    @Test
+    public void test() {
+        GeoConfig config;
+        try {
+            System.out.println("testing clusternode geo config1");
+            System.out.println("===========================");
+            config = GeoConfig.parse(getClusterGeoConfigContent());
+            System.out.println("succeeded: ");
+            System.out.println(config.toString());
+            System.out.println("primary roles:");
+            System.out.println(config.getPrimaryRoles().toString());
+            System.out.println("secondary roles:");
+            System.out.println(config.getSecondaryRoles().toString());
+
+        } catch (Exception e) {
+            fail("failed: " + e.getMessage());
+        }
+    }
+
+
+
+    private static String getClusterGeoConfigContent() {
+        return "\n" + "lumina-geo-cluster {\n" + "    primary_roles = [\n"
+                + "   \"member-1\",\"member-2\",\"member-3\"\n" + "    ]\n" + "    secondary_roles = [\n"
+                + "   \"member-4\",\"member-5\",\"member-6\"\n" + "    ]\n" + "    ip_roles_table = [\n" + "\n"
+                + "   {\n" + "role=\"member-1\"\n" + "ip=\"zltcmtn23arbc01.2f0377.mtn23a.tci.att.com\"\n" + "},\n"
+                + "{\n" + "role=\"member-2\"\n" + "ip=\"zltcmtn23arbc02.2f0377.mtn23a.tci.att.com\"\n" + "},\n" + "{\n"
+                + "role=\"member-3\"\n" + "ip=\"zltcmtn23arbc03.2f0377.mtn23a.tci.att.com\"\n" + "},\n" + "{\n"
+                + "role=\"member-4\"\n" + "ip=\"zltcmtn23brbc01.f84e7a.mtn23b.tci.att.com\"\n" + "},\n" + "{\n"
+                + "role=\"member-5\"\n" + "ip=\"zltcmtn23brbc02.f84e7a.mtn23b.tci.att.com\"\n" + "},\n" + "{\n"
+                + "role=\"member-6\"\n" + "ip=\"zltcmtn23brbc03.f84e7a.mtn23b.tci.att.com\"\n" + "}\n" + "    \n"
+                + "   ]\n" + "}\n" + "\n" + "\n" + "\n" + "\n" + "";
+    }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java
new file mode 100644
index 000000000..ff659ca3d
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java
@@ -0,0 +1,316 @@
+/*******************************************************************************
+ * ============LICENSE_START======================================================= ONAP : ccsdk
+ * feature sdnr wt ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.ExecutionException;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeConnectListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.VesNotificationListener;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.NetconfNodeStateServiceImpl;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc.NetconfnodeStateServiceRpcApiImpl;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.ClusterSingletonServiceProviderMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.DataBrokerNetconfMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.MountPointMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.MountPointServiceMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.NotificationPublishServiceMock;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock.RpcProviderRegistryMock;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.AttributeChangeNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.AttributeChangeNotificationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.FaultNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.FaultNotificationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushAttributeChangeNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushAttributeChangeNotificationOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushFaultNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.PushFaultNotificationOutput;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class TestNetconfNodeStateService {
+
+    private static Path KARAF_ETC = Paths.get("etc");
+    private static NetconfNodeStateServiceImpl netconfStateService;
+    private static MountPointMock mountPoint;
+    private static DataBrokerNetconfMock dataBrokerNetconf;
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestNetconfNodeStateService.class);
+
+    @BeforeClass
+    public static void before() throws InterruptedException, IOException {
+
+        System.out.println("Logger: " + LOG.getClass().getName() + " " + LOG.getName());
+        // Call System property to get the classpath value
+        Path etc = KARAF_ETC;
+        delete(etc);
+
+        System.out.println("Create empty:" + etc.toString());
+        Files.createDirectories(etc);
+
+        // Create mocks
+        dataBrokerNetconf = new DataBrokerNetconfMock();
+        dataBrokerNetconf.newReadWriteTransaction();
+        mountPoint = new MountPointMock();
+        ClusterSingletonServiceProvider clusterSingletonService = new ClusterSingletonServiceProviderMock();
+        MountPointService mountPointService = new MountPointServiceMock(mountPoint);
+        NotificationPublishService notificationPublishService = new NotificationPublishServiceMock();
+        RpcProviderService rpcProviderRegistry = new RpcProviderRegistryMock();
+
+        // start using blueprint interface
+        netconfStateService = new NetconfNodeStateServiceImpl();
+
+        netconfStateService.setDataBroker(dataBrokerNetconf);
+        netconfStateService.setMountPointService(mountPointService);
+        netconfStateService.setNotificationPublishService(notificationPublishService);
+        netconfStateService.setRpcProviderRegistry(rpcProviderRegistry);
+        netconfStateService.setClusterSingletonService(clusterSingletonService);
+        netconfStateService.init();
+        System.out.println("Initialization done");
+    }
+
+    @AfterClass
+    public static void after() throws InterruptedException, IOException {
+        System.out.println("Start shutdown");
+        // close using blueprint interface
+        netconfStateService.close();
+        delete(KARAF_ETC);
+
+    }
+
+    @Test
+    public void test1() {
+
+        System.out.println("Test1: Verify init state");
+        assertTrue("Devicemanager not initialized", netconfStateService.isInitializationSuccessful());
+    }
+
+
+    @Test
+    public void test2() {
+
+        System.out.println("Test2: Register state listener");
+
+        NetconfNodeStateListener nSL = mock(NetconfNodeStateListener.class);
+        ListenerRegistration<NetconfNodeStateListener> res =
+        netconfStateService.registerNetconfNodeStateListener(nSL);
+        assertNotNull("Result should be null", res);
+        res.getInstance();
+        res.close();
+    }
+
+    @Test
+    public void test3() {
+
+        System.out.println("Test3: Register connect listener");
+
+        NetconfNodeConnectListener nCL = mock(NetconfNodeConnectListener.class);
+        ListenerRegistration<NetconfNodeConnectListener> res =
+        netconfStateService.registerNetconfNodeConnectListener(nCL);
+        assertNotNull("Result should be null", res);
+        res.getInstance();
+        res.close();
+    }
+
+    @Test
+    public void test4() {
+        System.out.println("Test4: Get status listener");
+        GetStatusInputBuilder inputBuilder = new GetStatusInputBuilder();
+        GetStatusOutputBuilder res = netconfStateService.getStatus(inputBuilder.build());
+        assertNotNull("Result should be null", res);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void test5OnConnect() {
+        System.out.println("Test5: On Connect");
+        NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
+        netconfNodeBuilder.setConnectionStatus(ConnectionStatus.Connected);
+        NetconfNode rootNodeNetconf = netconfNodeBuilder.build();
+
+        NodeId nodeId = new NodeId("Test");
+        NodeBuilder nodeBuilder = new NodeBuilder();
+        nodeBuilder.addAugmentation(NetconfNode.class, rootNodeNetconf);
+        nodeBuilder.setNodeId(nodeId);
+        Node rootNode = nodeBuilder.build();
+
+        DataObjectModification<Node> dom = mock(DataObjectModification.class);
+        when(dom.getDataAfter()).thenReturn(rootNode);
+        when(dom.getModificationType()).thenReturn(ModificationType.WRITE);
+
+        DataTreeModification<Node> ntn = mock(DataTreeModification.class);
+        when(ntn.getRootNode()).thenReturn(dom);
+
+        NetconfNodeConnectListener nCL = mock(NetconfNodeConnectListener.class);
+        netconfStateService.registerNetconfNodeConnectListener(nCL);
+        mountPoint.setDatabrokerAbsent(false);
+
+        Collection<DataTreeModification<Node>> changes = Arrays.asList(ntn);
+        dataBrokerNetconf.sendClusteredChanges(changes);
+        dataBrokerNetconf.sendChanges(changes);
+
+        //verify that it was called one time
+        verify(nCL,times(1)).onEnterConnected(nodeId, rootNodeNetconf, mountPoint.getDataBroker());
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void test6Update() {
+        System.out.println("Test6: OnChange");
+        NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
+        netconfNodeBuilder.setConnectionStatus(ConnectionStatus.Connected);
+        NetconfNode rootNodeNetconf = netconfNodeBuilder.build();
+
+        NodeBuilder nodeBuilder = new NodeBuilder();
+        nodeBuilder.addAugmentation(NetconfNode.class, rootNodeNetconf);
+        nodeBuilder.setNodeId(new NodeId("Test"));
+        Node rootNodeAfter = nodeBuilder.build();
+
+        DataObjectModification<Node> dom = mock(DataObjectModification.class);
+        when(dom.getDataBefore()).thenReturn(rootNodeAfter);
+        when(dom.getDataAfter()).thenReturn(rootNodeAfter);
+        when(dom.getModificationType()).thenReturn(ModificationType.WRITE);
+
+        DataTreeModification<Node> ntn = mock(DataTreeModification.class);
+        when(ntn.getRootNode()).thenReturn(dom);
+
+        Collection<DataTreeModification<Node>> changes = Arrays.asList(ntn);
+        dataBrokerNetconf.sendClusteredChanges(changes);
+        dataBrokerNetconf.sendChanges(changes);
+    }
+
+    @Test
+    public void test7ApiStatus() throws InterruptedException, ExecutionException {
+
+        NetconfnodeStateServiceRpcApiImpl api = netconfStateService.getNetconfnodeStateServiceRpcApiImpl();
+
+        GetStatusInputBuilder statusInput = new GetStatusInputBuilder();
+        ListenableFuture<RpcResult<GetStatusOutput>> statusOutput = api.getStatus(statusInput.build());
+        RpcResult<GetStatusOutput> res = statusOutput.get();
+        GetStatusOutput output = res.getResult();
+        System.out.println("Output "+output);
+    }
+
+
+    @Test
+    public void test8ApiPushFault() throws InterruptedException, ExecutionException {
+
+        NetconfnodeStateServiceRpcApiImpl api = netconfStateService.getNetconfnodeStateServiceRpcApiImpl();
+
+        VesNotificationListener vNL = mock(VesNotificationListener.class);
+        ListenerRegistration<VesNotificationListener> registration = netconfStateService.registerVesNotifications(vNL);
+
+        FaultNotificationBuilder faultBuilder = new FaultNotificationBuilder();
+        faultBuilder.setProblem("problem1");
+        FaultNotification fault = faultBuilder.build();
+        PushFaultNotificationInputBuilder statusInput = new PushFaultNotificationInputBuilder();
+        statusInput.fieldsFrom(fault);
+        ListenableFuture<RpcResult<PushFaultNotificationOutput>> rpcOutput = api.pushFaultNotification(statusInput.build());
+        RpcResult<PushFaultNotificationOutput> res = rpcOutput.get();
+        PushFaultNotificationOutput output = res.getResult();
+
+        //verify that it was called one time
+        verify(vNL,times(1)).onNotification(fault);
+
+        registration.close();
+        System.out.println("Output "+output);
+    }
+
+    @Test
+    public void test9ApiPushNotifiction() throws InterruptedException, ExecutionException {
+
+        NetconfnodeStateServiceRpcApiImpl api = netconfStateService.getNetconfnodeStateServiceRpcApiImpl();
+
+        VesNotificationListener vNL = mock(VesNotificationListener.class);
+        ListenerRegistration<VesNotificationListener> registration = netconfStateService.registerVesNotifications(vNL);
+
+        AttributeChangeNotificationBuilder changeBuilder = new AttributeChangeNotificationBuilder();
+        changeBuilder.setAttributeName("attribute1");
+        AttributeChangeNotification change = changeBuilder.build();
+        PushAttributeChangeNotificationInputBuilder statusInput = new PushAttributeChangeNotificationInputBuilder();
+        statusInput.fieldsFrom(change);
+        ListenableFuture<RpcResult<PushAttributeChangeNotificationOutput>> rpcOutput = api.pushAttributeChangeNotification(statusInput.build());
+        RpcResult<PushAttributeChangeNotificationOutput> res = rpcOutput.get();
+        PushAttributeChangeNotificationOutput output = res.getResult();
+
+        //verify that it was called one time
+        verify(vNL,times(1)).onNotification(change);
+
+        registration.close();
+        System.out.println("Output "+output);
+    }
+
+
+    // ------- private section
+
+    private static void delete(Path etc) throws IOException {
+        if (Files.exists(etc)) {
+            System.out.println("Found and remove:" + etc.toString());
+            delete(etc.toFile());
+        }
+    }
+
+    private static void delete(File f) throws IOException {
+        if (f.isDirectory()) {
+            for (File c : f.listFiles()) {
+                delete(c);
+            }
+        }
+        if (!f.delete()) {
+            throw new FileNotFoundException("Failed to delete file: " + f);
+        }
+    }
+
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/ClusterSingletonServiceProviderMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/ClusterSingletonServiceProviderMock.java
new file mode 100644
index 000000000..86340c052
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/ClusterSingletonServiceProviderMock.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
+
+public class ClusterSingletonServiceProviderMock implements ClusterSingletonServiceProvider {
+
+	@Override
+	public void close() throws Exception {
+
+	}
+
+	@Override
+	public ClusterSingletonServiceRegistration registerClusterSingletonService(ClusterSingletonService service) {
+		return null;
+	}
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerMountpointMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerMountpointMock.java
new file mode 100644
index 000000000..48401c881
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerMountpointMock.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public class DataBrokerMountpointMock implements DataBroker, BindingService {
+
+    ReadTransaction readTransaction;
+
+    public void setReadOnlyTransaction(ReadTransaction readTransaction) {
+        this.readTransaction = readTransaction;
+    }
+
+    @Override
+    public @NonNull ReadTransaction newReadOnlyTransaction() {
+        return null;
+    }
+
+    @Override
+    public @NonNull ReadWriteTransaction newReadWriteTransaction() {
+        return null;
+    }
+
+    @Override
+    public @NonNull WriteTransaction newWriteOnlyTransaction() {
+        return null;
+    }
+
+    @Override
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> @NonNull ListenerRegistration<L> registerDataTreeChangeListener(
+            @NonNull DataTreeIdentifier<T> treeId, @NonNull L listener) {
+        return null;
+    }
+
+    @Override
+    public @NonNull TransactionChain createTransactionChain(@NonNull TransactionChainListener listener) {
+        return null;
+    }
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerNetconfMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerNetconfMock.java
new file mode 100644
index 000000000..90ab8608c
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/DataBrokerNetconfMock.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import java.util.Collection;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public class DataBrokerNetconfMock implements DataBroker {
+
+    private @NonNull DataTreeChangeListener<Node> listener;
+    private @NonNull ClusteredDataTreeChangeListener<Node> listenerClustered;
+
+    @Override
+    public @NonNull ReadTransaction newReadOnlyTransaction() {
+        return null;
+    }
+
+    @Override
+    public org.opendaylight.mdsal.binding.api.@NonNull ReadWriteTransaction newReadWriteTransaction() {
+        return null;
+    }
+
+    @Override
+    public org.opendaylight.mdsal.binding.api.@NonNull WriteTransaction newWriteOnlyTransaction() {
+        return null;
+    }
+
+
+    @Override
+    public @NonNull TransactionChain createTransactionChain(
+            org.opendaylight.mdsal.binding.api.@NonNull TransactionChainListener listener) {
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> @NonNull ListenerRegistration<L> registerDataTreeChangeListener(
+            @NonNull DataTreeIdentifier<T> treeId, @NonNull L pListener) {
+        System.out.println("Register "+pListener.getClass().getName());
+        if (pListener instanceof ClusteredDataTreeChangeListener) {
+            System.out.println("Clustered listener");
+            this.listenerClustered = (ClusteredDataTreeChangeListener<Node>) pListener;
+        } else if (pListener instanceof DataTreeChangeListener) {
+            System.out.println("Listener");
+            this.listener = (DataTreeChangeListener<Node>) pListener;
+        }
+        return new ListenerRegistration<L>() {
+
+            @Override
+            public @NonNull L getInstance() {
+                return pListener;
+            }
+
+            @Override
+            public void close() {
+            }
+
+        };
+    }
+
+    public void sendChanges(Collection<DataTreeModification<Node>> changes) {
+        this.listener.onDataTreeChanged(changes);
+    }
+
+    public void sendClusteredChanges(Collection<DataTreeModification<Node>> changes) {
+        this.listenerClustered.onDataTreeChanged(changes);
+    }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/MountPointMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/MountPointMock.java
new file mode 100644
index 000000000..e5bff451d
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/MountPointMock.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt sdnr-wt-devicemanager-provider
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import java.util.Optional;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * @author herbert
+ *
+ */
+public class MountPointMock implements MountPoint {
+
+    private boolean databrokerAbsent = true;
+    private final DataBrokerMountpointMock dataBroker = new DataBrokerMountpointMock();
+    private final RpcConsumerRegistryMock rpcConsumerRegistry = new RpcConsumerRegistryMock();
+    private NotificationService setReadTransaction;
+
+    private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
+            InstanceIdentifier.create(NetworkTopology.class).child(Topology.class,
+                    new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
+
+    @Override
+    public InstanceIdentifier<?> getIdentifier() {
+        return NETCONF_TOPO_IID;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends BindingService> Optional<T> getService(Class<T> service) {
+
+        System.out.println("Requested mountpoint service: "+service.getSimpleName()+" databrokerAbsent state: "+databrokerAbsent);
+
+        Optional<? extends BindingService> res;
+        if (service.isInstance(dataBroker)) {
+            System.out.println("Delivering databroker");
+            res =  databrokerAbsent ? Optional.empty() : Optional.of(dataBroker);
+        } else if (service.isInstance(rpcConsumerRegistry)) {
+            System.out.println("Delivering RpcConsumerRegistryMock");
+            res = Optional.of(rpcConsumerRegistry);
+        } else if (service.isInstance(setReadTransaction)) {
+            System.out.println("Delivering notificationService");
+            res = Optional.of(setReadTransaction);
+        } else {
+            System.out.println("Delivering no service");
+            res = Optional.empty();
+        }
+        return (Optional<T>) res;
+    }
+
+    public void setDatabrokerAbsent( boolean state) {
+        this.databrokerAbsent = state;
+    }
+
+    public DataBroker getDataBroker() {
+        return dataBroker;
+    }
+
+}
diff --git a/sdnr/wt/devicemodel/model/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemodel/test/TestNetworkElement.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/MountPointServiceMock.java
index e3b7fc9ad..127019633 100644
--- a/sdnr/wt/devicemodel/model/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemodel/test/TestNetworkElement.java
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/MountPointServiceMock.java
@@ -8,9 +8,9 @@
  * 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.
@@ -18,36 +18,37 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemodel.test;
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElement;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.NetworkElementBuilder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.name.g.Name;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.name.g.NameBuilder;
+import java.util.Optional;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class TestNetworkElement {
+/**
+ * @author herbert
+ *
+ */
+public class MountPointServiceMock implements MountPointService {
 
-    @Test
-    public void test() {
-
-        NetworkElementBuilder networkElementBuilder = new NetworkElementBuilder();
-
-        NameBuilder nameBuilder = new NameBuilder();
-        nameBuilder.setValueName("name");
-        nameBuilder.setValue("Device1");
-        List<Name> nameList = new ArrayList<>();
-        nameList.add(nameBuilder.build());
-        networkElementBuilder.setName(nameList);
+    private final MountPointMock mountpoint;
 
+    public MountPointServiceMock(MountPointMock mountpoint) {
+        this.mountpoint = mountpoint;
+    }
 
-        NetworkElement ne = networkElementBuilder.build();
+    @Override
+    public Optional<MountPoint> getMountPoint(InstanceIdentifier<?> mountPoint) {
 
-        System.out.println(ne.toString());
+        Optional<MountPoint> optional = Optional.of(mountpoint);
+        return optional;
+    }
 
-        //fail("Not yet implemented");
+    @Override
+    public <T extends MountPointListener> ListenerRegistration<T> registerListener(InstanceIdentifier<?> path,
+            T listener) {
+        return null;
     }
 
 }
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/NotificationPublishServiceMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/NotificationPublishServiceMock.java
new file mode 100644
index 000000000..0564c56a3
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/NotificationPublishServiceMock.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.TimeUnit;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.yangtools.yang.binding.Notification;
+
+public class NotificationPublishServiceMock implements NotificationPublishService {
+
+    @Override
+    public ListenableFuture<?> offerNotification(Notification notification) {
+        return null;
+    }
+
+   @Override
+    public ListenableFuture<?> offerNotification(Notification notification, int timeout, TimeUnit unit)
+            throws InterruptedException {
+        return null;
+    }
+
+    @Override
+    public void putNotification(Notification notification) throws InterruptedException {
+   }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcConsumerRegistryMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcConsumerRegistryMock.java
new file mode 100644
index 000000000..7e48ff2e5
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcConsumerRegistryMock.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt sdnr-wt-devicemanager-provider
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.yangtools.yang.binding.RpcService;
+
+public class RpcConsumerRegistryMock implements RpcConsumerRegistry {
+
+    @Override
+    public <T extends RpcService> T getRpcService(Class<T> serviceInterface) {
+        return null;
+    }
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcProviderRegistryMock.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcProviderRegistryMock.java
new file mode 100644
index 000000000..fbcb21db9
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/mock/RpcProviderRegistryMock.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ *  ================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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=========================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.mock;
+
+import java.util.Set;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.RpcService;
+
+public class RpcProviderRegistryMock implements RpcProviderService {
+
+    @Override
+    public <S extends RpcService, T extends S> ObjectRegistration<T> registerRpcImplementation(Class<S> type,
+            T implementation) {
+        return null;
+    }
+
+    @Override
+    public <S extends RpcService, T extends S> ObjectRegistration<T> registerRpcImplementation(Class<S> type,
+            T implementation, Set<InstanceIdentifier<?>> paths) {
+        return null;
+    }
+
+
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/captured-akka.conf b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/captured-akka.conf
new file mode 100644
index 000000000..8489f0905
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/captured-akka.conf
@@ -0,0 +1,72 @@
+
+odl-cluster-data {
+
+  akka {
+    loglevel = ""
+    remote {
+      netty.tcp {
+        hostname = "zltcdyh1arbc02.2f0377.dyh1a.tci.att.com"
+        port = 2550
+      }
+    }
+    actor {
+    debug{
+        autoreceive = on
+        lifecycle = on
+        unhandled = on
+        fsm = on
+        event-stream = on
+     }
+    }
+    cluster {
+      seed-nodes = ["akka.tcp://opendaylight-cluster-data@zltcdyh1arbc01.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1arbc02.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1arbc03.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc01.f84e7a.dyh1b.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc02.f84e7a.dyh1b.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc03.f84e7a.dyh1b.tci.att.com:2550"]
+      seed-node-timeout = 15s
+      roles = ["member-2"]
+
+    }
+    persistence {
+    journal-plugin-fallback {
+         circuit-breaker {
+            max-failures = 10
+            call-timeout = 60s
+            reset-timeout = 30s
+         }
+     }
+    }
+  }
+}
+
+odl-cluster-rpc {
+
+  akka {
+    loglevel = ""
+    remote {
+      netty.tcp {
+        hostname = "zltcdyh1arbc02.2f0377.dyh1a.tci.att.com"
+        port = 2551
+      }
+    }
+    actor {
+    debug{
+        autoreceive = on
+        lifecycle = on
+        unhandled = on
+        fsm = on
+        event-stream = on
+     }
+    }
+    cluster {
+    seed-nodes = ["akka.tcp://odl-cluster-rpc@zltcdyh1arbc01.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1arbc02.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1arbc03.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc01.f84e7a.dyh1b.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc02.f84e7a.dyh1b.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc03.f84e7a.dyh1b.tci.att.com:2551"]
+        seed-node-timeout = 15s
+    }
+    persistence {
+    journal-plugin-fallback {
+         circuit-breaker {
+            max-failures = 10
+            call-timeout = 60s
+            reset-timeout = 30s
+         }
+     }
+     }
+  }
+}
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..2eb3eb7b3
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,38 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+# org.slf4j.simpleLogger.log.xxx.yyy=debug
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
+org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
+
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+#org.slf4j.simpleLogger.showDateTime=false
+
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+#org.slf4j.simpleLogger.showThreadName=true
+
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+#org.slf4j.simpleLogger.showLogName=true
+
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.properties b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.properties
new file mode 100644
index 000000000..de49c5893
--- /dev/null
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/resources/test.properties
@@ -0,0 +1,55 @@
+[dcae]
+dcaeUserCredentials=admin:admin
+dcaeUrl=off
+dcaeHeartbeatPeriodSeconds=120
+dcaeTestCollector=no
+
+[aots]
+userPassword=passwd
+soapurladd=off
+soapaddtimeout=10
+soapinqtimeout=20
+userName=user
+inqtemplate=inqreq.tmpl.xml
+assignedto=userid
+addtemplate=addreq.tmpl.xml
+severitypassthrough=critical,major,minor,warning
+systemuser=user
+prt-offset=1200
+soapurlinq=off
+#smtpHost=
+#smtpPort=
+#smtpUsername=
+#smtpPassword=
+#smtpSender=
+#smtpReceivers=
+
+[es]
+esCluster=sendateodl5
+#time limit to keep increasing data in database [in seconds] 
+#60*60*24*30 (30days)
+esArchiveLimit=2592000
+#folder where removed data will be stored
+esArchiveFolder=./backup
+#interval to archive database [in seconds]
+#60*60*24 (1day)
+esArchiveInterval=86400
+
+[aai]
+#keep comment
+aaiHeaders=["X-TransactionId: 9999"]
+aaiUrl=http://localhost:81
+aaiUserCredentials=AAI:AAI
+aaiDeleteOnMountpointRemove=false
+aaiTrustAllCerts=false
+aaiApiVersion=aai/v13
+aaiPropertiesFile=aaiclient.properties
+aaiApplicationId=SDNR
+aaiPcks12ClientCertFile=/opt/logs/externals/data/stores/keystore.client.p12
+aaiPcks12ClientCertPassphrase=adminadmin
+aaiClientConnectionTimeout=30000
+
+[pm]
+pmCluster=sendateodl5
+pmEnabled=true
+
diff --git a/sdnr/wt/odlux/apps/apiDemo/package.json b/sdnr/wt/odlux/apps/apiDemo/package.json
index 730412e05..d6f74278b 100644
--- a/sdnr/wt/odlux/apps/apiDemo/package.json
+++ b/sdnr/wt/odlux/apps/apiDemo/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml
index 012e279db..960fb745b 100644
--- a/sdnr/wt/odlux/apps/apiDemo/pom.xml
+++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-apiDemo</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-apiDemo</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -45,8 +48,21 @@
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -69,10 +85,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -95,7 +111,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -107,8 +123,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -138,27 +154,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml
index 84b2611a7..9b4a9f565 100644
--- a/sdnr/wt/odlux/apps/app-feature/pom.xml
+++ b/sdnr/wt/odlux/apps/app-feature/pom.xml
@@ -14,18 +14,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-odlux-apps-feature</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-apps-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -71,6 +72,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml
index 7437f7630..60ef31348 100755
--- a/sdnr/wt/odlux/apps/app-installer/pom.xml
+++ b/sdnr/wt/odlux/apps/app-installer/pom.xml
@@ -2,12 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-odlux-apps-installer</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
@@ -15,10 +9,12 @@
         <relativePath/>
     </parent>
 
-    <properties>
-        <application.name>sdnr-wt-odlux-apps</application.name>
-        <include.transitive.dependencies>false</include.transitive.dependencies>
-    </properties>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-apps-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -26,6 +22,11 @@
         </license>
     </licenses>
 
+    <properties>
+        <application.name>sdnr-wt-odlux-apps</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -92,9 +93,15 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
             <version>${project.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>
diff --git a/sdnr/wt/odlux/apps/configurationApp/package.json b/sdnr/wt/odlux/apps/configurationApp/package.json
index a0df50579..2985ba4fb 100644
--- a/sdnr/wt/odlux/apps/configurationApp/package.json
+++ b/sdnr/wt/odlux/apps/configurationApp/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml
index 62742c05e..6abe1f07b 100644
--- a/sdnr/wt/odlux/apps/configurationApp/pom.xml
+++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-configurationApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/actions/configurationActions.ts b/sdnr/wt/odlux/apps/configurationApp/src/actions/configurationActions.ts
deleted file mode 100644
index 9a4c92bc6..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/actions/configurationActions.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../../../../framework/src/flux/action';
-import { Dispatch } from '../../../../framework/src/flux/store';
-
-import { CoreModelNetworkElement, LpResponse } from '../models/coreModel';
-import configurationService, { getValueByName } from '../services/configurationService';
-import { ViewSpecification } from 'models/uiModels';
-import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
-import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
-
-export class ConfigurationApplicationBaseAction extends Action { }
-
-export class UpdateLoading extends ConfigurationApplicationBaseAction {
-  constructor (public loading: boolean) {
-    super();
-
-  }
-}
-
-export class UpdateCoreModel extends ConfigurationApplicationBaseAction {
-  constructor (public nodeId?: string, public coreModel?: CoreModelNetworkElement) {
-    super();
-
-  }
-}
-
-export class UpdateLp extends ConfigurationApplicationBaseAction {
-  constructor (public lpId?: string, public capability?: string, public conditionalPackage?: string, public viewSpecifications: ViewSpecification[] = []) {
-    super();
-
-  }
-}
-
-export class UpdateViewData extends ConfigurationApplicationBaseAction {
-  constructor (public viewId?: string, public indexValues: string = "", public viewData: {} = {}) {
-    super();
-
-  }
-}
-
-
-export const updateMountIdAsyncActionCreator = (nodeId: string | undefined) => async (dispatch: Dispatch) => {
-  if (!nodeId) {
-    dispatch(new UpdateCoreModel());
-    return;
-  }
-  dispatch(new UpdateLoading(true));
-  const coreModel = await configurationService.getCoreModelByNodeId(nodeId);
-  dispatch(new UpdateLoading(false));
-
-  return coreModel
-    ? dispatch(new UpdateCoreModel(nodeId, coreModel))
-    : dispatch(new UpdateCoreModel());
-}
-
-export const updateLpIdAsyncActionCreator = (lpId: string | undefined) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
-  const { configuration: { coreModel: coreModel, nodeId: nodeId } } = getState();
-  if (! nodeId || !lpId || !coreModel) {
-    dispatch(new UpdateLp());
-    return;
-  }
-
-  // find the lp with its unique uuid
-  let lpData: LpResponse | null = null;
-  for (let ltp of coreModel.ltp) {
-    const lp = ltp.lp.find(pl => pl.uuid === lpId);
-    if (lp) {
-      lpData = lp;
-      break;
-    }
-  }
-
-  // urn:onf:params:xml:ns:yang:microwave-model?module=microwave-model => microwave-model
-  let capability: string | null = lpData && getValueByName("capability", lpData.extension, null);
-  if (capability) {
-    const paramIndex = capability.indexOf('?');
-    if (paramIndex > -1) {
-      capability = capability.slice(paramIndex+1);
-    }
-    const params = capability.split("&").map(p => (p || "=").split("="));
-    const capParam = params.find(p => p[0] === "module") || null;
-    capability = capParam && capParam[1] || null;
-  }
-
-  const revision: string | null = lpData && getValueByName("revision", lpData.extension, null);
-  const conditionalPackage: string | null = lpData && getValueByName("conditional-package", lpData.extension, null);
-
-  dispatch(new UpdateLoading(true));
-  const viewSpecifications = capability && await configurationService.getUIDescriptionByCapability(capability, revision) || [];
-  dispatch(new UpdateLoading(false));
-
-  return coreModel ?
-    dispatch(new UpdateLp(lpId, capability || undefined, conditionalPackage || undefined, viewSpecifications)) :
-    dispatch(new UpdateLp());
-}
-
-export const updateViewDataAsyncActionCreator = (viewId: string | undefined, indexValues: string[] = []) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
-  const { configuration: { nodeId, lpId, capability, conditionalPackage, viewSpecifications } } = getState();
-  if (!viewId || !capability || !nodeId || !lpId || !conditionalPackage) {
-    // dispatch(new AddSnackbarNotification({ message: `Error invalid parameter !${JSON.stringify({capability ,nodeId ,lpId ,conditionalPackage}, null,2)}`, options: { variant: 'error' } }));
-    dispatch(new UpdateViewData());
-    return;
-  }
-
-  const viewSpecification = viewSpecifications.find(desc => desc.id === viewId);
-  if (!viewSpecification) {
-    dispatch(new AddSnackbarNotification({ message: `Error viewId ${viewId} not found !`, options: { variant: 'error' } }));
-    dispatch(new UpdateViewData());
-    return;
-  }
-
-  const url = viewSpecification.url.replace(/\$\$NODEID\$\$/g, nodeId).replace(/\$\$LPUUID\$\$/g, lpId);
-
-  dispatch(new UpdateLoading(true));
-  const data = capability && await configurationService.getViewData(url) || { };
-  dispatch(new UpdateLoading(false));
-
-  let viewData: { [path: string]: {} } = data;
-
-  const pathElements = viewSpecification.dataPath &&
-    viewSpecification.dataPath.replace(
-      /\/\$\$INDEX:(\d+):?([a-z\-]+)?\$\$/ig,
-      (_, indexStr, keyStr) => {
-        const index = +indexStr;
-        return indexValues[index] && '/' + indexValues[index] || '';
-      }).split("/") || [];
-
-  for (let path of pathElements) {
-    if (path === "") {
-      break;
-    }
-    viewData = viewData[path];
-  }
-
-  return viewData != null ?
-    dispatch(new UpdateViewData(viewId, indexValues.length > 0 ? indexValues.join("/") : "", viewData)) :
-    dispatch(new UpdateViewData());
-}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/actions/deviceActions.ts b/sdnr/wt/odlux/apps/configurationApp/src/actions/deviceActions.ts
new file mode 100644
index 000000000..fc0665325
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/actions/deviceActions.ts
@@ -0,0 +1,380 @@
+import { Action } from '../../../../framework/src/flux/action';
+import { Dispatch } from '../../../../framework/src/flux/store';
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import { PushAction, ReplaceAction } from "../../../../framework/src/actions/navigationActions";
+
+import { restService } from "../services/restServices";
+import { YangParser } from "../yang/yangParser";
+import { Module } from "../models/yang";
+import { ViewSpecification, ViewElement, isViewElementReference, isViewElementList, isViewElementObjectOrList } from "../models/uiModels";
+import { AddErrorInfoAction } from "../../../../framework/src/actions/errorActions";
+
+export class EnableValueSelector extends Action {
+  constructor(public listSpecification: ViewSpecification, public listData: any[], public keyProperty: string, public onValueSelected : (value: any) => void ) {
+    super();
+  }
+}
+
+export class SetCollectingSelectionData extends Action {
+  constructor(public busy: boolean) {
+    super();
+  }
+}
+
+export class SetSelectedValue extends Action {
+  constructor(public value: any) {
+    super();
+  }
+}
+
+export class UpdateDeviceDescription extends Action {
+  constructor( public nodeId: string, public modules: { [name:string]: Module}, public views: ViewSpecification[]) {
+    super();
+  }
+}
+
+export class UpdatViewDescription extends Action {
+  constructor(public vPath: string, public view: ViewSpecification, public viewData: any, public displayAsList: boolean = false, public key?: string ) {
+    super();
+  }
+}
+
+export const updateNodeIdAsyncActionCreator = (nodeId: string) => async (dispatch: Dispatch, getState: () => IApplicationStoreState ) => {
+  const { configuration: { connectedNetworkElements : { rows }} } = getState();
+  dispatch(new SetCollectingSelectionData(true));
+  const networkElement = rows.find(r => r.nodeId === nodeId) || await restService.getMountedNetworkElementByMountId(nodeId);
+  if (!networkElement) {
+    console.error(new Error(`NetworkElement : [${nodeId}] does not exist.`));
+    return dispatch(new UpdateDeviceDescription("", { }, [ ]));
+  }
+
+  if (!networkElement.nodeDetails || !networkElement.nodeDetails.availableCapabilities) {
+    throw new Error(`NetworkElement : [${nodeId}] has no capabilities.`);
+  }
+  const parser = new YangParser();
+
+  const capParser = /^\(.*\?revision=(\d{4}-\d{2}-\d{2})\)(\S+)$/i;
+  for (let i = 0; i < networkElement.nodeDetails.availableCapabilities.length; ++i){
+    const capRaw = networkElement.nodeDetails.availableCapabilities[i];
+    const capMatch = capRaw && capParser.exec(capRaw);
+    try {
+      capMatch && await parser.addCapability(capMatch[2], capMatch[1]);
+    } catch (err) {
+      console.error(err);
+    }
+  }
+
+  parser.postProcess();
+
+  console.log(parser.modules, parser.views)
+
+  return dispatch(new UpdateDeviceDescription(nodeId, parser.modules, parser.views));
+}
+
+export const splitVPath = (vPath: string, vPathParser : RegExp): [string, string?][] => {
+  const pathParts: [string, string?][] = [];
+  let partMatch: RegExpExecArray | null;
+  if (vPath) do {
+    partMatch = vPathParser.exec(vPath);
+    if (partMatch) {
+      pathParts.push([partMatch[1], partMatch[2] || undefined]);
+    }
+  } while (partMatch)
+  return pathParts;
+}
+
+const getReferencedDataList = async (refPath: string, dataPath: string, modules: { [name: string]: Module }, views: ViewSpecification[]) => {
+  const pathParts = splitVPath(refPath, /(?:(?:([^\/\:]+):)?([^\/]+))/g);  // 1 = opt: namespace / 2 = property
+  let referencedModule = modules[pathParts[0][0]];
+
+  let dataMember: string;
+  let view: ViewSpecification;
+  let currentNS: string | null = null;
+  let dataUrls = [dataPath];
+  let data: any;
+
+  for (let i = 0; i < pathParts.length; ++i) {
+    const [pathPartNS, pathPart] = pathParts[i];
+    const namespace = pathPartNS != null ? (currentNS = pathPartNS) : currentNS;
+
+    const viewElement = i === 0
+      ? views[0].elements[`${referencedModule.name}:${pathPart}`]
+      : view!.elements[`${pathPart}`] || view!.elements[`${namespace}:${pathPart}`];
+
+    if (!viewElement) throw new Error(`Could not find ${pathPart} in ${refPath}`);
+    if (i < pathParts.length - 1) {
+      if (!isViewElementObjectOrList(viewElement)) {
+        throw Error(`Module: [${referencedModule.name}].[${viewElement.label}]. Viewelement is not list or object.`);
+      }
+      view = views[+viewElement.viewId];
+      const resultingDataUrls : string[] = [];
+      if (isViewElementList(viewElement)) {
+        for (let j = 0; j < dataUrls.length; ++j) {
+          const dataUrl = dataUrls[j];
+          const restResult = (await restService.getConfigData(dataUrl));
+          if (restResult.data == null || restResult.status < 200 || restResult.status > 299) {
+            const message = restResult.data && restResult.data.errors && restResult.data.errors.error && restResult.data.errors.error[0] && restResult.data.errors.error[0]["error-message"] || "";
+            throw new Error(`Server Error. Status: [${restResult.status}]\n${message || restResult.message || ''}`);
+          }
+
+          let dataRaw = restResult.data[dataMember!];
+          dataRaw = dataRaw instanceof Array
+            ? dataRaw[0]
+            : dataRaw;
+
+          data = dataRaw && dataRaw[viewElement.label] || [];
+          const keys: string[] = data.map((entry: { [key: string]: any } )=> entry[viewElement.key!]);
+          resultingDataUrls.push(...keys.map(key => `${dataUrl}/${viewElement.label.replace(/\//ig, "%2F")}/${key.replace(/\//ig, "%2F")}`));
+        }
+        dataMember = viewElement.label;
+      } else {
+        // just a member, not a list
+        const pathSegment = (i === 0
+          ? `/${referencedModule.name}:${viewElement.label.replace(/\//ig, "%2F")}`
+          : `/${viewElement.label.replace(/\//ig, "%2F")}`);
+        resultingDataUrls.push(...dataUrls.map(dataUrl => dataUrl + pathSegment));
+        dataMember = viewElement.label;
+      }
+      dataUrls = resultingDataUrls;
+    } else {
+      data = [];
+      for (let j = 0; j < dataUrls.length; ++j) {
+        const dataUrl = dataUrls[j];
+        const restResult = (await restService.getConfigData(dataUrl));
+        if (restResult.data == null || restResult.status < 200 || restResult.status > 299) {
+          const message = restResult.data && restResult.data.errors && restResult.data.errors.error && restResult.data.errors.error[0] && restResult.data.errors.error[0]["error-message"] || "";
+          throw new Error(`Server Error. Status: [${restResult.status}]\n${message || restResult.message || ''}`);
+        }
+        let dataRaw = restResult.data[dataMember!];
+        dataRaw = dataRaw instanceof Array
+          ? dataRaw[0]
+          : dataRaw;
+        data.push(dataRaw);
+      }
+      // BUG UUID ist nicht in den elements enthalten !!!!!!
+      const key = viewElement && viewElement.label || pathPart;
+      return {
+        view: view!,
+        data: data,
+        key: key,
+      };
+    }
+  }
+  return null;
+}
+
+const resolveViewDescription = (defaultNS: string | null, vPath: string, view: ViewSpecification, viewData: any, displayAsList: boolean = false, key?: string): UpdatViewDescription =>{
+
+  // check if-feature | when | and resolve all references.
+  view = { ...view };
+  view.elements = Object.keys(view.elements).reduce<{ [name: string]: ViewElement }>((acc, cur) => {
+    const elm = view.elements[cur];
+    const key = defaultNS && cur.replace(new RegExp(`^${defaultNS}:`, "i"),"") || cur;
+    if (isViewElementReference(elm)) {
+      acc[key] = { ...(elm.ref(vPath) || elm), id: key };
+    } else {
+      acc[key] = { ...elm, id: key };
+    }
+    return acc;
+  }, {});
+  return new UpdatViewDescription(vPath, view, viewData, displayAsList, key);
+}
+
+export const updateViewActionAsyncCreator = (vPath: string) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
+  const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
+  const { configuration: { deviceDescription: { nodeId, modules, views } }, framework: { navigationState } } = getState();
+  let dataPath = `/restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let viewSpecification: ViewSpecification = views[0];
+  let viewElement: ViewElement;
+
+  let dataMember: string;
+  let extractList: boolean = false;
+
+  let currentNS : string | null = null;
+  let defaultNS : string | null = null;
+
+  dispatch(new SetCollectingSelectionData(true));
+  try {
+    for (let ind = 0; ind < pathParts.length; ++ind) {
+      const [property, key] = pathParts[ind];
+      const namespaceInd = property && property.indexOf(":") || -1;
+      const namespace : string | null = namespaceInd > -1 ? (currentNS = property.slice(0, namespaceInd)) : currentNS;
+
+      if (ind === 0) { defaultNS = namespace };
+
+      viewElement = viewSpecification.elements[property];
+      if (!viewElement) throw Error("Property [" + property + "] does not exist.");
+
+      if (viewElement.isList && !key) {
+        if (pathParts.length - 1 > ind) {
+          dispatch(new SetCollectingSelectionData(false));
+          throw new Error("No key for list [" + property + "]");
+        } else if (vPath.endsWith("[]") && pathParts.length - 1 === ind) {
+          // empty key is used for new element
+          if (viewElement && "viewId" in viewElement) viewSpecification = views[+viewElement.viewId];
+          const data = Object.keys(viewSpecification.elements).reduce<{ [name: string]: any }>((acc, cur) => {
+            const elm = viewSpecification.elements[cur];
+            if (elm.default) {
+              acc[elm.id] = elm.default || ""
+            }
+            return acc;
+          }, {});
+          return dispatch(resolveViewDescription(defaultNS, vPath, viewSpecification, data, false, isViewElementList(viewElement!) && viewElement.key || undefined));
+        }
+        if (viewElement && isViewElementList(viewElement) && viewSpecification.parentView === "0") {
+          // check if there is a reference as key
+          const listSpecification = views[+viewElement.viewId];
+          const keyElement = viewElement.key && listSpecification.elements[viewElement.key];
+          if (keyElement && isViewElementReference(keyElement)) {
+            const refList = await getReferencedDataList(keyElement.referencePath, dataPath, modules, views);
+            if (!refList) {
+              throw new Error(`Could not find refList for [${keyElement.referencePath}].`);
+            }
+            if (!refList.key) {
+              throw new Error(`Key property not found for [${keyElement.referencePath}].`);
+            }
+            dispatch(new EnableValueSelector(refList.view, refList.data, refList.key, (refKey) => {
+              window.setTimeout(() => dispatch(new PushAction(`${vPath}[${refKey.replace(/\//ig, "%2F")}]`)));
+            }));
+          } else {
+            dispatch(new SetCollectingSelectionData(false));
+            throw new Error("Found a list at root level of a module w/o a refenrece key.");
+          }
+          return;
+        }
+        extractList = true;
+      } else {
+        dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+        dataMember = namespace === defaultNS
+          ? viewElement.label
+          : `${namespace}:${viewElement.label}`;
+        extractList = false;
+      }
+
+      if (viewElement && "viewId" in viewElement) viewSpecification = views[+viewElement.viewId];
+    }
+
+    let data: any = {};
+    if (viewSpecification && viewSpecification.id !== "0") {
+      const restResult = (await restService.getConfigData(dataPath));
+      if (!restResult.data) {
+        // special case: if this is a list without any response
+        if (extractList && restResult.status === 404) {
+          if (!isViewElementList(viewElement!)) {
+            throw new Error(`vPath: [${vPath}]. ViewElement has no key.`);
+          }
+          return dispatch(resolveViewDescription(defaultNS, vPath, viewSpecification, [], extractList, viewElement.key));
+        }
+        throw new Error(`Did not get response from Server. Status: [${restResult.status}]`);
+      } else if (restResult.status < 200 || restResult.status > 299) {
+        const message = restResult.data.errors && restResult.data.errors.error && restResult.data.errors.error[0] && restResult.data.errors.error[0]["error-message"] || "";
+        throw new Error(`Server Error. Status: [${restResult.status}]\n${message}`);
+      } else {
+        data = restResult.data[dataMember!]; // extract dataMember
+      }
+
+      // extract the first element list[key]
+      data = data instanceof Array
+        ? data[0]
+        : data;
+
+      // extract the list -> key: list
+      data = extractList
+        ? data[viewElement!.label] || [] // if the list is empty, it does not exist
+        : data;
+    }
+
+    return dispatch(resolveViewDescription(defaultNS, vPath, viewSpecification, data, extractList, isViewElementList(viewElement!) && viewElement.key || undefined));
+    // https://beta.just-run.it/#/configuration/Sim12600/core-model:network-element/ltp[LTP-MWPS-TTP-01]
+    // https://beta.just-run.it/#/configuration/Sim12600/core-model:network-element/ltp[LTP-MWPS-TTP-01]/lp
+  } catch (error) {
+    history.back();
+    dispatch(new AddErrorInfoAction({ title: "Problem", message: error.message || `Could not process ${dataPath}` }));
+    dispatch(new SetCollectingSelectionData(false));
+  } finally {
+    return;
+  }
+}
+
+export const updateDataActionAsyncCreator = (vPath: string, data: any) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
+  const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
+  const { configuration: { deviceDescription: { nodeId, views } } } = getState();
+  let dataPath = `/restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let viewSpecification: ViewSpecification = views[0];
+  let viewElement: ViewElement;
+  let dataMember: string;
+  let embedList: boolean = false;
+  let isNew: string | false = false;
+
+  let currentNS: string | null = null;
+  let defaultNS: string | null = null;
+
+  dispatch(new SetCollectingSelectionData(true));
+  try {
+    for (let ind = 0; ind < pathParts.length; ++ind) {
+      let [property, key] = pathParts[ind];
+      const namespaceInd = property && property.indexOf(":") || -1;
+      const namespace: string | null = namespaceInd > -1 ? (currentNS = property.slice(0, namespaceInd)) : currentNS;
+
+      if (ind === 0) { defaultNS = namespace };
+      viewElement = viewSpecification.elements[property];
+      if (!viewElement) throw Error("Property [" + property + "] does not exist.");
+
+      if (isViewElementList(viewElement) && !key) {
+        embedList = true;
+        if (viewElement && viewElement.isList && viewSpecification.parentView === "0") {
+          throw new Error("Found a list at root level of a module w/o a refenrece key.");
+        }
+        if (pathParts.length - 1 > ind) {
+          dispatch(new SetCollectingSelectionData(false));
+          throw new Error("No key for list [" + property + "]");
+        } else if (vPath.endsWith("[]") && pathParts.length - 1 === ind) {
+          // handle new element
+          key = viewElement.key && String(data[viewElement.key]) || "";
+          isNew = key;
+          if (!key) {
+            dispatch(new SetCollectingSelectionData(false));
+            throw new Error("No value for key [" + viewElement.key +"] in list [" + property + "]");
+          }
+        }
+      }
+
+      dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+      dataMember = viewElement.label;
+      embedList = false;
+
+      if (viewElement && "viewId" in viewElement) {
+        viewSpecification = views[+viewElement.viewId];
+      }
+    }
+
+    // embed the list -> key: list
+    data = embedList
+      ? { [viewElement!.label]: data }
+      : data;
+
+    // embed the first element list[key]
+    data = isNew
+      ? [data]
+      : data;
+
+    // do not extract root member (0)
+    if (viewSpecification && viewSpecification.id !== "0") {
+      const updateResult = await restService.setConfigData(dataPath, { [dataMember!]: data }); // extractDataMember
+      if (updateResult.status < 200 || updateResult.status > 299) {
+        const message = updateResult.data && updateResult.data.errors && updateResult.data.errors.error && updateResult.data.errors.error[0] && updateResult.data.errors.error[0]["error-message"] || "";
+        throw new Error(`Server Error. Status: [${updateResult.status}]\n${message || updateResult.message || ''}`);
+      }
+    }
+
+    return isNew
+      ? dispatch(new ReplaceAction(`/configuration/${nodeId}/${vPath.replace(/\[\]$/i,`[${isNew}]`)}`)) // navigate to new element
+      : dispatch(resolveViewDescription(defaultNS, vPath, viewSpecification, data, embedList, isViewElementList(viewElement!) && viewElement.key || undefined));
+  } catch (error) {
+    history.back();
+    dispatch(new AddErrorInfoAction({ title: "Problem", message: error.message || `Could not change ${dataPath}` }));
+    dispatch(new SetCollectingSelectionData(false));
+  } finally {
+    return;
+  }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json b/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json
deleted file mode 100644
index 5e0165e4f..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json
+++ /dev/null
@@ -1,6678 +0,0 @@
-{
-  "module": "microwave-model",
-  "revision": "2017-03-24",
-  "views": [
-    {
-      "id": "d1e2181",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-air-interface-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "air-interface-capability",
-          "label": "air-interface-capability",
-          "uiType": "object",
-          "viewId": "d1e2199",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-configuration",
-          "label": "air-interface-configuration",
-          "uiType": "object",
-          "viewId": "d1e2212",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-status",
-          "label": "air-interface-status",
-          "uiType": "object",
-          "viewId": "d1e2223",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-current-problems",
-          "label": "air-interface-current-problems",
-          "uiType": "object",
-          "viewId": "d1e2237",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-current-performance",
-          "label": "air-interface-current-performance",
-          "uiType": "object",
-          "viewId": "d1e2250",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-historical-performances",
-          "label": "air-interface-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e2263",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2199",
-      "parentView": "d1e2181",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-capability",
-      "dataPath": "air-interface-capability",
-      "name": "air-interface-capability",
-      "language": "en-US",
-      "title": "air-interface-capability",
-      "elements": [
-        {
-          "id": "type-of-equipment",
-          "label": "type-of-equipment",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware."
-        },
-        {
-          "id": "tx-frequency-min",
-          "label": "tx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "tx-frequency-max",
-          "label": "tx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-min",
-          "label": "rx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-max",
-          "label": "rx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "adaptive-modulation-is-avail",
-          "label": "adaptive-modulation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of adaptive modulation, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-is-avail",
-          "label": "mimo-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of MIMO, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-channels",
-          "label": "mimo-channels",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration."
-        },
-        {
-          "id": "alic-is-avail",
-          "label": "alic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-is-avail",
-          "label": "atpc-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of ATPC, this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-range",
-          "label": "atpc-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Extent of the ATPC range."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if payload encryption is available."
-        },
-        {
-          "id": "maintenance-timer-range",
-          "label": "maintenance-timer-range",
-          "uiType": "string",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360')."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "supported-loop-back-kind-list",
-          "label": "supported-loop-back-kind-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of supported kinds of looping back of header information to the remote site."
-        },
-        {
-          "id": "supported-channel-plan-list",
-          "label": "supported-channel-plan-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e2528",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of channel spacing that are supported by the device."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2528",
-      "parentView": "d1e2199",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-capability",
-      "dataPath": "air-interface-capability/supported-channel-plan-list/$$INDEX:0:supported-channel-plan$$",
-      "name": "supported-channel-plan-list",
-      "language": "en-US",
-      "title": "supported-channel-plan-list",
-      "elements": [
-        {
-          "id": "supported-channel-plan",
-          "label": "supported-channel-plan",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database."
-        },
-        {
-          "id": "duplex-distance-is-variable",
-          "label": "duplex-distance-is-variable",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be set on 'true', if the distance between transmitted and received frequency is variable."
-        },
-        {
-          "id": "duplex-distance",
-          "label": "duplex-distance",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Distance between transmitted and received frequency."
-        },
-        {
-          "id": "auto-freq-select-is-avail",
-          "label": "auto-freq-select-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'."
-        },
-        {
-          "id": "transmission-mode-list",
-          "label": "transmission-mode-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e217",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "List of channel spacing that are supported by the device."
-    },
-    {
-      "id": "d1e217",
-      "parentView": "d1e2528",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-capability",
-      "dataPath": "air-interface-capability/supported-channel-plan-list/$$INDEX:0:supported-channel-plan$$/transmission-mode-list/$$INDEX:1:transmission-mode-id$$",
-      "name": "transmission-mode-list",
-      "language": "en-US",
-      "title": "transmission-mode-list",
-      "elements": [
-        {
-          "id": "transmission-mode-id",
-          "label": "transmission-mode-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indentifies the transmissionMode for internal reference."
-        },
-        {
-          "id": "channel-bandwidth",
-          "label": "channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "modulation-scheme",
-          "label": "modulation-scheme",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256')."
-        },
-        {
-          "id": "code-rate",
-          "label": "code-rate",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the coding scheme in % (Net bit rate ? Gross bit rate ? code rate)."
-        },
-        {
-          "id": "tx-power-min",
-          "label": "tx-power-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "tx-power-max",
-          "label": "tx-power-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "rx-threshold",
-          "label": "rx-threshold",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less."
-        },
-        {
-          "id": "am-upshift-level",
-          "label": "am-upshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded to shift into a higher modulation scheme."
-        },
-        {
-          "id": "am-downshift-level",
-          "label": "am-downshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme."
-        },
-        {
-          "id": "xpic-is-avail",
-          "label": "xpic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2212",
-      "parentView": "d1e2181",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-configuration",
-      "dataPath": "air-interface-configuration",
-      "name": "air-interface-configuration",
-      "language": "en-US",
-      "title": "air-interface-configuration",
-      "elements": [
-        {
-          "id": "air-interface-name",
-          "label": "air-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Operator specific microwave link ID (often used for coding area, type of element and sequential number)."
-        },
-        {
-          "id": "radio-signal-id",
-          "label": "radio-signal-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check."
-        },
-        {
-          "id": "tx-frequency",
-          "label": "tx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable."
-        },
-        {
-          "id": "rx-frequency",
-          "label": "rx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the receive channel."
-        },
-        {
-          "id": "tx-channel-bandwidth",
-          "label": "tx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "rx-channel-bandwidth",
-          "label": "rx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "polarization",
-          "label": "polarization",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            },
-            {
-              "key": "horizontal",
-              "value": "horizontal",
-              "description": "none"
-            },
-            {
-              "key": "vertical",
-              "value": "vertical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows documenting the polarization of the air interface."
-        },
-        {
-          "id": "power-is-on",
-          "label": "power-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'."
-        },
-        {
-          "id": "transmitter-is-on",
-          "label": "transmitter-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of the transmitter inside the radio shall be expressed as a 'true'."
-        },
-        {
-          "id": "receiver-is-on",
-          "label": "receiver-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations."
-        },
-        {
-          "id": "tx-power",
-          "label": "tx-power",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC."
-        },
-        {
-          "id": "adaptive-modulation-is-on",
-          "label": "adaptive-modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'."
-        },
-        {
-          "id": "modulation-min",
-          "label": "modulation-min",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "modulation-max",
-          "label": "modulation-max",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "xpic-is-on",
-          "label": "xpic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'."
-        },
-        {
-          "id": "mimo-is-on",
-          "label": "mimo-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-on",
-          "label": "alic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-on",
-          "label": "atpc-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-thresh-upper",
-          "label": "atpc-thresh-upper",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power."
-        },
-        {
-          "id": "atpc-thresh-lower",
-          "label": "atpc-thresh-lower",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power."
-        },
-        {
-          "id": "auto-freq-select-is-on",
-          "label": "auto-freq-select-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-range",
-          "label": "auto-freq-select-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen."
-        },
-        {
-          "id": "modulation-is-on",
-          "label": "modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into ciphertext data."
-        },
-        {
-          "id": "loop-back-kind-on",
-          "label": "loop-back-kind-on",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "maintenance-timer",
-          "label": "maintenance-timer",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e2931",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2931",
-      "parentView": "d1e2212",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-configuration",
-      "dataPath": "air-interface-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "d1e2223",
-      "parentView": "d1e2181",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-status",
-      "dataPath": "air-interface-status",
-      "name": "air-interface-status",
-      "language": "en-US",
-      "title": "air-interface-status",
-      "elements": [
-        {
-          "id": "tx-frequency-cur",
-          "label": "tx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated transmit channel."
-        },
-        {
-          "id": "rx-frequency-cur",
-          "label": "rx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated receive channel."
-        },
-        {
-          "id": "tx-level-cur",
-          "label": "tx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current transmit level."
-        },
-        {
-          "id": "rx-level-cur",
-          "label": "rx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current receive level."
-        },
-        {
-          "id": "modulation-cur",
-          "label": "modulation-cur",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "code-rate-cur",
-          "label": "code-rate-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate)."
-        },
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-cur",
-          "label": "xpd-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-cur",
-          "label": "rf-temp-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Air Interface entered its current operational status."
-        },
-        {
-          "id": "radio-power-is-up",
-          "label": "radio-power-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the radio unit has power and is switched on, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "link-is-up",
-          "label": "link-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "xpic-is-up",
-          "label": "xpic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "mimo-is-up",
-          "label": "mimo-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-up",
-          "label": "alic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-up",
-          "label": "atpc-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-is-up",
-          "label": "auto-freq-select-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "loop-back-kind-up",
-          "label": "loop-back-kind-up",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "local-end-point-id",
-          "label": "local-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link."
-        },
-        {
-          "id": "remote-end-point-id",
-          "label": "remote-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2237",
-      "parentView": "d1e2181",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-current-problems",
-      "dataPath": "air-interface-current-problems",
-      "name": "air-interface-current-problems",
-      "language": "en-US",
-      "title": "air-interface-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3286",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3286",
-      "parentView": "d1e2237",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-current-problems",
-      "dataPath": "air-interface-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2250",
-      "parentView": "d1e2181",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-current-performance",
-      "dataPath": "air-interface-current-performance",
-      "name": "air-interface-current-performance",
-      "language": "en-US",
-      "title": "air-interface-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3310",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3310",
-      "parentView": "d1e2250",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-current-performance",
-      "dataPath": "air-interface-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e1232",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "d1e1232",
-      "parentView": "d1e3310",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-current-performance",
-      "dataPath": "air-interface-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds."
-        },
-        {
-          "id": "tx-level-min",
-          "label": "tx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-max",
-          "label": "tx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-avg",
-          "label": "tx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged transmit power. Signed integers are required."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. Signed integers are required."
-        },
-        {
-          "id": "time2-states",
-          "label": "time2-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated in e.g. BPSK."
-        },
-        {
-          "id": "time4-states-s",
-          "label": "time4-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4-states",
-          "label": "time4-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8-states",
-          "label": "time8-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states-s",
-          "label": "time16-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states",
-          "label": "time16-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time32-states",
-          "label": "time32-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time64-states",
-          "label": "time64-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time128-states",
-          "label": "time128-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time256-states",
-          "label": "time256-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states",
-          "label": "time512-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states-l",
-          "label": "time512-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states",
-          "label": "time1024-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states-l",
-          "label": "time1024-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states",
-          "label": "time2048-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states-l",
-          "label": "time2048-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states",
-          "label": "time4096-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states-l",
-          "label": "time4096-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states",
-          "label": "time8192-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states-l",
-          "label": "time8192-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-min",
-          "label": "xpd-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-max",
-          "label": "xpd-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-avg",
-          "label": "xpd-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-min",
-          "label": "rf-temp-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-max",
-          "label": "rf-temp-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-avg",
-          "label": "rf-temp-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "defect-blocks-sum",
-          "label": "defect-blocks-sum",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "blocks",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of blocks that were defect after receiving and could not be corrected by the FEC."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2263",
-      "parentView": "d1e2181",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-historical-performances",
-      "dataPath": "air-interface-historical-performances",
-      "name": "air-interface-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3339",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3339",
-      "parentView": "d1e2263",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-historical-performances",
-      "dataPath": "air-interface-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e1256",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e1256",
-      "parentView": "d1e3339",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPUUID$$/air-interface-historical-performances",
-      "dataPath": "air-interface-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds."
-        },
-        {
-          "id": "tx-level-min",
-          "label": "tx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-max",
-          "label": "tx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-avg",
-          "label": "tx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged transmit power. Signed integers are required."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. Signed integers are required."
-        },
-        {
-          "id": "time2-states",
-          "label": "time2-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated in e.g. BPSK."
-        },
-        {
-          "id": "time4-states-s",
-          "label": "time4-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4-states",
-          "label": "time4-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8-states",
-          "label": "time8-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states-s",
-          "label": "time16-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states",
-          "label": "time16-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time32-states",
-          "label": "time32-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time64-states",
-          "label": "time64-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time128-states",
-          "label": "time128-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time256-states",
-          "label": "time256-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states",
-          "label": "time512-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states-l",
-          "label": "time512-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states",
-          "label": "time1024-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states-l",
-          "label": "time1024-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states",
-          "label": "time2048-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states-l",
-          "label": "time2048-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states",
-          "label": "time4096-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states-l",
-          "label": "time4096-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states",
-          "label": "time8192-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states-l",
-          "label": "time8192-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-min",
-          "label": "xpd-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-max",
-          "label": "xpd-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-avg",
-          "label": "xpd-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-min",
-          "label": "rf-temp-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-max",
-          "label": "rf-temp-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-avg",
-          "label": "rf-temp-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "defect-blocks-sum",
-          "label": "defect-blocks-sum",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "blocks",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of blocks that were defect after receiving and could not be corrected by the FEC."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3361",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:co-channel-group/$$INDEX:0:co-channel-group-id$$",
-      "dataPath": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:co-channel-group/$$INDEX:0:co-channel-group-id$$",
-      "name": "co-channel-group",
-      "language": "en-US",
-      "title": "co-channel-group",
-      "elements": [
-        {
-          "id": "co-channel-group-id",
-          "label": "co-channel-group-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "sort-of-co-channel-group",
-          "label": "sort-of-co-channel-group",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';"
-        },
-        {
-          "id": "air-interface-list",
-          "label": "air-interface-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group."
-        },
-        {
-          "id": "logical-termination-point",
-          "label": "logical-termination-point",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3435",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-hsb-end-point-pac/$$ENDPOINT$$",
-      "dataPath": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-hsb-end-point-pac/$$ENDPOINT$$",
-      "name": "mw-air-interface-hsb-end-point-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-hsb-end-point-pac",
-      "elements": [
-        {
-          "id": "role",
-          "label": "role",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "working",
-              "value": "working",
-              "description": "none"
-            },
-            {
-              "key": "protection",
-              "value": "protection",
-              "description": "none"
-            },
-            {
-              "key": "protected",
-              "value": "protected",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "endpoint",
-          "label": "endpoint",
-          "uiType": "string",
-          "leafrefPath": "/core-model:forwarding-construct/core-model:fc-port/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC. The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point."
-    },
-    {
-      "id": "d1e3474",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-hsb-fc-switch-pac/$$FCSWITCH$$",
-      "dataPath": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-hsb-fc-switch-pac/$$FCSWITCH$$",
-      "name": "mw-air-interface-hsb-fc-switch-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-hsb-fc-switch-pac",
-      "elements": [
-        {
-          "id": "prot-type",
-          "label": "prot-type",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "hsb",
-              "value": "hsb",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the protection scheme that is used for the ProtectionGroup."
-        },
-        {
-          "id": "air-interface-hsb-configuration-is-faulty-severity",
-          "label": "air-interface-hsb-configuration-is-faulty-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity of an airInterfaceHsbConfigurationIsFaulty alarm shall be chosen from an enumeration."
-        },
-        {
-          "id": "air-interface-hsb-is-partly-down-severity",
-          "label": "air-interface-hsb-is-partly-down-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity for one link out of the HSB configuration being down shall be chosen from an enumeration."
-        },
-        {
-          "id": "air-interface-hsb-is-down-severity",
-          "label": "air-interface-hsb-is-down-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity of the total HSB configuration being down shall be chosen from an enumeration."
-        },
-        {
-          "id": "fcswitch",
-          "label": "fcswitch",
-          "uiType": "string",
-          "leafrefPath": "/core-model:forwarding-construct/core-model:fc-switch/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as 1+1 ane 1:1). May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state."
-    },
-    {
-      "id": "d1e3552",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-air-interface-diversity-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-diversity-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "air-interface-diversity-capability",
-          "label": "air-interface-diversity-capability",
-          "uiType": "object",
-          "viewId": "d1e3570",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-configuration",
-          "label": "air-interface-diversity-configuration",
-          "uiType": "object",
-          "viewId": "d1e3583",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-status",
-          "label": "air-interface-diversity-status",
-          "uiType": "object",
-          "viewId": "d1e3594",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-current-problems",
-          "label": "air-interface-diversity-current-problems",
-          "uiType": "object",
-          "viewId": "d1e3608",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-current-performance",
-          "label": "air-interface-diversity-current-performance",
-          "uiType": "object",
-          "viewId": "d1e3621",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-historical-performances",
-          "label": "air-interface-diversity-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e3634",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3570",
-      "parentView": "d1e3552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-capability",
-      "dataPath": "air-interface-diversity-capability",
-      "name": "air-interface-diversity-capability",
-      "language": "en-US",
-      "title": "air-interface-diversity-capability",
-      "elements": [
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "available-kinds-of-diversity",
-          "label": "available-kinds-of-diversity",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3656",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available types of diversity to be listed."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3656",
-      "parentView": "d1e3570",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-capability",
-      "dataPath": "air-interface-diversity-capability/available-kinds-of-diversity/$$INDEX:0:diversity-name$$",
-      "name": "available-kinds-of-diversity",
-      "language": "en-US",
-      "title": "available-kinds-of-diversity",
-      "elements": [
-        {
-          "id": "diversity-name",
-          "label": "diversity-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'"
-        },
-        {
-          "id": "number-of-air-interfaces-max",
-          "label": "number-of-air-interfaces-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "air interfaces",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number of air interfaces that could be part of this kind of diversity."
-        }
-      ],
-      "description": "Available types of diversity to be listed."
-    },
-    {
-      "id": "d1e3583",
-      "parentView": "d1e3552",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-configuration",
-      "dataPath": "air-interface-diversity-configuration",
-      "name": "air-interface-diversity-configuration",
-      "language": "en-US",
-      "title": "air-interface-diversity-configuration",
-      "elements": [
-        {
-          "id": "air-interface-diversity",
-          "label": "air-interface-diversity",
-          "uiType": "object",
-          "viewId": "d1e3695",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of air interface diversity configured at the link."
-        },
-        {
-          "id": "air-interface-ltp-list",
-          "label": "air-interface-ltp-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax"
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3722",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3695",
-      "parentView": "d1e3583",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-configuration",
-      "dataPath": "air-interface-diversity-configuration/air-interface-diversity",
-      "name": "air-interface-diversity",
-      "language": "en-US",
-      "title": "air-interface-diversity",
-      "elements": [
-        {
-          "id": "diversity-name",
-          "label": "diversity-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'"
-        },
-        {
-          "id": "number-of-air-interfaces-max",
-          "label": "number-of-air-interfaces-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "air interfaces",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number of air interfaces that could be part of this kind of diversity."
-        }
-      ],
-      "description": "Type of air interface diversity configured at the link."
-    },
-    {
-      "id": "d1e3722",
-      "parentView": "d1e3583",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-configuration",
-      "dataPath": "air-interface-diversity-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "d1e3594",
-      "parentView": "d1e3552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-status",
-      "dataPath": "air-interface-diversity-status",
-      "name": "air-interface-diversity-status",
-      "language": "en-US",
-      "title": "air-interface-diversity-status",
-      "elements": [
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "air-interface-diversity-status",
-          "label": "air-interface-diversity-status",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "group-down",
-              "value": "group-down",
-              "description": "All air interfaces that are members of the diversity configuration are down."
-            },
-            {
-              "key": "not-all-ai-active",
-              "value": "not-all-ai-active",
-              "description": "At least one, but not all of the air interfaces that are part of the diversity configuration is not working."
-            },
-            {
-              "key": "all-ai-active",
-              "value": "all-ai-active",
-              "description": "All air interfaces that are part of the diversity configuration are working."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the air interface bundle."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Diversity Group entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3608",
-      "parentView": "d1e3552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-current-problems",
-      "dataPath": "air-interface-diversity-current-problems",
-      "name": "air-interface-diversity-current-problems",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3802",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3802",
-      "parentView": "d1e3608",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-current-problems",
-      "dataPath": "air-interface-diversity-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3621",
-      "parentView": "d1e3552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-current-performance",
-      "dataPath": "air-interface-diversity-current-performance",
-      "name": "air-interface-diversity-current-performance",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3827",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3827",
-      "parentView": "d1e3621",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-current-performance",
-      "dataPath": "air-interface-diversity-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e1542",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "d1e1542",
-      "parentView": "d1e3827",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-current-performance",
-      "dataPath": "air-interface-diversity-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Average signal to (noise+interference) ratio of the combined signals."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3634",
-      "parentView": "d1e3552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-historical-performances",
-      "dataPath": "air-interface-diversity-historical-performances",
-      "name": "air-interface-diversity-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-diversity-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e3856",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3856",
-      "parentView": "d1e3634",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-historical-performances",
-      "dataPath": "air-interface-diversity-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e1566",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e1566",
-      "parentView": "d1e3856",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-diversity-pac/$$LPUUID$$/air-interface-diversity-historical-performances",
-      "dataPath": "air-interface-diversity-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Average signal to (noise+interference) ratio of the combined signals."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3878",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-pure-ethernet-structure-pac",
-      "language": "en-US",
-      "title": "mw-pure-ethernet-structure-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "pure-ethernet-structure-capability",
-          "label": "pure-ethernet-structure-capability",
-          "uiType": "object",
-          "viewId": "d1e3898",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-configuration",
-          "label": "pure-ethernet-structure-configuration",
-          "uiType": "object",
-          "viewId": "d1e3911",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-status",
-          "label": "pure-ethernet-structure-status",
-          "uiType": "object",
-          "viewId": "d1e3923",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-current-problems",
-          "label": "pure-ethernet-structure-current-problems",
-          "uiType": "object",
-          "viewId": "d1e3936",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-current-performance",
-          "label": "pure-ethernet-structure-current-performance",
-          "uiType": "object",
-          "viewId": "d1e3949",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-historical-performances",
-          "label": "pure-ethernet-structure-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e3962",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only."
-    },
-    {
-      "id": "d1e3898",
-      "parentView": "d1e3878",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-capability",
-      "dataPath": "pure-ethernet-structure-capability",
-      "name": "pure-ethernet-structure-capability",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3911",
-      "parentView": "d1e3878",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-configuration",
-      "dataPath": "pure-ethernet-structure-configuration",
-      "name": "pure-ethernet-structure-configuration",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-configuration",
-      "elements": [
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4021",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4021",
-      "parentView": "d1e3911",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-configuration",
-      "dataPath": "pure-ethernet-structure-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the type of problem to be configured."
-    },
-    {
-      "id": "d1e3923",
-      "parentView": "d1e3878",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-status",
-      "dataPath": "pure-ethernet-structure-status",
-      "name": "pure-ethernet-structure-status",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        },
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "object",
-          "viewId": "d1e4043",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the Ethernet transport segment. Always just one segment."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4043",
-      "parentView": "d1e3923",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-status",
-      "dataPath": "pure-ethernet-structure-status/segment-status-list",
-      "name": "segment-status-list",
-      "language": "en-US",
-      "title": "segment-status-list",
-      "elements": [
-        {
-          "id": "segment-status-type-id",
-          "label": "segment-status-type-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-is-reserved-for-tdm",
-          "label": "segment-is-reserved-for-tdm",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm."
-        },
-        {
-          "id": "operational-status",
-          "label": "operational-status",
-          "uiType": "core-model:operational-state",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current operational status of each segment."
-        },
-        {
-          "id": "obsolete-priority-class",
-          "label": "obsolete-priority-class",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank."
-        },
-        {
-          "id": "obsolete-drop-order-rank",
-          "label": "obsolete-drop-order-rank",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. _unique: within Structure::StructureStatus::segmentStatusList"
-        }
-      ],
-      "description": "Status of the Ethernet transport segment. Always just one segment."
-    },
-    {
-      "id": "d1e3936",
-      "parentView": "d1e3878",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-current-problems",
-      "dataPath": "pure-ethernet-structure-current-problems",
-      "name": "pure-ethernet-structure-current-problems",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4081",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4081",
-      "parentView": "d1e3936",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-current-problems",
-      "dataPath": "pure-ethernet-structure-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e3949",
-      "parentView": "d1e3878",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-current-performance",
-      "dataPath": "pure-ethernet-structure-current-performance",
-      "name": "pure-ethernet-structure-current-performance",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4105",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4105",
-      "parentView": "d1e3949",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-current-performance",
-      "dataPath": "pure-ethernet-structure-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "d1e3962",
-      "parentView": "d1e3878",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-historical-performances",
-      "dataPath": "pure-ethernet-structure-historical-performances",
-      "name": "pure-ethernet-structure-historical-performances",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4134",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4134",
-      "parentView": "d1e3962",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-pure-ethernet-structure-pac/$$LPUUID$$/pure-ethernet-structure-historical-performances",
-      "dataPath": "pure-ethernet-structure-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4165",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-hybrid-mw-structure-pac",
-      "language": "en-US",
-      "title": "mw-hybrid-mw-structure-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "hybrid-mw-structure-capability",
-          "label": "hybrid-mw-structure-capability",
-          "uiType": "object",
-          "viewId": "d1e4185",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-configuration",
-          "label": "hybrid-mw-structure-configuration",
-          "uiType": "object",
-          "viewId": "d1e4198",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-status",
-          "label": "hybrid-mw-structure-status",
-          "uiType": "object",
-          "viewId": "d1e4210",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-current-problems",
-          "label": "hybrid-mw-structure-current-problems",
-          "uiType": "object",
-          "viewId": "d1e4223",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-current-performance",
-          "label": "hybrid-mw-structure-current-performance",
-          "uiType": "object",
-          "viewId": "d1e4236",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-historical-performances",
-          "label": "hybrid-mw-structure-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e4249",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic."
-    },
-    {
-      "id": "d1e4185",
-      "parentView": "d1e4165",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-capability",
-      "dataPath": "hybrid-mw-structure-capability",
-      "name": "hybrid-mw-structure-capability",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-tdm-structure-types-list",
-          "label": "supported-tdm-structure-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4284",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM frame types that are supported."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4284",
-      "parentView": "d1e4185",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-capability",
-      "dataPath": "hybrid-mw-structure-capability/supported-tdm-structure-types-list/$$INDEX:0:tdm-structure-name$$",
-      "name": "supported-tdm-structure-types-list",
-      "language": "en-US",
-      "title": "supported-tdm-structure-types-list",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "Lists the TDM frame types that are supported."
-    },
-    {
-      "id": "d1e4198",
-      "parentView": "d1e4165",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-configuration",
-      "dataPath": "hybrid-mw-structure-configuration",
-      "name": "hybrid-mw-structure-configuration",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-configuration",
-      "elements": [
-        {
-          "id": "number-of-tdm-segments-to-be-reserved",
-          "label": "number-of-tdm-segments-to-be-reserved",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType"
-        },
-        {
-          "id": "structure-type",
-          "label": "structure-type",
-          "uiType": "object",
-          "viewId": "d1e4326",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "TDM frame to be applied."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4350",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4326",
-      "parentView": "d1e4198",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-configuration",
-      "dataPath": "hybrid-mw-structure-configuration/structure-type",
-      "name": "structure-type",
-      "language": "en-US",
-      "title": "structure-type",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "TDM frame to be applied."
-    },
-    {
-      "id": "d1e4350",
-      "parentView": "d1e4198",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-configuration",
-      "dataPath": "hybrid-mw-structure-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the type of problem to be configured."
-    },
-    {
-      "id": "d1e4210",
-      "parentView": "d1e4165",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-status",
-      "dataPath": "hybrid-mw-structure-status",
-      "name": "hybrid-mw-structure-status",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        },
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4372",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4372",
-      "parentView": "d1e4210",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-status",
-      "dataPath": "hybrid-mw-structure-status/segment-status-list/$$INDEX:0:segment-status-type-id$$",
-      "name": "segment-status-list",
-      "language": "en-US",
-      "title": "segment-status-list",
-      "elements": [
-        {
-          "id": "segment-status-type-id",
-          "label": "segment-status-type-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-is-reserved-for-tdm",
-          "label": "segment-is-reserved-for-tdm",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm."
-        },
-        {
-          "id": "operational-status",
-          "label": "operational-status",
-          "uiType": "core-model:operational-state",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current operational status of each segment."
-        },
-        {
-          "id": "obsolete-priority-class",
-          "label": "obsolete-priority-class",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank."
-        },
-        {
-          "id": "obsolete-drop-order-rank",
-          "label": "obsolete-drop-order-rank",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. _unique: within Structure::StructureStatus::segmentStatusList"
-        }
-      ],
-      "description": "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1"
-    },
-    {
-      "id": "d1e4223",
-      "parentView": "d1e4165",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-current-problems",
-      "dataPath": "hybrid-mw-structure-current-problems",
-      "name": "hybrid-mw-structure-current-problems",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4411",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4411",
-      "parentView": "d1e4223",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-current-problems",
-      "dataPath": "hybrid-mw-structure-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4236",
-      "parentView": "d1e4165",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-current-performance",
-      "dataPath": "hybrid-mw-structure-current-performance",
-      "name": "hybrid-mw-structure-current-performance",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4435",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4435",
-      "parentView": "d1e4236",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-current-performance",
-      "dataPath": "hybrid-mw-structure-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "d1e4249",
-      "parentView": "d1e4165",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-historical-performances",
-      "dataPath": "hybrid-mw-structure-historical-performances",
-      "name": "hybrid-mw-structure-historical-performances",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4464",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4464",
-      "parentView": "d1e4249",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-hybrid-mw-structure-pac/$$LPUUID$$/hybrid-mw-structure-historical-performances",
-      "dataPath": "hybrid-mw-structure-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4496",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-ethernet-container-pac",
-      "language": "en-US",
-      "title": "mw-ethernet-container-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "ethernet-container-capability",
-          "label": "ethernet-container-capability",
-          "uiType": "object",
-          "viewId": "d1e4514",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-configuration",
-          "label": "ethernet-container-configuration",
-          "uiType": "object",
-          "viewId": "d1e4527",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-status",
-          "label": "ethernet-container-status",
-          "uiType": "object",
-          "viewId": "d1e4538",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-current-problems",
-          "label": "ethernet-container-current-problems",
-          "uiType": "object",
-          "viewId": "d1e4552",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-current-performance",
-          "label": "ethernet-container-current-performance",
-          "uiType": "object",
-          "viewId": "d1e4565",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-historical-performances",
-          "label": "ethernet-container-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e4578",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4514",
-      "parentView": "d1e4496",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-capability",
-      "dataPath": "ethernet-container-capability",
-      "name": "ethernet-container-capability",
-      "language": "en-US",
-      "title": "ethernet-container-capability",
-      "elements": [
-        {
-          "id": "bundling-is-avail",
-          "label": "bundling-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container."
-        },
-        {
-          "id": "packet-compression-is-avail",
-          "label": "packet-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans."
-        },
-        {
-          "id": "layer2-compression-is-avail",
-          "label": "layer2-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 available at the device."
-        },
-        {
-          "id": "vlan-compression-is-avail",
-          "label": "vlan-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer available at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-avail",
-          "label": "q-in-q-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN available at the device."
-        },
-        {
-          "id": "mpls-compression-is-avail",
-          "label": "mpls-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on mpls layer available at the device."
-        },
-        {
-          "id": "ipv4-compression-is-avail",
-          "label": "ipv4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 available at the device."
-        },
-        {
-          "id": "ipv6-compression-is-avail",
-          "label": "ipv6-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 available at the device."
-        },
-        {
-          "id": "layer4-compression-is-avail",
-          "label": "layer4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) available at the device."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if Ethernet payload encryption is available."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4527",
-      "parentView": "d1e4496",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-configuration",
-      "dataPath": "ethernet-container-configuration",
-      "name": "ethernet-container-configuration",
-      "language": "en-US",
-      "title": "ethernet-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "packet-compression-is-on",
-          "label": "packet-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum."
-        },
-        {
-          "id": "layer2-compression-is-on",
-          "label": "layer2-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 configured at the device."
-        },
-        {
-          "id": "vlan-compression-is-on",
-          "label": "vlan-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer configured at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-on",
-          "label": "q-in-q-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN configured at the device."
-        },
-        {
-          "id": "mpls-compression-is-on",
-          "label": "mpls-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on MPLS layer configured at the device."
-        },
-        {
-          "id": "ipv4-compression-is-on",
-          "label": "ipv4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 configured at the device."
-        },
-        {
-          "id": "ipv6-compression-is-on",
-          "label": "ipv6-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 configured at the device."
-        },
-        {
-          "id": "layer4-compression-is-on",
-          "label": "layer4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) configured at the device."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the Ethernet payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into cipher text data."
-        },
-        {
-          "id": "segments-id-list",
-          "label": "segments-id-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4789",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4936",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4789",
-      "parentView": "d1e4527",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-configuration",
-      "dataPath": "ethernet-container-configuration/segments-id-list/$$INDEX:0:structure-id-ref$$/$$INDEX:0:segment-id-ref$$",
-      "name": "segments-id-list",
-      "language": "en-US",
-      "title": "segments-id-list",
-      "elements": [
-        {
-          "id": "structure-id-ref",
-          "label": "structure-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-id-ref",
-          "label": "segment-id-ref",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once."
-        }
-      ],
-      "description": "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list."
-    },
-    {
-      "id": "d1e4936",
-      "parentView": "d1e4527",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-configuration",
-      "dataPath": "ethernet-container-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "d1e4538",
-      "parentView": "d1e4496",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-status",
-      "dataPath": "ethernet-container-status",
-      "name": "ethernet-container-status",
-      "language": "en-US",
-      "title": "ethernet-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4552",
-      "parentView": "d1e4496",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-current-problems",
-      "dataPath": "ethernet-container-current-problems",
-      "name": "ethernet-container-current-problems",
-      "language": "en-US",
-      "title": "ethernet-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e4984",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4984",
-      "parentView": "d1e4552",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-current-problems",
-      "dataPath": "ethernet-container-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4565",
-      "parentView": "d1e4496",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-current-performance",
-      "dataPath": "ethernet-container-current-performance",
-      "name": "ethernet-container-current-performance",
-      "language": "en-US",
-      "title": "ethernet-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5008",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5008",
-      "parentView": "d1e4565",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-current-performance",
-      "dataPath": "ethernet-container-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e2135",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2135",
-      "parentView": "d1e5008",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-current-performance",
-      "dataPath": "ethernet-container-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e4578",
-      "parentView": "d1e4496",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-historical-performances",
-      "dataPath": "ethernet-container-historical-performances",
-      "name": "ethernet-container-historical-performances",
-      "language": "en-US",
-      "title": "ethernet-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5038",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5038",
-      "parentView": "d1e4578",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-historical-performances",
-      "dataPath": "ethernet-container-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e2159",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2159",
-      "parentView": "d1e5038",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-ethernet-container-pac/$$LPUUID$$/ethernet-container-historical-performances",
-      "dataPath": "ethernet-container-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5060",
-      "parentView": "",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$",
-      "dataPath": "",
-      "name": "mw-tdm-container-pac",
-      "language": "en-US",
-      "title": "mw-tdm-container-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "comment": "Please ignore this elements with field /leafrefPath/ for now.",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "tdm-container-capability",
-          "label": "tdm-container-capability",
-          "uiType": "object",
-          "viewId": "d1e5080",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-configuration",
-          "label": "tdm-container-configuration",
-          "uiType": "object",
-          "viewId": "d1e5093",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-status",
-          "label": "tdm-container-status",
-          "uiType": "object",
-          "viewId": "d1e5105",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-current-problems",
-          "label": "tdm-container-current-problems",
-          "uiType": "object",
-          "viewId": "d1e5118",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-current-performance",
-          "label": "tdm-container-current-performance",
-          "uiType": "object",
-          "viewId": "d1e5131",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-historical-performances",
-          "label": "tdm-container-historical-performances",
-          "uiType": "object",
-          "viewId": "d1e5144",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5080",
-      "parentView": "d1e5060",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-capability",
-      "dataPath": "tdm-container-capability",
-      "name": "tdm-container-capability",
-      "language": "en-US",
-      "title": "tdm-container-capability",
-      "elements": [
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-tdm-container-types-list",
-          "label": "supported-tdm-container-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5166",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM containers that are supported."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5166",
-      "parentView": "d1e5080",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-capability",
-      "dataPath": "tdm-container-capability/supported-tdm-container-types-list/$$INDEX:0:tdm-container-name$$",
-      "name": "supported-tdm-container-types-list",
-      "language": "en-US",
-      "title": "supported-tdm-container-types-list",
-      "elements": [
-        {
-          "id": "tdm-container-name",
-          "label": "tdm-container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-container-size",
-          "label": "tdm-container-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        }
-      ],
-      "description": "Lists the TDM containers that are supported."
-    },
-    {
-      "id": "d1e5093",
-      "parentView": "d1e5060",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-configuration",
-      "dataPath": "tdm-container-configuration",
-      "name": "tdm-container-configuration",
-      "language": "en-US",
-      "title": "tdm-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "container-type",
-          "label": "container-type",
-          "uiType": "object",
-          "viewId": "d1e5220",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of TDM container."
-        },
-        {
-          "id": "segment-id",
-          "label": "segment-id",
-          "uiType": "object",
-          "viewId": "d1e5231",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;"
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5242",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5220",
-      "parentView": "d1e5093",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-configuration",
-      "dataPath": "tdm-container-configuration/container-type",
-      "name": "container-type",
-      "language": "en-US",
-      "title": "container-type",
-      "elements": [
-        {
-          "id": "tdm-container-name",
-          "label": "tdm-container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-container-size",
-          "label": "tdm-container-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        }
-      ],
-      "description": "Type of TDM container."
-    },
-    {
-      "id": "d1e5231",
-      "parentView": "d1e5093",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-configuration",
-      "dataPath": "tdm-container-configuration/segment-id",
-      "name": "segment-id",
-      "language": "en-US",
-      "title": "segment-id",
-      "elements": [
-        {
-          "id": "structure-id-ref",
-          "label": "structure-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-id-ref",
-          "label": "segment-id-ref",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once."
-        }
-      ],
-      "description": "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;"
-    },
-    {
-      "id": "d1e5242",
-      "parentView": "d1e5093",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-configuration",
-      "dataPath": "tdm-container-configuration/problem-kind-severity-list/$$INDEX:0:problem-kind-name$$",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "d1e5105",
-      "parentView": "d1e5060",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-status",
-      "dataPath": "tdm-container-status",
-      "name": "tdm-container-status",
-      "language": "en-US",
-      "title": "tdm-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5118",
-      "parentView": "d1e5060",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-current-problems",
-      "dataPath": "tdm-container-current-problems",
-      "name": "tdm-container-current-problems",
-      "language": "en-US",
-      "title": "tdm-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5290",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5290",
-      "parentView": "d1e5118",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-current-problems",
-      "dataPath": "tdm-container-current-problems/current-problem-list/$$INDEX:0:sequence-number$$",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5131",
-      "parentView": "d1e5060",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-current-performance",
-      "dataPath": "tdm-container-current-performance",
-      "name": "tdm-container-current-performance",
-      "language": "en-US",
-      "title": "tdm-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5315",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5315",
-      "parentView": "d1e5131",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-current-performance",
-      "dataPath": "tdm-container-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e2135",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "d1e2135",
-      "parentView": "d1e5315",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-current-performance",
-      "dataPath": "tdm-container-current-performance/current-performance-data-list/$$INDEX:0:scanner-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5144",
-      "parentView": "d1e5060",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-historical-performances",
-      "dataPath": "tdm-container-historical-performances",
-      "name": "tdm-container-historical-performances",
-      "language": "en-US",
-      "title": "tdm-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "d1e5344",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e5344",
-      "parentView": "d1e5144",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-historical-performances",
-      "dataPath": "tdm-container-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "d1e2159",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "d1e2159",
-      "parentView": "d1e5344",
-      "url": "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-tdm-container-pac/$$LPUUID$$/tdm-container-historical-performances",
-      "dataPath": "tdm-container-historical-performances/historical-performance-data-list/$$INDEX:0:history-data-id$$/performance-data",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json.old b/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json.old
deleted file mode 100644
index 4fbd8bf27..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/assets/microwave-model@2017-03-24.json.old
+++ /dev/null
@@ -1,19680 +0,0 @@
-{
-  "views": [
-    {
-      "id": "microwave-model",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "microwave-model",
-      "language": "en-US",
-      "title": "microwave-model",
-      "elements": [
-        {
-          "id": "mw-air-interface-pac",
-          "label": "mw-air-interface-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "co-channel-group",
-          "label": "co-channel-group",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:co-channel-group",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "mw-air-interface-hsb-end-point-pac",
-          "label": "mw-air-interface-hsb-end-point-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-air-interface-hsb-end-point-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC. The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point."
-        },
-        {
-          "id": "mw-air-interface-hsb-fc-switch-pac",
-          "label": "mw-air-interface-hsb-fc-switch-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-air-interface-hsb-fc-switch-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as 1+1 ane 1:1). May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state."
-        },
-        {
-          "id": "mw-air-interface-diversity-pac",
-          "label": "mw-air-interface-diversity-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "mw-pure-ethernet-structure-pac",
-          "label": "mw-pure-ethernet-structure-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only."
-        },
-        {
-          "id": "mw-hybrid-mw-structure-pac",
-          "label": "mw-hybrid-mw-structure-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic."
-        },
-        {
-          "id": "mw-ethernet-container-pac",
-          "label": "mw-ethernet-container-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "mw-tdm-container-pac",
-          "label": "mw-tdm-container-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The TdmContainer_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM traffic."
-        },
-        {
-          "id": "wire-interface-pac",
-          "label": "wire-interface-pac",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-pac",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "This module contains a collection of YANG definitions for managing wireless networks. This model is for vendor agnostic management of wireless network elements."
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-air-interface-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-pac",
-      "url" :"restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPID$$/",
-      "path" :"",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "air-interface-capability",
-          "label": "air-interface-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-configuration",
-          "label": "air-interface-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-status",
-          "label": "air-interface-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-current-problems",
-          "label": "air-interface-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-current-performance",
-          "label": "air-interface-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-historical-performances",
-          "label": "air-interface-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-pac:air-interface-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-capability",
-      "language": "en-US",
-      "title": "air-interface-capability",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPID$$/air-interface-capability",
-      "dataPath": "air-interface-capability",
-      "elements": [
-        {
-          "id": "type-of-equipment",
-          "label": "type-of-equipment",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware."
-        },
-        {
-          "id": "tx-frequency-min",
-          "label": "tx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "tx-frequency-max",
-          "label": "tx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-min",
-          "label": "rx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-max",
-          "label": "rx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "adaptive-modulation-is-avail",
-          "label": "adaptive-modulation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of adaptive modulation, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-is-avail",
-          "label": "mimo-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of MIMO, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-channels",
-          "label": "mimo-channels",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration."
-        },
-        {
-          "id": "alic-is-avail",
-          "label": "alic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-is-avail",
-          "label": "atpc-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of ATPC, this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-range",
-          "label": "atpc-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Extent of the ATPC range. This value represents a device specific maximum value. The actual range of the ATPC at a specific link might be limited by the difference between configured transmit power (AirInterface::AirInterfaceConfiguration::txPower) and minimum transmit power of the device (TypeDefinitions::TransmissionModeType::txPowerMin)."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if payload encryption is available."
-        },
-        {
-          "id": "maintenance-timer-range",
-          "label": "maintenance-timer-range",
-          "uiType": "string",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360')."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "supported-loop-back-kind-list",
-          "label": "supported-loop-back-kind-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of supported kinds of looping back of header information to the remote site."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','signalIDMismatching','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-channel-plan-list",
-          "label": "supported-channel-plan-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-capability-g:supported-channel-plan-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of channel spacing that are supported by the device."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-configuration",
-      "language": "en-US",
-      "title": "air-interface-configuration",
-      "elements": [
-        {
-          "id": "air-interface-name",
-          "label": "air-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Operator specific microwave link ID (often used for coding area, type of element and sequential number)."
-        },
-        {
-          "id": "remote-air-interface-name",
-          "label": "remote-air-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the air interface, which belongs to the same link, at the remote site."
-        },
-        {
-          "id": "expected-signal-id",
-          "label": "expected-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If set on '0', the receiver ignores the signal ID of the received signal. If set on any other value, the receiver exclusively synchronizes on signals with the same signal ID."
-        },
-        {
-          "id": "transmitted-signal-id",
-          "label": "transmitted-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmitted radio signal ID for synchronizing the receiver."
-        },
-        {
-          "id": "radio-signal-id",
-          "label": "radio-signal-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check."
-        },
-        {
-          "id": "tx-frequency",
-          "label": "tx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable."
-        },
-        {
-          "id": "rx-frequency",
-          "label": "rx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the receive channel."
-        },
-        {
-          "id": "transmission-mode-min",
-          "label": "transmission-mode-min",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmission mode to be configured (in case adaptive modulation is not used, this value represents also the fixed transmission mode)."
-        },
-        {
-          "id": "transmission-mode-max",
-          "label": "transmission-mode-max",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmission mode to be configured."
-        },
-        {
-          "id": "tx-channel-bandwidth",
-          "label": "tx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "rx-channel-bandwidth",
-          "label": "rx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "polarization",
-          "label": "polarization",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            },
-            {
-              "key": "horizontal",
-              "value": "horizontal",
-              "description": "none"
-            },
-            {
-              "key": "vertical",
-              "value": "vertical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows documenting the polarization of the air interface."
-        },
-        {
-          "id": "power-is-on",
-          "label": "power-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'."
-        },
-        {
-          "id": "transmitter-is-on",
-          "label": "transmitter-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of the transmitter inside the radio shall be expressed as a 'true'."
-        },
-        {
-          "id": "receiver-is-on",
-          "label": "receiver-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations."
-        },
-        {
-          "id": "tx-power",
-          "label": "tx-power",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC."
-        },
-        {
-          "id": "adaptive-modulation-is-on",
-          "label": "adaptive-modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'."
-        },
-        {
-          "id": "modulation-min",
-          "label": "modulation-min",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "modulation-max",
-          "label": "modulation-max",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "xpic-is-on",
-          "label": "xpic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'."
-        },
-        {
-          "id": "mimo-is-on",
-          "label": "mimo-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-on",
-          "label": "alic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-on",
-          "label": "atpc-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-thresh-upper",
-          "label": "atpc-thresh-upper",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power."
-        },
-        {
-          "id": "atpc-thresh-lower",
-          "label": "atpc-thresh-lower",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power."
-        },
-        {
-          "id": "atpc-tx-power-min",
-          "label": "atpc-tx-power-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmit power, which is not to be undercut, while operating ATPC."
-        },
-        {
-          "id": "auto-freq-select-is-on",
-          "label": "auto-freq-select-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-range",
-          "label": "auto-freq-select-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen."
-        },
-        {
-          "id": "modulation-is-on",
-          "label": "modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into ciphertext data."
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "loop-back-kind-on",
-          "label": "loop-back-kind-on",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "maintenance-timer",
-          "label": "maintenance-timer",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange."
-        },
-        {
-          "id": "threshold-cross-alarm-list",
-          "label": "threshold-cross-alarm-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-configuration-g:threshold-cross-alarm-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of threshold cross alarms to be configured."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-status",
-      "language": "en-US",
-      "title": "air-interface-status",
-      "elements": [
-        {
-          "id": "tx-frequency-cur",
-          "label": "tx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated transmit channel."
-        },
-        {
-          "id": "rx-frequency-cur",
-          "label": "rx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated receive channel."
-        },
-        {
-          "id": "tx-level-cur",
-          "label": "tx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current transmit level."
-        },
-        {
-          "id": "rx-level-cur",
-          "label": "rx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current receive level."
-        },
-        {
-          "id": "transmission-mode-cur",
-          "label": "transmission-mode-cur",
-          "uiType": "string",
-          "leafrefPath": "/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently operated transmission mode according to definitions in Capabilities."
-        },
-        {
-          "id": "modulation-cur",
-          "label": "modulation-cur",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "code-rate-cur",
-          "label": "code-rate-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate)."
-        },
-        {
-          "id": "received-signal-id",
-          "label": "received-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the signal, which the receiver is currently synchronized on."
-        },
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-cur",
-          "label": "xpd-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-cur",
-          "label": "rf-temp-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Air Interface entered its current operational status."
-        },
-        {
-          "id": "radio-power-is-up",
-          "label": "radio-power-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the radio unit has power and is switched on, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "link-is-up",
-          "label": "link-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "xpic-is-up",
-          "label": "xpic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "mimo-is-up",
-          "label": "mimo-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-up",
-          "label": "alic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-up",
-          "label": "atpc-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-is-up",
-          "label": "auto-freq-select-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "loop-back-kind-up",
-          "label": "loop-back-kind-up",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "local-end-point-id",
-          "label": "local-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link."
-        },
-        {
-          "id": "remote-end-point-id",
-          "label": "remote-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-current-problems",
-      "language": "en-US",
-      "title": "air-interface-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-current-performance",
-      "language": "en-US",
-      "title": "air-interface-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-pac:air-interface-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:co-channel-group",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "co-channel-group",
-      "language": "en-US",
-      "title": "co-channel-group",
-      "elements": [
-        {
-          "id": "co-channel-group-id",
-          "label": "co-channel-group-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "sort-of-co-channel-group",
-          "label": "sort-of-co-channel-group",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';"
-        },
-        {
-          "id": "air-interface-list",
-          "label": "air-interface-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group."
-        },
-        {
-          "id": "logical-termination-point",
-          "label": "logical-termination-point",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-hsb-end-point-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-air-interface-hsb-end-point-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-hsb-end-point-pac",
-      "elements": [
-        {
-          "id": "role",
-          "label": "role",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "working",
-              "value": "working",
-              "description": "none"
-            },
-            {
-              "key": "protection",
-              "value": "protection",
-              "description": "none"
-            },
-            {
-              "key": "protected",
-              "value": "protected",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "endpoint",
-          "label": "endpoint",
-          "uiType": "string",
-          "leafrefPath": "/core-model:forwarding-construct/core-model:fc-port/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The EndPoint (EP) object class models the access to the FC function. Each EndPoint instance has a role (e.g., working, protection, protected, hub, spoke, leaf, root, etc.) with respect to the FC function. The association of the FC to LTPs is made via EndPoints (essentially the ports of the FC) where each EndPoint (EP) of the FC has a role in the context of the FC. The traffic forwarding between the associated End PointsEPs of the FC depends upon the type of FC and may be associated with FCSwitch object instances. In cases where there is protection conveys the protecting role of the access to the FC. The EP replaces the Protection Unit of a traditional protection model. It represents a protected (resilient/reliable) point or a protecting (unreliable working or protection) point."
-    },
-    {
-      "id": "microwave-model:mw-air-interface-hsb-fc-switch-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-air-interface-hsb-fc-switch-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-hsb-fc-switch-pac",
-      "elements": [
-        {
-          "id": "prot-type",
-          "label": "prot-type",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "hsb",
-              "value": "hsb",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the protection scheme that is used for the ProtectionGroup."
-        },
-        {
-          "id": "air-interface-hsb-configuration-is-faulty-severity",
-          "label": "air-interface-hsb-configuration-is-faulty-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity of an airInterfaceHsbConfigurationIsFaulty alarm shall be chosen from an enumeration."
-        },
-        {
-          "id": "air-interface-hsb-is-partly-down-severity",
-          "label": "air-interface-hsb-is-partly-down-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity for one link out of the HSB configuration being down shall be chosen from an enumeration."
-        },
-        {
-          "id": "air-interface-hsb-is-down-severity",
-          "label": "air-interface-hsb-is-down-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The level of severity of the total HSB configuration being down shall be chosen from an enumeration."
-        },
-        {
-          "id": "fcswitch",
-          "label": "fcswitch",
-          "uiType": "string",
-          "leafrefPath": "/core-model:forwarding-construct/core-model:fc-switch/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Represents and defines a protection switch structure encapsulated in the forwarding construct. Essentially performs the function of Protection Group. Associates to 2 or more Endpoints each playing the role of a Protection Unit. One or more protection EndPoints (standby/backup) provide protection for one or more working (i.e. regular/main/preferred) Endpoints where either protection or working can feed one or more protected Endpoint. May be used in revertive or non-revertive (symmetric) mode. When in revertive mode may define waitToRestore time. May be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as 1+1 ane 1:1). May be lockout (prevented from switching), force switched or manual switched. Will indicate switch state and change of state."
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-air-interface-diversity-pac",
-      "language": "en-US",
-      "title": "mw-air-interface-diversity-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "air-interface-diversity-capability",
-          "label": "air-interface-diversity-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-configuration",
-          "label": "air-interface-diversity-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-status",
-          "label": "air-interface-diversity-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-current-problems",
-          "label": "air-interface-diversity-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-current-performance",
-          "label": "air-interface-diversity-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-diversity-historical-performances",
-          "label": "air-interface-diversity-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-capability",
-      "language": "en-US",
-      "title": "air-interface-diversity-capability",
-      "elements": [
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the vendor."
-        },
-        {
-          "id": "available-kinds-of-diversity",
-          "label": "available-kinds-of-diversity",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-capability-g:available-kinds-of-diversity",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available types of diversity to be listed."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-configuration",
-      "language": "en-US",
-      "title": "air-interface-diversity-configuration",
-      "elements": [
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "air-interface-diversity",
-          "label": "air-interface-diversity",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:air-interface-diversity",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of air interface diversity configured at the link."
-        },
-        {
-          "id": "air-interface-ltp-list",
-          "label": "air-interface-ltp-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax"
-        },
-        {
-          "id": "threshold-cross-alarm-list",
-          "label": "threshold-cross-alarm-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:threshold-cross-alarm-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of threshold cross alarms to be configured."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-status",
-      "language": "en-US",
-      "title": "air-interface-diversity-status",
-      "elements": [
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "air-interface-diversity-status",
-          "label": "air-interface-diversity-status",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "group-down",
-              "value": "group-down",
-              "description": "All air interfaces that are members of the diversity configuration are down."
-            },
-            {
-              "key": "not-all-ai-active",
-              "value": "not-all-ai-active",
-              "description": "At least one, but not all of the air interfaces that are part of the diversity configuration is not working."
-            },
-            {
-              "key": "all-ai-active",
-              "value": "all-ai-active",
-              "description": "All air interfaces that are part of the diversity configuration are working."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the air interface bundle."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Diversity Group entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-current-problems",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-current-performance",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-air-interface-diversity-pac:air-interface-diversity-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-diversity-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-pure-ethernet-structure-pac",
-      "language": "en-US",
-      "title": "mw-pure-ethernet-structure-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "pure-ethernet-structure-capability",
-          "label": "pure-ethernet-structure-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-configuration",
-          "label": "pure-ethernet-structure-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-status",
-          "label": "pure-ethernet-structure-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-current-problems",
-          "label": "pure-ethernet-structure-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-current-performance",
-          "label": "pure-ethernet-structure-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "pure-ethernet-structure-historical-performances",
-          "label": "pure-ethernet-structure-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The pureEthernetStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting Ethernet traffic only."
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-capability",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-configuration",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-configuration",
-      "elements": [
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-status",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        },
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-status-g:segment-status-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the Ethernet transport segment. Always just one segment."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-current-problems",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-current-performance",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-pure-ethernet-structure-pac:pure-ethernet-structure-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "pure-ethernet-structure-historical-performances",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-hybrid-mw-structure-pac",
-      "language": "en-US",
-      "title": "mw-hybrid-mw-structure-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "hybrid-mw-structure-capability",
-          "label": "hybrid-mw-structure-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-configuration",
-          "label": "hybrid-mw-structure-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-status",
-          "label": "hybrid-mw-structure-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-current-problems",
-          "label": "hybrid-mw-structure-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-current-performance",
-          "label": "hybrid-mw-structure-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "hybrid-mw-structure-historical-performances",
-          "label": "hybrid-mw-structure-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The HybridMwStructure_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM and Ethernet traffic."
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-capability",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-tdm-structure-types-list",
-          "label": "supported-tdm-structure-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-capability-g:supported-tdm-structure-types-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM frame types that are supported."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-configuration",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-configuration",
-      "elements": [
-        {
-          "id": "number-of-tdm-segments-to-be-reserved",
-          "label": "number-of-tdm-segments-to-be-reserved",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType"
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "structure-kind",
-          "label": "structure-kind",
-          "uiType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:structure-kind",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "TDM frame to be applied."
-        },
-        {
-          "id": "structure-type",
-          "label": "structure-type",
-          "uiType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:structure-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "TDM frame to be applied."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-status",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        },
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-status-g:segment-status-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-current-problems",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-current-performance",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-hybrid-mw-structure-pac:hybrid-mw-structure-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "hybrid-mw-structure-historical-performances",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-ethernet-container-pac",
-      "language": "en-US",
-      "title": "mw-ethernet-container-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "ethernet-container-capability",
-          "label": "ethernet-container-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-configuration",
-          "label": "ethernet-container-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-status",
-          "label": "ethernet-container-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-current-problems",
-          "label": "ethernet-container-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-current-performance",
-          "label": "ethernet-container-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "ethernet-container-historical-performances",
-          "label": "ethernet-container-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-ethernet-container-pac:ethernet-container-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-capability",
-      "language": "en-US",
-      "title": "ethernet-container-capability",
-      "elements": [
-        {
-          "id": "bundling-is-avail",
-          "label": "bundling-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container."
-        },
-        {
-          "id": "packet-compression-is-avail",
-          "label": "packet-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans."
-        },
-        {
-          "id": "layer2-compression-is-avail",
-          "label": "layer2-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 available at the device."
-        },
-        {
-          "id": "vlan-compression-is-avail",
-          "label": "vlan-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer available at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-avail",
-          "label": "q-in-q-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN available at the device."
-        },
-        {
-          "id": "mpls-compression-is-avail",
-          "label": "mpls-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on mpls layer available at the device."
-        },
-        {
-          "id": "ipv4-compression-is-avail",
-          "label": "ipv4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 available at the device."
-        },
-        {
-          "id": "ipv6-compression-is-avail",
-          "label": "ipv6-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 available at the device."
-        },
-        {
-          "id": "layer4-compression-is-avail",
-          "label": "layer4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) available at the device."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if Ethernet payload encryption is available."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-configuration",
-      "language": "en-US",
-      "title": "ethernet-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "packet-compression-is-on",
-          "label": "packet-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum."
-        },
-        {
-          "id": "layer2-compression-is-on",
-          "label": "layer2-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 configured at the device."
-        },
-        {
-          "id": "vlan-compression-is-on",
-          "label": "vlan-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer configured at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-on",
-          "label": "q-in-q-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN configured at the device."
-        },
-        {
-          "id": "mpls-compression-is-on",
-          "label": "mpls-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on MPLS layer configured at the device."
-        },
-        {
-          "id": "ipv4-compression-is-on",
-          "label": "ipv4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 configured at the device."
-        },
-        {
-          "id": "ipv6-compression-is-on",
-          "label": "ipv6-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 configured at the device."
-        },
-        {
-          "id": "layer4-compression-is-on",
-          "label": "layer4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) configured at the device."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the Ethernet payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into cipher text data."
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "segments-id-list",
-          "label": "segments-id-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-configuration-g:segments-id-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-status",
-      "language": "en-US",
-      "title": "ethernet-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-current-problems",
-      "language": "en-US",
-      "title": "ethernet-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-current-performance",
-      "language": "en-US",
-      "title": "ethernet-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-ethernet-container-pac:ethernet-container-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "ethernet-container-historical-performances",
-      "language": "en-US",
-      "title": "ethernet-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "mw-tdm-container-pac",
-      "language": "en-US",
-      "title": "mw-tdm-container-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "tdm-container-capability",
-          "label": "tdm-container-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-configuration",
-          "label": "tdm-container-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-status",
-          "label": "tdm-container-status",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-current-problems",
-          "label": "tdm-container-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-current-performance",
-          "label": "tdm-container-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "tdm-container-historical-performances",
-          "label": "tdm-container-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:mw-tdm-container-pac:tdm-container-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "The TdmContainer_Pac and its attached classes MUST be provided on management interfaces of microwave devices, which are transporting TDM traffic."
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-capability",
-      "language": "en-US",
-      "title": "tdm-container-capability",
-      "elements": [
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-tdm-container-types-list",
-          "label": "supported-tdm-container-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-capability-g:supported-tdm-container-types-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM containers that are supported."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-configuration",
-      "language": "en-US",
-      "title": "tdm-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "container-type",
-          "label": "container-type",
-          "uiType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:container-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of TDM container."
-        },
-        {
-          "id": "segment-id",
-          "label": "segment-id",
-          "uiType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:segment-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;"
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-status",
-      "language": "en-US",
-      "title": "tdm-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-current-problems",
-      "language": "en-US",
-      "title": "tdm-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-current-performance",
-      "language": "en-US",
-      "title": "tdm-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-tdm-container-pac:tdm-container-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "tdm-container-historical-performances",
-      "language": "en-US",
-      "title": "tdm-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wire-interface-pac",
-      "language": "en-US",
-      "title": "wire-interface-pac",
-      "elements": [
-        {
-          "id": "layer-protocol",
-          "label": "layer-protocol",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:lp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "CoreModel-CoreNetworkModule-ObjectClasses:NetworkElement/_ltpRefList/_lpList/uuid"
-        },
-        {
-          "id": "wirebased-interface-capability",
-          "label": "wirebased-interface-capability",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-capability",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "wirebased-interface-configuration",
-          "label": "wirebased-interface-configuration",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-configuration",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "wirebased-interface-status",
-          "label": "wirebased-interface-status",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-status",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "wirebased-interface-current-problems",
-          "label": "wirebased-interface-current-problems",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-current-problems",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "wirebased-interface-current-performance",
-          "label": "wirebased-interface-current-performance",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-current-performance",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "wirebased-interface-historical-performances",
-          "label": "wirebased-interface-historical-performances",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-pac:wirebased-interface-historical-performances",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-capability",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-capability",
-      "language": "en-US",
-      "title": "wirebased-interface-capability",
-      "elements": [
-        {
-          "id": "auto-pmd-negotiation-is-avail",
-          "label": "auto-pmd-negotiation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = Indicates that device is supporting Auto-negotiation"
-        },
-        {
-          "id": "auto-pmd-negotiation-max-is-avail",
-          "label": "auto-pmd-negotiation-max-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that device is supporting definition of the maximum speed/Medium Attached Unit (MAU) automatically chosen when (autoNegotiationIsOn=1)"
-        },
-        {
-          "id": "maintenance-timer-range",
-          "label": "maintenance-timer-range",
-          "uiType": "string",
-          "unit": "Byte",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "MW IM Available time periods for maintenance configurations (e.g. the loop back) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360')."
-        },
-        {
-          "id": "supported-loop-back-kind-list",
-          "label": "supported-loop-back-kind-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of supported kinds of looping back of header information to the remote site. 802.3 45.2.1.12.1 PMA remote loopback ability"
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "available-mau-list",
-          "label": "available-mau-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-capability-g:available-mau-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of Medium Attachment Units (MAUs) that are available for being selected. If rate and service configuration (e.g. SFF-8079) are not supported, the MAU determined by hardware shall be described."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-configuration",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-configuration",
-      "language": "en-US",
-      "title": "wirebased-interface-configuration",
-      "elements": [
-        {
-          "id": "wire-interface-name",
-          "label": "wire-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Text field for the wire interface being named by the operator. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network Parameter"
-        },
-        {
-          "id": "remote-wire-interface-name",
-          "label": "remote-wire-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Learning from MW IM Text field for defining the wire interface this one is connected with. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network"
-        },
-        {
-          "id": "interface-is-on",
-          "label": "interface-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Activation of the interface (it gets powered and can be managed even if the transceiver is not yet transmitting or receiving). In case there is no Medium Attachment Unit (MAU) (e.g. no SFP in the cage) SETting (interfaceIsOn=1) must be ignored and GETing must return (interfaceIsOn=0) 802.3 according 30.3.2.2.1 acPhyAdminControl"
-        },
-        {
-          "id": "auto-pmd-negotiation-is-on",
-          "label": "auto-pmd-negotiation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = Auto-negotiation is switched on"
-        },
-        {
-          "id": "fixed-pmd",
-          "label": "fixed-pmd",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoPmdNegotiationIsOn=0) configuration of the concrete kind of Physical Medium Dependent (PMD). If (autoNegotiationIsOn=1) value of this field becomes irrelevant"
-        },
-        {
-          "id": "auto-pmd-negotiation-max",
-          "label": "auto-pmd-negotiation-max",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter If (autoNegotiationIsOn=1) AND (autoNegotiationMauMaxIsAvail=1) configuration of the maximum speed/Physical Medium Dependent (PMD), which is automatically chosen by Auto-negotiation"
-        },
-        {
-          "id": "auto-signal-ordering-is-on",
-          "label": "auto-signal-ordering-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = e.g. auto-MDI-X is switched on"
-        },
-        {
-          "id": "fixed-signal-ordering",
-          "label": "fixed-signal-ordering",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoSignalOrderingIsOn=0) configuration of the concrete kind of signal ordering on the media (e.g. MDI, or MDI-X). If (autoSignalOrderingIsOn=1) value of this field becomes irrelevant"
-        },
-        {
-          "id": "short-reach-mode-is-on",
-          "label": "short-reach-mode-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of the Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64"
-        },
-        {
-          "id": "unidirectional-operation-is-on",
-          "label": "unidirectional-operation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoNegotiationIsOn=1) OR manualDuplexSelection=0 (=half duplex), this bit is ignored. When autoNegotiationIsOn=0 AND manualDuplexSelection=1 (=full duplex): 1 = Enable transmit from media independent interface regardless of whether the PHY has determined that a valid link has been established, 0 = Enable transmit from media independent interface only when the PHY has determined that a valid link has been established 802.3 Parameter"
-        },
-        {
-          "id": "temperature-high-threshold",
-          "label": "temperature-high-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming high temperature values. Will move to somewhere in the Physical Segment of the Core IM"
-        },
-        {
-          "id": "temperature-low-threshold",
-          "label": "temperature-low-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming low temperature values. Will move to somewhere in the Physical Segment of the Core IM"
-        },
-        {
-          "id": "rxlevel-high-threshold",
-          "label": "rxlevel-high-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming high RX levels."
-        },
-        {
-          "id": "rxlevel-low-threshold",
-          "label": "rxlevel-low-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming low RX levels."
-        },
-        {
-          "id": "loop-back-kind-on",
-          "label": "loop-back-kind-on",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 802.3 according 22.2.4.1.2 Loopback Maintenance Feature. The currently configured type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site. Activation of local loopback mode on physical layer"
-        },
-        {
-          "id": "isolation-is-on",
-          "label": "isolation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Activation of the separation of the PHY from higher network layers 802.3"
-        },
-        {
-          "id": "restart-pmd-negotiation-is-on",
-          "label": "restart-pmd-negotiation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Restarts the auto negotiation process 802.3"
-        },
-        {
-          "id": "reset-mau-is-on",
-          "label": "reset-mau-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 Resets the entire Medium Access Unit (MAU)"
-        },
-        {
-          "id": "maintenance-timer",
-          "label": "maintenance-timer",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter and MW IM Time of existence of any maintenance configuration (e.g. the loop back). Valid values are defined in WireInterface::WireInterfaceCapability::maintenanceTimerRange"
-        },
-        {
-          "id": "transceiver-is-on-list",
-          "label": "transceiver-is-on-list",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 22.?.? and additionally 802.3 45.2.1.8 PMD transmit disable register (Register 1.9) 1 = Activation of the transmitter and receiver (e.g. laser) of the PHY; transceiverIsOnList[0]:total interface; transceiverIsOnList[1..10] different lanes of a multilane Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "wavelength-list",
-          "label": "wavelength-list",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Wavelength of the signal of laser in pico meter; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5 SFF-8690"
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-status",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-status",
-      "language": "en-US",
-      "title": "wirebased-interface-status",
-      "elements": [
-        {
-          "id": "interface-is-up",
-          "label": "interface-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according 30.3.2.1.7 aPhyAdminState 1 = A Physical layer entity (PHY) exists (including Medium Attachment Unit (e.g. SFP) ) and it is powered and can be managed"
-        },
-        {
-          "id": "pmd-is-up",
-          "label": "pmd-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Inverse of 802.3 45.2.1.2.3 Fault (1.1.7) If (interfaceIsUp=1) BUT 0 = there is a fault in either transmit or receive path"
-        },
-        {
-          "id": "pmd-cur",
-          "label": "pmd-cur",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the kind of Physical Medium Dependent (PMD) currently operated at this interface"
-        },
-        {
-          "id": "eee-is-up",
-          "label": "eee-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Energy Efficient Ethernet is supported at both ends of the link and it is activated"
-        },
-        {
-          "id": "link-is-up",
-          "label": "link-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = (transceiverIsUp=1) AND communication is established to the remote site"
-        },
-        {
-          "id": "link-is-idle",
-          "label": "link-is-idle",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = (linkIsUp=1) AND (eeeIsAvail=1) AND (eeeIsOn=1) AND link is currently in idle mode. If Energy Efficient Ethernet is not supported or switched off, this attribute must be 0."
-        },
-        {
-          "id": "tx-level-cur",
-          "label": "tx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current transmit power"
-        },
-        {
-          "id": "temp-cur",
-          "label": "temp-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current temperature (in degree Celsius) inside the transceiver To be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::DynamicDetails::PhysicalProperties"
-        },
-        {
-          "id": "loop-back-kind-up",
-          "label": "loop-back-kind-up",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Paramter and MW IM The currently active (not just configured) type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "signal-ordering-kind-cur",
-          "label": "signal-ordering-kind-cur",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-status-g:signal-ordering-kind-cur",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Reference on a SignalOrderingType for expressing the currently active way of ordering the signals on the physical medium. Must contain a value as defined in TypeDefinitions::SignalOrderingType::signalOrderingKindName"
-        },
-        {
-          "id": "receive-signal-is-detected",
-          "label": "receive-signal-is-detected",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 45.2.1.9 PMD receive signal detect 1 = Receiver (e.g. laser) detects signal; receiveSignalIsDetected[0]:total interface; receiveSignalIsDetected[1..10] different lanes of a multilane Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "rx-level-cur",
-          "label": "rx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current receive power; Also used for receive signal power measured at the Medium Dependent Interface (MDI) of 10GBASE-T during training as described in 802.3 55.4.3.1"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-current-problems",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-current-problems",
-      "language": "en-US",
-      "title": "wirebased-interface-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-current-performance",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-current-performance",
-      "language": "en-US",
-      "title": "wirebased-interface-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-pac:wirebased-interface-historical-performances",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "wirebased-interface-historical-performances",
-      "language": "en-US",
-      "title": "wirebased-interface-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:channel-plan-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-capability-g",
-      "object": "supported-channel-plan-list",
-      "name": "channel-plan-type",
-      "language": "en-US",
-      "title": "channel-plan-type",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPID$$/air-interface-capability",
-      "dataPath": "air-interface-capability/supported-channel-plan-list/$$INDEX0$$",
-      "elements": [
-        {
-          "id": "supported-channel-plan",
-          "label": "supported-channel-plan",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database."
-        },
-        {
-          "id": "duplex-distance-is-variable",
-          "label": "duplex-distance-is-variable",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be set on 'true', if the distance between transmitted and received frequency is variable."
-        },
-        {
-          "id": "duplex-distance-list",
-          "label": "duplex-distance-list",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Distance between transmitted and received frequency. To be filled with single value, in case duplex distance is not variable. To be filled with all configurable values, in case duplex distance is variable."
-        },
-        {
-          "id": "duplex-distance",
-          "label": "duplex-distance",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Distance between transmitted and received frequency."
-        },
-        {
-          "id": "auto-freq-select-is-avail",
-          "label": "auto-freq-select-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'."
-        },
-        {
-          "id": "transmission-mode-list",
-          "label": "transmission-mode-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:channel-plan-type-g:transmission-mode-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:channel-plan-type-g:transmission-mode-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "transmission-mode-list",
-      "language": "en-US",
-      "title": "transmission-mode-list",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPID$$/air-interface-capability",
-      "dataPath": "air-interface-capability/supported-channel-plan-list/$$INDEX0$$/transmission-mode-list/$$INDEX1$$",
-      "elements": [
-        {
-          "id": "transmission-mode-id",
-          "label": "transmission-mode-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indentifies the transmissionMode for internal reference."
-        },
-        {
-          "id": "transmission-mode-name",
-          "label": "transmission-mode-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the transmission mode. BBBB-m*-i*/t*-r*. B=four digits of channel bandwidth in MHz. m*=required number of digits for modulation name. (i*/t*=code rate.) i*=required number of digits for number of information bits. t*=required number of digits for total bits. r*=required number of digits for rate reduction factor. Example: 028-4QAM-188/204-1"
-        },
-        {
-          "id": "channel-bandwidth",
-          "label": "channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "modulation-scheme",
-          "label": "modulation-scheme",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256')."
-        },
-        {
-          "id": "code-rate",
-          "label": "code-rate",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the coding scheme in % (Net bit rate ≤ Gross bit rate · code rate)."
-        },
-        {
-          "id": "symbol-rate-reduction-factor",
-          "label": "symbol-rate-reduction-factor",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Reduction factor for the symbol rate. Example: value would be 4 for 1/4BPSK."
-        },
-        {
-          "id": "tx-power-min",
-          "label": "tx-power-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "tx-power-max",
-          "label": "tx-power-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "rx-threshold",
-          "label": "rx-threshold",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less."
-        },
-        {
-          "id": "am-upshift-level",
-          "label": "am-upshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded to shift into a higher modulation scheme."
-        },
-        {
-          "id": "am-downshift-level",
-          "label": "am-downshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme."
-        },
-        {
-          "id": "xpic-is-avail",
-          "label": "xpic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:transmission-mode-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "channel-plan-type-g",
-      "object": "transmission-mode-list",
-      "name": "transmission-mode-type",
-      "language": "en-US",
-      "title": "transmission-mode-type",
-      "elements": [
-        {
-          "id": "transmission-mode-id",
-          "label": "transmission-mode-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indentifies the transmissionMode for internal reference."
-        },
-        {
-          "id": "transmission-mode-name",
-          "label": "transmission-mode-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the transmission mode. BBBB-m*-i*/t*-r*. B=four digits of channel bandwidth in MHz. m*=required number of digits for modulation name. (i*/t*=code rate.) i*=required number of digits for number of information bits. t*=required number of digits for total bits. r*=required number of digits for rate reduction factor. Example: 028-4QAM-188/204-1"
-        },
-        {
-          "id": "channel-bandwidth",
-          "label": "channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "modulation-scheme",
-          "label": "modulation-scheme",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Modulation scheme, which is base to the other characteristics described in the same transmissionModeType data type. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256')."
-        },
-        {
-          "id": "code-rate",
-          "label": "code-rate",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the coding scheme in % (Net bit rate ≤ Gross bit rate · code rate)."
-        },
-        {
-          "id": "symbol-rate-reduction-factor",
-          "label": "symbol-rate-reduction-factor",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Reduction factor for the symbol rate. Example: value would be 4 for 1/4BPSK."
-        },
-        {
-          "id": "tx-power-min",
-          "label": "tx-power-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "tx-power-max",
-          "label": "tx-power-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit power the modem can operate in dBm."
-        },
-        {
-          "id": "rx-threshold",
-          "label": "rx-threshold",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level required to decode the received signal with a Bit Error Rate of 1e-6 or less."
-        },
-        {
-          "id": "am-upshift-level",
-          "label": "am-upshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded to shift into a higher modulation scheme."
-        },
-        {
-          "id": "am-downshift-level",
-          "label": "am-downshift-level",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the receive level that has to be exceeded for not shifting into a lower modulation scheme."
-        },
-        {
-          "id": "xpic-is-avail",
-          "label": "xpic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case this air interface type is capable of XPIC, this field shall contain a 'true'. This information shall purely relate to capabilities of the equipment type, but not to the operational capability of a specific hardware composition on site. Means for example that this attribute might contain a 'true' statement, even if an additional cable would have been required to actually operate XPIC in a specific case."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:threshold-cross-alarm-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-configuration-g",
-      "object": "threshold-cross-alarm-list",
-      "name": "threshold-cross-alarm-type",
-      "language": "en-US",
-      "title": "threshold-cross-alarm-type",
-      "elements": [
-        {
-          "id": "g826-value-kind",
-          "label": "g826-value-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "es",
-              "value": "es",
-              "description": "Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::es ."
-            },
-            {
-              "key": "ses",
-              "value": "ses",
-              "description": "Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::ses ."
-            },
-            {
-              "key": "cses",
-              "value": "cses",
-              "description": "Consecutive Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::cses ."
-            },
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of performance value that shall be equipped with a threshold alarm."
-        },
-        {
-          "id": "granularity-period",
-          "label": "granularity-period",
-          "uiType": "g:granularity-period-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Period of the performance data collection."
-        },
-        {
-          "id": "alarm-raising-threshold",
-          "label": "alarm-raising-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for raising the threshold cross alarm."
-        },
-        {
-          "id": "alarm-clearing-threshold",
-          "label": "alarm-clearing-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for clearing the threshold cross alarm."
-        }
-      ],
-      "description": "Allows defining a threshold cross alarm."
-    },
-    {
-      "id": "microwave-model:air-interface-problem-severity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-configuration-g",
-      "object": "problem-kind-severity-list",
-      "name": "air-interface-problem-severity-type",
-      "language": "en-US",
-      "title": "air-interface-problem-severity-type",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-current-problem-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-current-problems-g",
-      "object": "current-problem-list",
-      "name": "air-interface-current-problem-type",
-      "language": "en-US",
-      "title": "air-interface-current-problem-type",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:time-x-states-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-performance-type-g",
-      "object": "time-x-states-list",
-      "name": "time-x-states-type",
-      "language": "en-US",
-      "title": "time-x-states-type",
-      "elements": [
-        {
-          "id": "transmission-mode",
-          "label": "transmission-mode",
-          "uiType": "string",
-          "leafrefPath": "/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Operated transmission mode."
-        },
-        {
-          "id": "time",
-          "label": "time",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated the transmission mode."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-current-performance-type-g",
-      "object": "performance-data",
-      "name": "air-interface-performance-type",
-      "language": "en-US",
-      "title": "air-interface-performance-type",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds."
-        },
-        {
-          "id": "tx-level-min",
-          "label": "tx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-max",
-          "label": "tx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-avg",
-          "label": "tx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged transmit power. Signed integers are required."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. Signed integers are required."
-        },
-        {
-          "id": "time-x-states-list",
-          "label": "time-x-states-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-performance-type-g:time-x-states-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time period the transmitter operated in the respective transmission mode."
-        },
-        {
-          "id": "time2-states",
-          "label": "time2-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated in e.g. BPSK."
-        },
-        {
-          "id": "time4-states-s",
-          "label": "time4-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4-states",
-          "label": "time4-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8-states",
-          "label": "time8-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states-s",
-          "label": "time16-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states",
-          "label": "time16-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time32-states",
-          "label": "time32-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time64-states",
-          "label": "time64-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time128-states",
-          "label": "time128-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time256-states",
-          "label": "time256-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states",
-          "label": "time512-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states-l",
-          "label": "time512-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states",
-          "label": "time1024-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states-l",
-          "label": "time1024-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states",
-          "label": "time2048-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states-l",
-          "label": "time2048-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states",
-          "label": "time4096-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states-l",
-          "label": "time4096-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states",
-          "label": "time8192-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states-l",
-          "label": "time8192-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-min",
-          "label": "xpd-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-max",
-          "label": "xpd-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-avg",
-          "label": "xpd-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-min",
-          "label": "rf-temp-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-max",
-          "label": "rf-temp-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-avg",
-          "label": "rf-temp-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "defect-blocks-sum",
-          "label": "defect-blocks-sum",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "blocks",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of blocks that were defect after receiving and could not be corrected by the FEC."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period."
-        }
-      ],
-      "description": "Consolidated performance information of the air interface."
-    },
-    {
-      "id": "microwave-model:air-interface-performance-type-g:time-x-states-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "time-x-states-list",
-      "language": "en-US",
-      "title": "time-x-states-list",
-      "elements": [
-        {
-          "id": "transmission-mode",
-          "label": "transmission-mode",
-          "uiType": "string",
-          "leafrefPath": "/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Operated transmission mode."
-        },
-        {
-          "id": "time",
-          "label": "time",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated the transmission mode."
-        }
-      ],
-      "description": "Time period the transmitter operated in the respective transmission mode."
-    },
-    {
-      "id": "microwave-model:air-interface-current-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-current-performance-g",
-      "object": "current-performance-data-list",
-      "name": "air-interface-current-performance-type",
-      "language": "en-US",
-      "title": "air-interface-current-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into current performance information by inheriting from OTN_CurrentData."
-    },
-    {
-      "id": "microwave-model:air-interface-current-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds."
-        },
-        {
-          "id": "tx-level-min",
-          "label": "tx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-max",
-          "label": "tx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-avg",
-          "label": "tx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged transmit power. Signed integers are required."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. Signed integers are required."
-        },
-        {
-          "id": "time2-states",
-          "label": "time2-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated in e.g. BPSK."
-        },
-        {
-          "id": "time4-states-s",
-          "label": "time4-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4-states",
-          "label": "time4-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8-states",
-          "label": "time8-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states-s",
-          "label": "time16-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states",
-          "label": "time16-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time32-states",
-          "label": "time32-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time64-states",
-          "label": "time64-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time128-states",
-          "label": "time128-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time256-states",
-          "label": "time256-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states",
-          "label": "time512-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states-l",
-          "label": "time512-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states",
-          "label": "time1024-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states-l",
-          "label": "time1024-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states",
-          "label": "time2048-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states-l",
-          "label": "time2048-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states",
-          "label": "time4096-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states-l",
-          "label": "time4096-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states",
-          "label": "time8192-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states-l",
-          "label": "time8192-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-min",
-          "label": "xpd-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-max",
-          "label": "xpd-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-avg",
-          "label": "xpd-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-min",
-          "label": "rf-temp-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-max",
-          "label": "rf-temp-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-avg",
-          "label": "rf-temp-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "defect-blocks-sum",
-          "label": "defect-blocks-sum",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "blocks",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of blocks that were defect after receiving and could not be corrected by the FEC."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period."
-        },
-        {
-          "id": "time-x-states-list",
-          "label": "time-x-states-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-performance-type-g:time-x-states-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time period the transmitter operated in the respective transmission mode."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-historical-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-historical-performances-g",
-      "object": "historical-performance-data-list",
-      "name": "air-interface-historical-performance-type",
-      "language": "en-US",
-      "title": "air-interface-historical-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into historical performance information by inheriting from OTN_HistoryData."
-    },
-    {
-      "id": "microwave-model:air-interface-historical-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds."
-        },
-        {
-          "id": "tx-level-min",
-          "label": "tx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-max",
-          "label": "tx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmit power. Signed integers are required."
-        },
-        {
-          "id": "tx-level-avg",
-          "label": "tx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged transmit power. Signed integers are required."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. Signed integers are required."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. Signed integers are required."
-        },
-        {
-          "id": "time2-states",
-          "label": "time2-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Sum of all seconds the transmitter operated in e.g. BPSK."
-        },
-        {
-          "id": "time4-states-s",
-          "label": "time4-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4-states",
-          "label": "time4-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8-states",
-          "label": "time8-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states-s",
-          "label": "time16-states-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time16-states",
-          "label": "time16-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time32-states",
-          "label": "time32-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time64-states",
-          "label": "time64-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time128-states",
-          "label": "time128-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time256-states",
-          "label": "time256-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states",
-          "label": "time512-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time512-states-l",
-          "label": "time512-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states",
-          "label": "time1024-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time1024-states-l",
-          "label": "time1024-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states",
-          "label": "time2048-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time2048-states-l",
-          "label": "time2048-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states",
-          "label": "time4096-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time4096-states-l",
-          "label": "time4096-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states",
-          "label": "time8192-states",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "time8192-states-l",
-          "label": "time8192-states-l",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-min",
-          "label": "xpd-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-max",
-          "label": "xpd-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum cross polarization discrimination."
-        },
-        {
-          "id": "xpd-avg",
-          "label": "xpd-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-min",
-          "label": "rf-temp-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lowest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-max",
-          "label": "rf-temp-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Highest temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "rf-temp-avg",
-          "label": "rf-temp-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "C",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "defect-blocks-sum",
-          "label": "defect-blocks-sum",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "blocks",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of blocks that were defect after receiving and could not be corrected by the FEC."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period."
-        },
-        {
-          "id": "time-x-states-list",
-          "label": "time-x-states-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-performance-type-g:time-x-states-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time period the transmitter operated in the respective transmission mode."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:diversity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-capability-g",
-      "object": "available-kinds-of-diversity",
-      "name": "diversity-type",
-      "language": "en-US",
-      "title": "diversity-type",
-      "elements": [
-        {
-          "id": "diversity-name",
-          "label": "diversity-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'"
-        },
-        {
-          "id": "number-of-air-interfaces-max",
-          "label": "number-of-air-interfaces-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "air interfaces",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number of air interfaces that could be part of this kind of diversity."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-problem-severity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-configuration-g",
-      "object": "problem-kind-severity-list",
-      "name": "air-interface-diversity-problem-severity-type",
-      "language": "en-US",
-      "title": "air-interface-diversity-problem-severity-type",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-problem-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-current-problems-g",
-      "object": "current-problem-list",
-      "name": "air-interface-diversity-current-problem-type",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-problem-type",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-current-performance-type-g",
-      "object": "performance-data",
-      "name": "air-interface-diversity-performance-type",
-      "language": "en-US",
-      "title": "air-interface-diversity-performance-type",
-      "elements": [
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Average signal to (noise+interference) ratio of the combined signals."
-        }
-      ],
-      "description": "Consolidated performance information of the air interface diversity group."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-current-performance-g",
-      "object": "current-performance-data-list",
-      "name": "air-interface-diversity-current-performance-type",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into current performance information by inheriting from OTN_CurrentData."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Average signal to (noise+interference) ratio of the combined signals."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-historical-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "air-interface-diversity-historical-performances-g",
-      "object": "historical-performance-data-list",
-      "name": "air-interface-diversity-historical-performance-type",
-      "language": "en-US",
-      "title": "air-interface-diversity-historical-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into historical performance information by inheriting from OTN_HistoryData."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-historical-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "snir-min",
-          "label": "snir-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-max",
-          "label": "snir-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "snir-avg",
-          "label": "snir-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Average signal to (noise+interference) ratio of the combined signals."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-structure-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "hybrid-mw-structure-capability-g",
-      "object": "supported-tdm-structure-types-list",
-      "name": "tdm-structure-type",
-      "language": "en-US",
-      "title": "tdm-structure-type",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:structure-problem-severity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "pure-ethernet-structure-configuration-g",
-      "object": "problem-kind-severity-list",
-      "name": "structure-problem-severity-type",
-      "language": "en-US",
-      "title": "structure-problem-severity-type",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:structure-current-problem-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "pure-ethernet-structure-current-problems-g",
-      "object": "current-problem-list",
-      "name": "structure-current-problem-type",
-      "language": "en-US",
-      "title": "structure-current-problem-type",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:structure-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "structure-current-performance-type-g",
-      "object": "performance-data",
-      "name": "structure-performance-type",
-      "language": "en-US",
-      "title": "structure-performance-type",
-      "elements": [
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        },
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        }
-      ],
-      "description": "Consolidated performance information of the Structure."
-    },
-    {
-      "id": "microwave-model:structure-current-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "pure-ethernet-structure-current-performance-g",
-      "object": "current-performance-data-list",
-      "name": "structure-current-performance-type",
-      "language": "en-US",
-      "title": "structure-current-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into current performance information by inheriting from OTN_CurrentData."
-    },
-    {
-      "id": "microwave-model:structure-current-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        },
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:structure-historical-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "pure-ethernet-structure-historical-performances-g",
-      "object": "historical-performance-data-list",
-      "name": "structure-historical-performance-type",
-      "language": "en-US",
-      "title": "structure-historical-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into historical performance information by inheriting from OTN_HistoryData."
-    },
-    {
-      "id": "microwave-model:structure-historical-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        },
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "cses",
-          "label": "cses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of consecutive severely errored seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "unavailability",
-          "label": "unavailability",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total time of unavailability in seconds. 1+0: Same value as for single air interface. 1+1 and Diversity: Value representing the combined signals."
-        },
-        {
-          "id": "rx-level-min",
-          "label": "rx-level-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-max",
-          "label": "rx-level-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        },
-        {
-          "id": "rx-level-avg",
-          "label": "rx-level-avg",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Averaged receive level. 1+0: Same value as for single air interface. 1+1: Value representing the combined signals. Diversity: To be left on default value."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:container-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "container-type",
-      "language": "en-US",
-      "title": "container-type",
-      "elements": [
-        {
-          "id": "container-name",
-          "label": "container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'ethernet','e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "number-of-time-slots-required",
-          "label": "number-of-time-slots-required",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "timeslots",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of time slots required for transporting this type of container. Value must be calculated by the vendor after defining the timeSlotCapacity. For containers of fixed size: numberOfTimeSlotsRequired = required bandwidth of the container divided by timeSlotCapacity. For containers of variable size the minimum (most probably 1) is to be stated."
-        },
-        {
-          "id": "tdm-time-slots-is-required",
-          "label": "tdm-time-slots-is-required",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be set to '1', if this container type requires bandwidth (times slots) reserved for TDM transport."
-        },
-        {
-          "id": "bundling-is-avail",
-          "label": "bundling-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If it is possible to combine transport resources of several radio links to transport this container type, this attribute shall be set to '1'."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "tdm-container-capability-g",
-      "object": "supported-tdm-container-types-list",
-      "name": "tdm-container-type",
-      "language": "en-US",
-      "title": "tdm-container-type",
-      "elements": [
-        {
-          "id": "tdm-container-name",
-          "label": "tdm-container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-container-size",
-          "label": "tdm-container-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:segment-id-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "ethernet-container-configuration-g",
-      "object": "segments-id-list",
-      "name": "segment-id-type",
-      "language": "en-US",
-      "title": "segment-id-type",
-      "elements": [
-        {
-          "id": "structure-id-ref",
-          "label": "structure-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-id-ref",
-          "label": "segment-id-ref",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once."
-        }
-      ],
-      "description": "Identifies the segments, which are used to transport the container."
-    },
-    {
-      "id": "microwave-model:segment-status-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "pure-ethernet-structure-status-g",
-      "object": "segment-status-list",
-      "name": "segment-status-type",
-      "language": "en-US",
-      "title": "segment-status-type",
-      "elements": [
-        {
-          "id": "segment-status-type-id",
-          "label": "segment-status-type-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-is-reserved-for-tdm",
-          "label": "segment-is-reserved-for-tdm",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm."
-        },
-        {
-          "id": "operational-status",
-          "label": "operational-status",
-          "uiType": "core-model:operational-state",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current operational status of each segment."
-        },
-        {
-          "id": "obsolete-priority-class",
-          "label": "obsolete-priority-class",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank."
-        },
-        {
-          "id": "obsolete-drop-order-rank",
-          "label": "obsolete-drop-order-rank",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. _unique: within Structure::StructureStatus::segmentStatusList"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:container-problem-severity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "ethernet-container-configuration-g",
-      "object": "problem-kind-severity-list",
-      "name": "container-problem-severity-type",
-      "language": "en-US",
-      "title": "container-problem-severity-type",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:container-current-problem-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "ethernet-container-current-problems-g",
-      "object": "current-problem-list",
-      "name": "container-current-problem-type",
-      "language": "en-US",
-      "title": "container-current-problem-type",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:container-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "container-current-performance-type-g",
-      "object": "performance-data",
-      "name": "container-performance-type",
-      "language": "en-US",
-      "title": "container-performance-type",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "Consolidated performance information of the Container."
-    },
-    {
-      "id": "microwave-model:container-current-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "ethernet-container-current-performance-g",
-      "object": "current-performance-data-list",
-      "name": "container-current-performance-type",
-      "language": "en-US",
-      "title": "container-current-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into current performance information by inheriting from OTN_CurrentData."
-    },
-    {
-      "id": "microwave-model:container-current-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:container-historical-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "ethernet-container-historical-performances-g",
-      "object": "historical-performance-data-list",
-      "name": "container-historical-performance-type",
-      "language": "en-US",
-      "title": "container-historical-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into historical performance information by inheriting from OTN_HistoryData."
-    },
-    {
-      "id": "microwave-model:container-historical-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "tx-ethernet-bytes-max-s",
-          "label": "tx-ethernet-bytes-max-s",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "Bytes/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a second and keeps the highest value within the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-max-m",
-          "label": "tx-ethernet-bytes-max-m",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes/min",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts the number of Bytes of Ethernet traffic (before header compression) transmitted within a minute and keeps the highest value with in the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "tx-ethernet-bytes-sum",
-          "label": "tx-ethernet-bytes-sum",
-          "uiType": "number",
-          "min": -9223372036854776000,
-          "max": 9223372036854776000,
-          "format": "#",
-          "unit": "Bytes",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total number of Bytes of Ethernet traffic (before header compression) transmitted (in direction out of the device) during the measurement period. Field to be left blank for all types of TDM containers."
-        },
-        {
-          "id": "time-period",
-          "label": "time-period",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Total length of the measurement period in seconds."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:signal-ordering-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mau-type-g",
-      "object": "signal-ordering-list",
-      "name": "signal-ordering-type",
-      "language": "en-US",
-      "title": "signal-ordering-type",
-      "elements": [
-        {
-          "id": "signal-ordering-kind-name",
-          "label": "signal-ordering-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be filled according to TR-541. Must be unique for referencing during configuration of the interface."
-        },
-        {
-          "id": "signal-list",
-          "label": "signal-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Desciption of the signals on the Media Dependent Interface (MDI), might be e.g. 'TX+' in case of e.g. 10BASE-T, might be e.g. '1,295.56 nm' in case of e.g. 100GBASE-LR4"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mau-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-capability-g",
-      "object": "available-mau-list",
-      "name": "mau-type",
-      "language": "en-US",
-      "title": "mau-type",
-      "elements": [
-        {
-          "id": "mau-id",
-          "label": "mau-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according to 30.5.1.1.1 aMAUID Unique identifier of the Medium Attachment Unit (MAU) instance within the data about the device"
-        },
-        {
-          "id": "mii-kind",
-          "label": "mii-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "gbic",
-              "value": "gbic",
-              "description": "none"
-            },
-            {
-              "key": "soldered-connector",
-              "value": "soldered-connector",
-              "description": "none"
-            },
-            {
-              "key": "sfp-sfp-plus-sfp28",
-              "value": "sfp-sfp-plus-sfp28",
-              "description": "none"
-            },
-            {
-              "key": "xbi-300-pin",
-              "value": "xbi-300-pin",
-              "description": "none"
-            },
-            {
-              "key": "xenpak",
-              "value": "xenpak",
-              "description": "none"
-            },
-            {
-              "key": "xfp",
-              "value": "xfp",
-              "description": "none"
-            },
-            {
-              "key": "xfp-e",
-              "value": "xfp-e",
-              "description": "none"
-            },
-            {
-              "key": "xpak",
-              "value": "xpak",
-              "description": "none"
-            },
-            {
-              "key": "x2",
-              "value": "x2",
-              "description": "none"
-            },
-            {
-              "key": "dwdm-sfp-sfp-plus",
-              "value": "dwdm-sfp-sfp-plus",
-              "description": "none"
-            },
-            {
-              "key": "qsfp",
-              "value": "qsfp",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus",
-              "value": "qsfp-plus",
-              "description": "none"
-            },
-            {
-              "key": "cxp",
-              "value": "cxp",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-4-x",
-              "value": "shielded-mini-multilane-hd-4-x",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-8-x",
-              "value": "shielded-mini-multilane-hd-8-x",
-              "description": "none"
-            },
-            {
-              "key": "qsfp28",
-              "value": "qsfp28",
-              "description": "none"
-            },
-            {
-              "key": "cxp2",
-              "value": "cxp2",
-              "description": "none"
-            },
-            {
-              "key": "cdfp-style1-style2",
-              "value": "cdfp-style1-style2",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-4-x-fan-out",
-              "value": "shielded-mini-multilane-hd-4-x-fan-out",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-8-x-fan-out",
-              "value": "shielded-mini-multilane-hd-8-x-fan-out",
-              "description": "none"
-            },
-            {
-              "key": "cdfp-style3",
-              "value": "cdfp-style3",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-micro",
-              "value": "qsfp-micro",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-dd",
-              "value": "qsfp-dd",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus-rate-select-v1",
-              "value": "qsfp-plus-rate-select-v1",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus-rate-select-v2",
-              "value": "qsfp-plus-rate-select-v2",
-              "description": "none"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "SFF8472_SFF8636 Kind of Medium Independent Interface (MII) provided by this Medium Attachment Unit (MAU) (e.g. SFP, moldered port)"
-        },
-        {
-          "id": "mdi-kind",
-          "label": "mdi-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "sc",
-              "value": "sc",
-              "description": "Subscriber Connector"
-            },
-            {
-              "key": "fibre-channel-style-1",
-              "value": "fibre-channel-style-1",
-              "description": "Copper connector"
-            },
-            {
-              "key": "fibre-channel-style-2",
-              "value": "fibre-channel-style-2",
-              "description": "Copper connector"
-            },
-            {
-              "key": "bnc-tnc",
-              "value": "bnc-tnc",
-              "description": "Bayonet/Threaded Neill-Concelman"
-            },
-            {
-              "key": "fc",
-              "value": "fc",
-              "description": "Fibre Channel coax headers"
-            },
-            {
-              "key": "fiber-jack",
-              "value": "fiber-jack",
-              "description": "none"
-            },
-            {
-              "key": "lc",
-              "value": "lc",
-              "description": "Lucent Connector"
-            },
-            {
-              "key": "mt-rj",
-              "value": "mt-rj",
-              "description": "Mechanical Transfer - Registered Jack"
-            },
-            {
-              "key": "mu",
-              "value": "mu",
-              "description": "Multiple Optical"
-            },
-            {
-              "key": "sg",
-              "value": "sg",
-              "description": "none"
-            },
-            {
-              "key": "optical-pigtail",
-              "value": "optical-pigtail",
-              "description": "none"
-            },
-            {
-              "key": "mpo1-x12",
-              "value": "mpo1-x12",
-              "description": "Multifiber Parallel Optic"
-            },
-            {
-              "key": "mpo2-x16",
-              "value": "mpo2-x16",
-              "description": "Multifiber Parallel Optic"
-            },
-            {
-              "key": "hssdc-ii",
-              "value": "hssdc-ii",
-              "description": "High Speed Serial Data Connector"
-            },
-            {
-              "key": "copper-pigtail",
-              "value": "copper-pigtail",
-              "description": "none"
-            },
-            {
-              "key": "rj45",
-              "value": "rj45",
-              "description": "8P8C, according to Clause 3 and Figures 1 through 5 of IEC 60603-7"
-            },
-            {
-              "key": "no-seperable-connector",
-              "value": "no-seperable-connector",
-              "description": "none"
-            },
-            {
-              "key": "mxc2-x16",
-              "value": "mxc2-x16",
-              "description": "none"
-            },
-            {
-              "key": "st",
-              "value": "st",
-              "description": "according to IEC 60874-10:1992, also often called BFOC/2.5"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of Medium Dependent Interface (MDI) provided by this Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "required-medium-kind",
-          "label": "required-medium-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "tp-cat3",
-              "value": "tp-cat3",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat5",
-              "value": "tp-cat5",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat6",
-              "value": "tp-cat6",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat8",
-              "value": "tp-cat8",
-              "description": "none"
-            },
-            {
-              "key": "single-mode",
-              "value": "single-mode",
-              "description": "none"
-            },
-            {
-              "key": "multi-mode",
-              "value": "multi-mode",
-              "description": "none"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of medium required for operating this Medium Attachment Unit (MAU), more like an information field"
-        },
-        {
-          "id": "wavelength-min",
-          "label": "wavelength-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "SFF-8690 Minimum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMax = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5"
-        },
-        {
-          "id": "wavelength-max",
-          "label": "wavelength-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMin = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5 SFF-8690"
-        },
-        {
-          "id": "wavelength-grid-min",
-          "label": "wavelength-grid-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum grid spacing supported by the transceiver, -1 = not applicable, 0 = not known SFF-8690"
-        },
-        {
-          "id": "link-length-max",
-          "label": "link-length-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "m",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the maximum link length that is supported by the transceiver on the medium, which is specified in the standard referenced in TypeDefinitions::phyType::phyKind."
-        },
-        {
-          "id": "vendor-name",
-          "label": "vendor-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the vendor of the transceiver Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerName"
-        },
-        {
-          "id": "vendor-oui",
-          "label": "vendor-oui",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Describes the IEEE Company identifier of the vendor of the transceiver (1st part of 802.3 ResourceTypeID) 802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerIdentifier"
-        },
-        {
-          "id": "part-number",
-          "label": "part-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as six bit model number Uniquely identifies the transceiver in the vendor's product lists Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::partTypeIdentifier"
-        },
-        {
-          "id": "revision-number",
-          "label": "revision-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the revision number of the transceiver (3rd part of 802.3 ResourceTypeID) 802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as four-bit revision number Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::version"
-        },
-        {
-          "id": "serial-number",
-          "label": "serial-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Vendor's serial number for the transceiver. 0 = not applicable Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::serialNumber"
-        },
-        {
-          "id": "date-code",
-          "label": "date-code",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Vendor's date code for the transceiver Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::manufactureDate"
-        },
-        {
-          "id": "pmd-list",
-          "label": "pmd-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of Physical Medium Dependent (PMD) that can be operated *** In case ordering of the signals depends on the PMD, pmdList has to be put into the datatype for the signal ordering ***"
-        },
-        {
-          "id": "signal-ordering-list",
-          "label": "signal-ordering-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mau-type-g:signal-ordering-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Describes the different (e.g. MDI, MDI-X) ways of ordering the signals on the physical medium"
-        },
-        {
-          "id": "auto-signal-ordering-is-avail",
-          "label": "auto-signal-ordering-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = there is a mechanism for automatically crossing over tx and rx implemented"
-        },
-        {
-          "id": "short-reach-mode-is-avail",
-          "label": "short-reach-mode-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64 is available"
-        },
-        {
-          "id": "eee-is-avail",
-          "label": "eee-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that Energy-Efficient Ethernet (EEE) is available at the device."
-        },
-        {
-          "id": "unidirectional-operation-is-avail",
-          "label": "unidirectional-operation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Medium Attachment Unit (MAU) able to transmit from Media Independent Interface (MII) regardless of whether the MAU has determined that a valid link has been established, 0 = MAU able to transmit from MII only when the MAU has determined that a valid link has been established 802.3"
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "MW IM Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mau-type-g:signal-ordering-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "signal-ordering-list",
-      "language": "en-US",
-      "title": "signal-ordering-list",
-      "elements": [
-        {
-          "id": "signal-ordering-kind-name",
-          "label": "signal-ordering-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be filled according to TR-541. Must be unique for referencing during configuration of the interface."
-        },
-        {
-          "id": "signal-list",
-          "label": "signal-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Desciption of the signals on the Media Dependent Interface (MDI), might be e.g. 'TX+' in case of e.g. 10BASE-T, might be e.g. '1,295.56 nm' in case of e.g. 100GBASE-LR4"
-        }
-      ],
-      "description": "Describes the different (e.g. MDI, MDI-X) ways of ordering the signals on the physical medium"
-    },
-    {
-      "id": "microwave-model:wire-interface-problem-severity-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-configuration-g",
-      "object": "problem-kind-severity-list",
-      "name": "wire-interface-problem-severity-type",
-      "language": "en-US",
-      "title": "wire-interface-problem-severity-type",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-current-problem-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-current-problems-g",
-      "object": "current-problem-list",
-      "name": "wire-interface-current-problem-type",
-      "language": "en-US",
-      "title": "wire-interface-current-problem-type",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-current-performance-type-g",
-      "object": "performance-data",
-      "name": "wire-interface-performance-type",
-      "language": "en-US",
-      "title": "wire-interface-performance-type",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.13 aLineESs Number of errored seconds"
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.12 aLineSESs Number of severely errored seconds"
-        },
-        {
-          "id": "symbol-error-during-carrier",
-          "label": "symbol-error-during-carrier",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according to 30.3.2.1.5 aSymbolErrorDuringCarrier Number of times when valid carrier was present and an invalid data symbol occured."
-        },
-        {
-          "id": "low-power-idle-transmitter-ms",
-          "label": "low-power-idle-transmitter-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.8 aTransmitLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the transmitter was in power save mode"
-        },
-        {
-          "id": "low-power-idle-receiver-ms",
-          "label": "low-power-idle-receiver-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.9 aReceiveLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the receiver was in power save mode"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-current-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-current-performance-g",
-      "object": "current-performance-data-list",
-      "name": "wire-interface-current-performance-type",
-      "language": "en-US",
-      "title": "wire-interface-current-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into current performance information by inheriting from OTN_CurrentData."
-    },
-    {
-      "id": "microwave-model:wire-interface-current-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.13 aLineESs Number of errored seconds"
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.12 aLineSESs Number of severely errored seconds"
-        },
-        {
-          "id": "symbol-error-during-carrier",
-          "label": "symbol-error-during-carrier",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according to 30.3.2.1.5 aSymbolErrorDuringCarrier Number of times when valid carrier was present and an invalid data symbol occured."
-        },
-        {
-          "id": "low-power-idle-transmitter-ms",
-          "label": "low-power-idle-transmitter-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.8 aTransmitLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the transmitter was in power save mode"
-        },
-        {
-          "id": "low-power-idle-receiver-ms",
-          "label": "low-power-idle-receiver-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.9 aReceiveLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the receiver was in power save mode"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-historical-performance-type-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-historical-performances-g",
-      "object": "historical-performance-data-list",
-      "name": "wire-interface-historical-performance-type",
-      "language": "en-US",
-      "title": "wire-interface-historical-performance-type",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Turns performance information into historical performance information by inheriting from OTN_HistoryData."
-    },
-    {
-      "id": "microwave-model:wire-interface-historical-performance-type-g:performance-data",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "performance-data",
-      "language": "en-US",
-      "title": "performance-data",
-      "elements": [
-        {
-          "id": "es",
-          "label": "es",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.13 aLineESs Number of errored seconds"
-        },
-        {
-          "id": "ses",
-          "label": "ses",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 30.8.1.1.12 aLineSESs Number of severely errored seconds"
-        },
-        {
-          "id": "symbol-error-during-carrier",
-          "label": "symbol-error-during-carrier",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according to 30.3.2.1.5 aSymbolErrorDuringCarrier Number of times when valid carrier was present and an invalid data symbol occured."
-        },
-        {
-          "id": "low-power-idle-transmitter-ms",
-          "label": "low-power-idle-transmitter-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.8 aTransmitLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the transmitter was in power save mode"
-        },
-        {
-          "id": "low-power-idle-receiver-ms",
-          "label": "low-power-idle-receiver-ms",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "ms",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 similar to 30.3.2.1.9 aReceiveLPIMicroseconds Number of milliseconds (original counter expresses microseconds), during which the receiver was in power save mode"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-capability",
-      "name": "air-interface-capability",
-      "language": "en-US",
-      "title": "air-interface-capability",
-      "elements": [
-        {
-          "id": "type-of-equipment",
-          "label": "type-of-equipment",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This parameter indicates the equipment type. Instead of uploading the complete set of capabilities, capabilities of the same equipment type could be reused. Should be unique for a combination of modem, radio and their respective firmware."
-        },
-        {
-          "id": "tx-frequency-min",
-          "label": "tx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "tx-frequency-max",
-          "label": "tx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum transmit frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-min",
-          "label": "rx-frequency-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the minimum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "rx-frequency-max",
-          "label": "rx-frequency-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Value of the maximum receive frequency tunable at the air interface."
-        },
-        {
-          "id": "adaptive-modulation-is-avail",
-          "label": "adaptive-modulation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of adaptive modulation, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-is-avail",
-          "label": "mimo-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is capable of MIMO, this field shall contain a 'true'."
-        },
-        {
-          "id": "mimo-channels",
-          "label": "mimo-channels",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number (n) of spatial multiplexing streams that can be conveyed by an n x n MIMO configuration."
-        },
-        {
-          "id": "alic-is-avail",
-          "label": "alic-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of Adjacent Link Interference Cancelation (canceling of interference cause by transmitters located at the same site), this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-is-avail",
-          "label": "atpc-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of ATPC, this field shall contain a 'true'."
-        },
-        {
-          "id": "atpc-range",
-          "label": "atpc-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Extent of the ATPC range. This value represents a device specific maximum value. The actual range of the ATPC at a specific link might be limited by the difference between configured transmit power (AirInterface::AirInterfaceConfiguration::txPower) and minimum transmit power of the device (TypeDefinitions::TransmissionModeType::txPowerMin)."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if payload encryption is available."
-        },
-        {
-          "id": "supported-loop-back-kind-list",
-          "label": "supported-loop-back-kind-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of supported kinds of looping back of header information to the remote site."
-        },
-        {
-          "id": "maintenance-timer-range",
-          "label": "maintenance-timer-range",
-          "uiType": "string",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available time periods for maintenance configurations (e.g. the loop back of microwave header information) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360')."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','signalIDMismatching','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'signalIsLost','rslIsExceeded','temperatureIsExceeded','modemIsFaulty','radioIsFaulty' and 'modulationIsDownShifted'. Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "supported-channel-plan-list",
-          "label": "supported-channel-plan-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-capability-g:supported-channel-plan-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of channel spacing that are supported by the device."
-        }
-      ],
-      "description": "Describes the 'analog' capabilities of modem and transmitter of the microwave device. Value ranges of attributes are not independently (e.g. min. and max. transmit power depends on modulation). Legal combinations of values are expressed in transmissionModeTypes."
-    },
-    {
-      "id": "microwave-model:air-interface-capability-g:supported-channel-plan-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "supported-channel-plan-list",
-      "language": "en-US",
-      "title": "supported-channel-plan-list",
-      "url": "restconf/config/network-topology:network-topology/topology/topology-netconf/node/$$NODEID$$/yang-ext:mount/microwave-model:mw-air-interface-pac/$$LPID$$/air-interface-capability",
-      "dataPath": "air-interface-capability/supported-channel-plan-list/$$INDEX0$$/",
-      "elements": [
-        {
-          "id": "supported-channel-plan",
-          "label": "supported-channel-plan",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique name (e.g. ECC/REC/(01)04_Annex 5) of a document, which describes a frequency grid that can be adjusted at the air interface. Corresponding channel plans to be delivered by the hardware vendor and to be stored by the operator in an controller/application attached database."
-        },
-        {
-          "id": "duplex-distance-is-variable",
-          "label": "duplex-distance-is-variable",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be set on 'true', if the distance between transmitted and received frequency is variable."
-        },
-        {
-          "id": "duplex-distance",
-          "label": "duplex-distance",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Distance between transmitted and received frequency."
-        },
-        {
-          "id": "auto-freq-select-is-avail",
-          "label": "auto-freq-select-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the microwave radio is capable of automatically selecting the transmit frequency in unlicensed bands, this field shall contain a 'true'."
-        },
-        {
-          "id": "duplex-distance-list",
-          "label": "duplex-distance-list",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Distance between transmitted and received frequency. To be filled with single value, in case duplex distance is not variable. To be filled with all configurable values, in case duplex distance is variable."
-        },
-        {
-          "id": "transmission-mode-list",
-          "label": "transmission-mode-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:channel-plan-type-g:transmission-mode-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "List of channel spacing that are supported by the device."
-    },
-    {
-      "id": "microwave-model:air-interface-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-configuration",
-      "name": "air-interface-configuration",
-      "language": "en-US",
-      "title": "air-interface-configuration",
-      "elements": [
-        {
-          "id": "air-interface-name",
-          "label": "air-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Operator specific microwave link ID (often used for coding area, type of element and sequential number)."
-        },
-        {
-          "id": "remote-air-interface-name",
-          "label": "remote-air-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the air interface, which belongs to the same link, at the remote site."
-        },
-        {
-          "id": "expected-signal-id",
-          "label": "expected-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If set on '0', the receiver ignores the signal ID of the received signal. If set on any other value, the receiver exclusively synchronizes on signals with the same signal ID."
-        },
-        {
-          "id": "transmitted-signal-id",
-          "label": "transmitted-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmitted radio signal ID for synchronizing the receiver."
-        },
-        {
-          "id": "radio-signal-id",
-          "label": "radio-signal-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The radioSignalId is transmitted on the air interface so the remote site of the link synchronizes on the correct transmitter. The local radio MUST NOT synchronize on a radio signal with a different radioSignalId. The link ID is neither an ID necessary to span the model nor an ID referencing external data. It is just some sort of name of the link transmitted so the correct remote site can be identified in an interference situation. The value zero might be used to make the microwave to disable the link ID check."
-        },
-        {
-          "id": "tx-frequency",
-          "label": "tx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the transmit channel. The values to be configured have to exactly match the values listed in the international agreement referenced in channelPlanID. In case of automated selection of the transmit frequency this field shall describe the lowest center frequency selectable."
-        },
-        {
-          "id": "rx-frequency",
-          "label": "rx-frequency",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the receive channel."
-        },
-        {
-          "id": "transmission-mode-min",
-          "label": "transmission-mode-min",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum transmission mode to be configured (in case adaptive modulation is not used, this value represents also the fixed transmission mode)."
-        },
-        {
-          "id": "transmission-mode-max",
-          "label": "transmission-mode-max",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum transmission mode to be configured."
-        },
-        {
-          "id": "tx-channel-bandwidth",
-          "label": "tx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the transmit channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "rx-channel-bandwidth",
-          "label": "rx-channel-bandwidth",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Bandwidth of the receive channel. The value shall be expressed explicitly (means in kHz) not as a reference to an international agreement. The values shall be chosen from the following _list: 3.500, 7.000, 14.000, 27.500, 28.000, 29.000, 29.650, 30.000, 40.000, 50.000, 55.000, 56.000, 59.300, 60.000, 80.000, 100.000, 112.000, 120.000, 150.000, 200.000, 250.000, 500.000, 750.000, 1.000.000, 1.250.000, 1.500.000, 1.750.000, 2.000.000;"
-        },
-        {
-          "id": "polarization",
-          "label": "polarization",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            },
-            {
-              "key": "horizontal",
-              "value": "horizontal",
-              "description": "none"
-            },
-            {
-              "key": "vertical",
-              "value": "vertical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows documenting the polarization of the air interface."
-        },
-        {
-          "id": "power-is-on",
-          "label": "power-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Power ON. Activation of the entire radio in a split mount configuration shall be expressed as a 'true'."
-        },
-        {
-          "id": "transmitter-is-on",
-          "label": "transmitter-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of the transmitter inside the radio shall be expressed as a 'true'."
-        },
-        {
-          "id": "receiver-is-on",
-          "label": "receiver-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. Activation of the receiver inside the radio shall be expressed as a 'true'. Attribute shall also be used for RX main and RX diversity squelches in case of diversity configurations."
-        },
-        {
-          "id": "tx-power",
-          "label": "tx-power",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmit power to be configured on the microwave link. Signed Byte is required. The actually operated transmit power might be lower depending on adaptive modulation and ATPC."
-        },
-        {
-          "id": "adaptive-modulation-is-on",
-          "label": "adaptive-modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Adaptive Modulation. Activation of adaptive modulation shall be expressed as a 'true'."
-        },
-        {
-          "id": "modulation-min",
-          "label": "modulation-min",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum modulation to be configured (in case adaptive modulation is not used, this value represents also the fixed modulation). The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "modulation-max",
-          "label": "modulation-max",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum modulation to be configured. The value of this field is only relevant, if Adaptive Modulation has been activated. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "xpic-is-on",
-          "label": "xpic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Cross Polarization Interference Cancelation shall be expressed as a 'true'. In case XPIC is not available for the current combination of channel bandwidth and modulation or the hardware in general, this parameter shall always be set to 'false'."
-        },
-        {
-          "id": "mimo-is-on",
-          "label": "mimo-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Multiple Input Multiple Output (MIMO) shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-on",
-          "label": "alic-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of Adjacent Link Interference Cancelation (ALIC) shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-on",
-          "label": "atpc-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ATPC. Activation of Automated Transmit Power Control shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-thresh-upper",
-          "label": "atpc-thresh-upper",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is higher than the upper threshold value, the transmitter is notified to decrease transmit power."
-        },
-        {
-          "id": "atpc-thresh-lower",
-          "label": "atpc-thresh-lower",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the receive level is lower than the lower threshold value, the transmitter is notified to increase transmit power."
-        },
-        {
-          "id": "atpc-tx-power-min",
-          "label": "atpc-tx-power-min",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Transmit power, which is not to be undercut, while operating ATPC."
-        },
-        {
-          "id": "auto-freq-select-is-on",
-          "label": "auto-freq-select-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of automatically selecting the transmit frequency in unlicensed bands shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-range",
-          "label": "auto-freq-select-range",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "channels",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of transmit channels (starting at the center frequency defined in txFrequency and with channel bandwidth according to txChannelBandwidth) that define the range within the transmit frequency can automatically been chosen."
-        },
-        {
-          "id": "modulation-is-on",
-          "label": "modulation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. De-activation of the modulation of the carrier signal for fault management shall be expressed as a 'false'."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into ciphertext data."
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "threshold-cross-alarm-list",
-          "label": "threshold-cross-alarm-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-configuration-g:threshold-cross-alarm-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of threshold cross alarms to be configured."
-        },
-        {
-          "id": "loop-back-kind-on",
-          "label": "loop-back-kind-on",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maintenance Feature. The currently configured type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "maintenance-timer",
-          "label": "maintenance-timer",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time of existence of any maintenance configuration (e.g. the loop back of microwave header information). Valid values are defined in AirInterface::AirInterfaceCapability::maintenanceTimerRange."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "Configuration of the radio link."
-    },
-    {
-      "id": "microwave-model:air-interface-configuration-g:threshold-cross-alarm-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "threshold-cross-alarm-list",
-      "language": "en-US",
-      "title": "threshold-cross-alarm-list",
-      "elements": [
-        {
-          "id": "g826-value-kind",
-          "label": "g826-value-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "es",
-              "value": "es",
-              "description": "Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::es ."
-            },
-            {
-              "key": "ses",
-              "value": "ses",
-              "description": "Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::ses ."
-            },
-            {
-              "key": "cses",
-              "value": "cses",
-              "description": "Consecutive Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::cses ."
-            },
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of performance value that shall be equipped with a threshold alarm."
-        },
-        {
-          "id": "granularity-period",
-          "label": "granularity-period",
-          "uiType": "g:granularity-period-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Period of the performance data collection."
-        },
-        {
-          "id": "alarm-raising-threshold",
-          "label": "alarm-raising-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for raising the threshold cross alarm."
-        },
-        {
-          "id": "alarm-clearing-threshold",
-          "label": "alarm-clearing-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for clearing the threshold cross alarm."
-        }
-      ],
-      "description": "List of threshold cross alarms to be configured."
-    },
-    {
-      "id": "microwave-model:air-interface-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "microwave-model:air-interface-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-status",
-      "name": "air-interface-status",
-      "language": "en-US",
-      "title": "air-interface-status",
-      "elements": [
-        {
-          "id": "tx-frequency-cur",
-          "label": "tx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated transmit channel."
-        },
-        {
-          "id": "rx-frequency-cur",
-          "label": "rx-frequency-cur",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kHz",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Center frequency of the currently operated receive channel."
-        },
-        {
-          "id": "tx-level-cur",
-          "label": "tx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current transmit level."
-        },
-        {
-          "id": "rx-level-cur",
-          "label": "rx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current receive level."
-        },
-        {
-          "id": "transmission-mode-cur",
-          "label": "transmission-mode-cur",
-          "uiType": "string",
-          "leafrefPath": "/mw-air-interface-pac/air-interface-capability/supported-channel-plan-list/transmission-mode-list/transmission-mode-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently operated transmission mode according to definitions in Capabilities."
-        },
-        {
-          "id": "modulation-cur",
-          "label": "modulation-cur",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "unit": "symbols",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently operated modulation on transmit path. The modulation scheme shall be described by the number of states in the phase diagram (e.g. BPSK->'2' or 256QAM->'256'). Allowed values are defined in TypeDefinitions::transmissionModeType::modulationScheme."
-        },
-        {
-          "id": "code-rate-cur",
-          "label": "code-rate-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "%",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Code rate of the currently operated coding scheme (Net bit rate ? Gross bit rate ? code rate)."
-        },
-        {
-          "id": "received-signal-id",
-          "label": "received-signal-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the signal, which the receiver is currently synchronized on."
-        },
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio."
-        },
-        {
-          "id": "xpd-cur",
-          "label": "xpd-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured cross polarization discrimination."
-        },
-        {
-          "id": "rf-temp-cur",
-          "label": "rf-temp-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current temperature (in degree Celsius) of the radio module inside the outdoor unit."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Air Interface entered its current operational status."
-        },
-        {
-          "id": "radio-power-is-up",
-          "label": "radio-power-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If the radio unit has power and is switched on, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "link-is-up",
-          "label": "link-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If connection is established to the remote site with the same linkID, this shall be expressed as a 'true'."
-        },
-        {
-          "id": "xpic-is-up",
-          "label": "xpic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If XPIC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "mimo-is-up",
-          "label": "mimo-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If MIMO is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "alic-is-up",
-          "label": "alic-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If Adjacent Link Interference Cancelation (ALIC) is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "atpc-is-up",
-          "label": "atpc-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If ATPC is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "auto-freq-select-is-up",
-          "label": "auto-freq-select-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If automated frequency selection is currently actually working (not just configured), this shall be expressed as a 'true'."
-        },
-        {
-          "id": "loop-back-kind-up",
-          "label": "loop-back-kind-up",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The currently active (not just configured) type of looping back of the air interface header shall be expressed here. The received header is returned to the remote site."
-        },
-        {
-          "id": "local-end-point-id",
-          "label": "local-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the localEndPointId is a vendor specific identifier of the air interface, used by the node to discover a microwave radio link."
-        },
-        {
-          "id": "remote-end-point-id",
-          "label": "remote-end-point-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The value of the remoteEndPointId is a vendor specific identifier or the airinterface at the remote side, used to by the node to discover a microwave radio link."
-        }
-      ],
-      "description": "Measurements of current values on the air interface and operational status of the device."
-    },
-    {
-      "id": "microwave-model:air-interface-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-current-problems",
-      "name": "air-interface-current-problems",
-      "language": "en-US",
-      "title": "air-interface-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterface::AirInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-current-performance",
-      "name": "air-interface-current-performance",
-      "language": "en-US",
-      "title": "air-interface-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the air interface at a particular moment."
-    },
-    {
-      "id": "microwave-model:air-interface-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:air-interface-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-pac",
-      "object": "air-interface-historical-performances",
-      "name": "air-interface-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the air interface for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:air-interface-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:co-channel-group-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "co-channel-group",
-      "name": "co-channel-group",
-      "language": "en-US",
-      "title": "co-channel-group",
-      "elements": [
-        {
-          "id": "co-channel-group-id",
-          "label": "co-channel-group-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "air-interface-list",
-          "label": "air-interface-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of air interfaces, which are part of the co-channel (XPIC, MIMO, ALIC) group."
-        },
-        {
-          "id": "sort-of-co-channel-group",
-          "label": "sort-of-co-channel-group",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of group of air interfaces with the same transmit and receive frequency. The values shall be chosen from the following _list:'XPIC', 'MIMO', 'ALIC';"
-        },
-        {
-          "id": "logical-termination-point",
-          "label": "logical-termination-point",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Required for configuring XPIC, MIMO and ALIC."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-capability",
-      "name": "air-interface-diversity-capability",
-      "language": "en-US",
-      "title": "air-interface-diversity-capability",
-      "elements": [
-        {
-          "id": "available-kinds-of-diversity",
-          "label": "available-kinds-of-diversity",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-capability-g:available-kinds-of-diversity",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available types of diversity to be listed."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'airInterfaceDiversityConfigurationIsPartlyDown' (at least one air interface is down, but not all of them) and 'airInterfaceDiversityConfigurationIsDown' (all air interfaces are down). Further alarms might be added by the device. Names are to be separated by commas."
-        }
-      ],
-      "description": "Describes the capabilities in implementing different types of air interface diversity."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-capability-g:available-kinds-of-diversity",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "available-kinds-of-diversity",
-      "language": "en-US",
-      "title": "available-kinds-of-diversity",
-      "elements": [
-        {
-          "id": "diversity-name",
-          "label": "diversity-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'"
-        },
-        {
-          "id": "number-of-air-interfaces-max",
-          "label": "number-of-air-interfaces-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "air interfaces",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number of air interfaces that could be part of this kind of diversity."
-        }
-      ],
-      "description": "Available types of diversity to be listed."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-configuration",
-      "name": "air-interface-diversity-configuration",
-      "language": "en-US",
-      "title": "air-interface-diversity-configuration",
-      "elements": [
-        {
-          "id": "air-interface-diversity",
-          "label": "air-interface-diversity",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:air-interface-diversity",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of air interface diversity configured at the link."
-        },
-        {
-          "id": "air-interface-ltp-list",
-          "label": "air-interface-ltp-list",
-          "uiType": "string",
-          "leafrefPath": "/core-model:network-element/core-model:ltp/core-model:uuid",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "_multiplicity:2-ThisAirInterfaceDiversity::AirInterfaceDiversityConfiguration::airInterfaceDiversity::diversityType::numberOfAirInterfacesMax"
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "threshold-cross-alarm-list",
-          "label": "threshold-cross-alarm-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:threshold-cross-alarm-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of threshold cross alarms to be configured."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-configuration-g:air-interface-diversity",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "air-interface-diversity",
-      "language": "en-US",
-      "title": "air-interface-diversity",
-      "elements": [
-        {
-          "id": "diversity-name",
-          "label": "diversity-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'spaceDiversity', 'frequencyDiversity'"
-        },
-        {
-          "id": "number-of-air-interfaces-max",
-          "label": "number-of-air-interfaces-max",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "air interfaces",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum number of air interfaces that could be part of this kind of diversity."
-        }
-      ],
-      "description": "Type of air interface diversity configured at the link."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-configuration-g:threshold-cross-alarm-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "threshold-cross-alarm-list",
-      "language": "en-US",
-      "title": "threshold-cross-alarm-list",
-      "elements": [
-        {
-          "id": "g826-value-kind",
-          "label": "g826-value-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "es",
-              "value": "es",
-              "description": "Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::es ."
-            },
-            {
-              "key": "ses",
-              "value": "ses",
-              "description": "Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::ses ."
-            },
-            {
-              "key": "cses",
-              "value": "cses",
-              "description": "Consecutive Severely Errored Seconds. Threshold cross alarm will relate to TypeDefinitions::AirInterfacePerformanceType::cses ."
-            },
-            {
-              "key": "not-specified",
-              "value": "not-specified",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of performance value that shall be equipped with a threshold alarm."
-        },
-        {
-          "id": "granularity-period",
-          "label": "granularity-period",
-          "uiType": "g:granularity-period-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Period of the performance data collection."
-        },
-        {
-          "id": "alarm-raising-threshold",
-          "label": "alarm-raising-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for raising the threshold cross alarm."
-        },
-        {
-          "id": "alarm-clearing-threshold",
-          "label": "alarm-clearing-threshold",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Number of events required for clearing the threshold cross alarm."
-        }
-      ],
-      "description": "List of threshold cross alarms to be configured."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-status",
-      "name": "air-interface-diversity-status",
-      "language": "en-US",
-      "title": "air-interface-diversity-status",
-      "elements": [
-        {
-          "id": "snir-cur",
-          "label": "snir-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dB",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Currently measured signal to (noise+interference) ratio of the combined signals."
-        },
-        {
-          "id": "air-interface-diversity-status",
-          "label": "air-interface-diversity-status",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "group-down",
-              "value": "group-down",
-              "description": "All air interfaces that are members of the diversity configuration are down."
-            },
-            {
-              "key": "not-all-ai-active",
-              "value": "not-all-ai-active",
-              "description": "At least one, but not all of the air interfaces that are part of the diversity configuration is not working."
-            },
-            {
-              "key": "all-ai-active",
-              "value": "all-ai-active",
-              "description": "All air interfaces that are part of the diversity configuration are working."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the air interface bundle."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Diversity Group entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-current-problems",
-      "name": "air-interface-diversity-current-problems",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-current-performance",
-      "name": "air-interface-diversity-current-performance",
-      "language": "en-US",
-      "title": "air-interface-diversity-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the air interface diversity configuration at a particular moment."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-air-interface-diversity-pac",
-      "object": "air-interface-diversity-historical-performances",
-      "name": "air-interface-diversity-historical-performances",
-      "language": "en-US",
-      "title": "air-interface-diversity-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:air-interface-diversity-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the air interface diversity configuration for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:air-interface-diversity-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:air-interface-diversity-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-capability",
-      "name": "pure-ethernet-structure-capability",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        }
-      ],
-      "description": "Describes the logical structuring of the physical capacity provided by a pure Ethernet microwave device. Segmentation is not available. No fixed segment size. No TDM transport."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-configuration",
-      "name": "pure-ethernet-structure-configuration",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-configuration",
-      "elements": [
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the type of problem to be configured."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-status",
-      "name": "pure-ethernet-structure-status",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-status",
-      "elements": [
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-status-g:segment-status-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of the Ethernet transport segment. Always just one segment."
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-status-g:segment-status-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "segment-status-list",
-      "language": "en-US",
-      "title": "segment-status-list",
-      "elements": [
-        {
-          "id": "segment-status-type-id",
-          "label": "segment-status-type-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-is-reserved-for-tdm",
-          "label": "segment-is-reserved-for-tdm",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm."
-        },
-        {
-          "id": "operational-status",
-          "label": "operational-status",
-          "uiType": "core-model:operational-state",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current operational status of each segment."
-        },
-        {
-          "id": "obsolete-priority-class",
-          "label": "obsolete-priority-class",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank."
-        },
-        {
-          "id": "obsolete-drop-order-rank",
-          "label": "obsolete-drop-order-rank",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. _unique: within Structure::StructureStatus::segmentStatusList"
-        }
-      ],
-      "description": "Status of the Ethernet transport segment. Always just one segment."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-current-problems",
-      "name": "pure-ethernet-structure-current-problems",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-current-performance",
-      "name": "pure-ethernet-structure-current-performance",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the structure of an pure Ethernet microwave at a particular moment."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-pure-ethernet-structure-pac",
-      "object": "pure-ethernet-structure-historical-performances",
-      "name": "pure-ethernet-structure-historical-performances",
-      "language": "en-US",
-      "title": "pure-ethernet-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:pure-ethernet-structure-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the structure of an pure Ethernet microwave for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:pure-ethernet-structure-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-capability",
-      "name": "hybrid-mw-structure-capability",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-capability",
-      "elements": [
-        {
-          "id": "structure-id",
-          "label": "structure-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the Structure for bundling and container."
-        },
-        {
-          "id": "supported-tdm-structure-types-list",
-          "label": "supported-tdm-structure-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-capability-g:supported-tdm-structure-types-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM frame types that are supported."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:non. Names are to be separated by commas. Further alarms might be added by the device."
-        }
-      ],
-      "description": "Describes the logical structuring of the physical capacity provided by a hybrid microwave device (TDM + Ethernet). Segmentation is available. TDM transport is available."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-capability-g:supported-tdm-structure-types-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "supported-tdm-structure-types-list",
-      "language": "en-US",
-      "title": "supported-tdm-structure-types-list",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "Lists the TDM frame types that are supported."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-configuration",
-      "name": "hybrid-mw-structure-configuration",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-configuration",
-      "elements": [
-        {
-          "id": "structure-kind",
-          "label": "structure-kind",
-          "uiType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:structure-kind",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "TDM frame to be applied."
-        },
-        {
-          "id": "structure-type",
-          "label": "structure-type",
-          "uiType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:structure-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "TDM frame to be applied."
-        },
-        {
-          "id": "number-of-tdm-segments-to-be-reserved",
-          "label": "number-of-tdm-segments-to-be-reserved",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Allows to configure the number of segments reserved for TDM frames of the type specified in HybridMwStructure::HybridMwStructureConfiguration::structureType"
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the type of problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-configuration-g:structure-kind",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "structure-kind",
-      "language": "en-US",
-      "title": "structure-kind",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "TDM frame to be applied."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-configuration-g:structure-type",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "structure-type",
-      "language": "en-US",
-      "title": "structure-type",
-      "elements": [
-        {
-          "id": "tdm-structure-name",
-          "label": "tdm-structure-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','ds3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-segment-size",
-          "label": "tdm-segment-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Size of the TDM segment in kbit/s. Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        },
-        {
-          "id": "max-number-of-segments-reservable",
-          "label": "max-number-of-segments-reservable",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "segments",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Device specific maximum number of segments (not depending on current air interface configuration) that can be reserved for this type of segment on a single air interface."
-        }
-      ],
-      "description": "TDM frame to be applied."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the type of problem to be configured."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-status",
-      "name": "hybrid-mw-structure-status",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-status",
-      "elements": [
-        {
-          "id": "segment-status-list",
-          "label": "segment-status-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-status-g:segment-status-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1"
-        },
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the last update of the status information."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-status-g:segment-status-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "segment-status-list",
-      "language": "en-US",
-      "title": "segment-status-list",
-      "elements": [
-        {
-          "id": "segment-status-type-id",
-          "label": "segment-status-type-id",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-is-reserved-for-tdm",
-          "label": "segment-is-reserved-for-tdm",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "The number of segments, which is configured by Structure::StructureConfiguration::tdmReservedNumberOfSegements, has to be reserved for TDM. Starting from the lowest index value, these segments have to be marked with a 'true' in segmentIsReservedForTdm."
-        },
-        {
-          "id": "operational-status",
-          "label": "operational-status",
-          "uiType": "core-model:operational-state",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current operational status of each segment."
-        },
-        {
-          "id": "obsolete-priority-class",
-          "label": "obsolete-priority-class",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "PriorityClass as inherited from the associated Container::ContainerConfiguration::priorityClass. In case the device is capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, priorityClass shall be considered, while calculating the dropOrderRank."
-        },
-        {
-          "id": "obsolete-drop-order-rank",
-          "label": "obsolete-drop-order-rank",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case the device is NOT capable of adapting the sequence, in which segments are being dropped in case of decreasing capacity of the air interface, dropOrderRank is number of segments minus sequence number of the segment. In case the device is capable of adapting the sequence, dropOrderRank has to be calculated by the device in dependency to the assigned priorityClass. _unique: within Structure::StructureStatus::segmentStatusList"
-        }
-      ],
-      "description": "Status of each segment (all TDM and one Ethernet). Multiplicity = HybridMwStructure::StructureConfiguration::tdmReservedNumberOfSegments + 1"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-current-problems",
-      "name": "hybrid-mw-structure-current-problems",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Structure::StructureCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-current-performance",
-      "name": "hybrid-mw-structure-current-performance",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the structure of a hybrid microwave at a particular moment."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-hybrid-mw-structure-pac",
-      "object": "hybrid-mw-structure-historical-performances",
-      "name": "hybrid-mw-structure-historical-performances",
-      "language": "en-US",
-      "title": "hybrid-mw-structure-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:hybrid-mw-structure-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the structure of a hybrid microwave for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:hybrid-mw-structure-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:structure-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-capability",
-      "name": "ethernet-container-capability",
-      "language": "en-US",
-      "title": "ethernet-container-capability",
-      "elements": [
-        {
-          "id": "bundling-is-avail",
-          "label": "bundling-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "This attribute has to be set on 'true', if the device allows combining resources from several air interfaces for transporting this Ethernet container."
-        },
-        {
-          "id": "packet-compression-is-avail",
-          "label": "packet-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression can be activated, but not configured to a certain type, packetCompressionAvail shall be set on 'true', but none of the compression level specific booleans."
-        },
-        {
-          "id": "layer2-compression-is-avail",
-          "label": "layer2-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 available at the device."
-        },
-        {
-          "id": "vlan-compression-is-avail",
-          "label": "vlan-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer available at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-avail",
-          "label": "q-in-q-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN available at the device."
-        },
-        {
-          "id": "mpls-compression-is-avail",
-          "label": "mpls-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on mpls layer available at the device."
-        },
-        {
-          "id": "ipv4-compression-is-avail",
-          "label": "ipv4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 available at the device."
-        },
-        {
-          "id": "ipv6-compression-is-avail",
-          "label": "ipv6-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 available at the device."
-        },
-        {
-          "id": "layer4-compression-is-avail",
-          "label": "layer4-compression-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) available at the device."
-        },
-        {
-          "id": "encryption-is-avail",
-          "label": "encryption-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Shall be marked 'true', if Ethernet payload encryption is available."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-configuration",
-      "name": "ethernet-container-configuration",
-      "language": "en-US",
-      "title": "ethernet-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as EthernetPortID in OpenFlow so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "segments-id-list",
-          "label": "segments-id-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-configuration-g:segments-id-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list."
-        },
-        {
-          "id": "packet-compression-is-on",
-          "label": "packet-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "In case packet compression is activated, but no type is activated, it is assumed that the device chooses the optimum."
-        },
-        {
-          "id": "layer2-compression-is-on",
-          "label": "layer2-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 2 configured at the device."
-        },
-        {
-          "id": "vlan-compression-is-on",
-          "label": "vlan-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on VLAN layer configured at the device."
-        },
-        {
-          "id": "q-in-q-compression-is-on",
-          "label": "q-in-q-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer of a second VLAN configured at the device."
-        },
-        {
-          "id": "mpls-compression-is-on",
-          "label": "mpls-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on MPLS layer configured at the device."
-        },
-        {
-          "id": "ipv4-compression-is-on",
-          "label": "ipv4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv4 configured at the device."
-        },
-        {
-          "id": "ipv6-compression-is-on",
-          "label": "ipv6-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 3 for IPv6 configured at the device."
-        },
-        {
-          "id": "layer4-compression-is-on",
-          "label": "layer4-compression-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Packet compression on layer 4 (TCP and UDP header) configured at the device."
-        },
-        {
-          "id": "encryption-is-on",
-          "label": "encryption-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activates encryption of the Ethernet payload."
-        },
-        {
-          "id": "cryptographic-key",
-          "label": "cryptographic-key",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Key for transforming plaintext into cipher text data."
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-configuration-g:segments-id-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "segments-id-list",
-      "language": "en-US",
-      "title": "segments-id-list",
-      "elements": [
-        {
-          "id": "structure-id-ref",
-          "label": "structure-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-id-ref",
-          "label": "segment-id-ref",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once."
-        }
-      ],
-      "description": "Lists the segments used for transporting this Ethernet container. In case EthernetContainer::ContainerCapability::bundlingIsAvail==0, all TypeDefinitions::segmentIdType::structureId must be identical in the list."
-    },
-    {
-      "id": "microwave-model:ethernet-container-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "microwave-model:ethernet-container-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-status",
-      "name": "ethernet-container-status",
-      "language": "en-US",
-      "title": "ethernet-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-current-problems",
-      "name": "ethernet-container-current-problems",
-      "language": "en-US",
-      "title": "ethernet-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-current-performance",
-      "name": "ethernet-container-current-performance",
-      "language": "en-US",
-      "title": "ethernet-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the Ethernet container at a particular moment."
-    },
-    {
-      "id": "microwave-model:ethernet-container-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:ethernet-container-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-ethernet-container-pac",
-      "object": "ethernet-container-historical-performances",
-      "name": "ethernet-container-historical-performances",
-      "language": "en-US",
-      "title": "ethernet-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:ethernet-container-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the Ethernet container for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:ethernet-container-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-capability",
-      "name": "tdm-container-capability",
-      "language": "en-US",
-      "title": "tdm-container-capability",
-      "elements": [
-        {
-          "id": "supported-tdm-container-types-list",
-          "label": "supported-tdm-container-types-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-capability-g:supported-tdm-container-types-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Lists the TDM containers that are supported."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the vendor."
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'framingIsFaulty' and 'containerIsDown'. Further alarms might be added by the device."
-        }
-      ],
-      "description": "Bundling is not available."
-    },
-    {
-      "id": "microwave-model:tdm-container-capability-g:supported-tdm-container-types-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "supported-tdm-container-types-list",
-      "language": "en-US",
-      "title": "supported-tdm-container-types-list",
-      "elements": [
-        {
-          "id": "tdm-container-name",
-          "label": "tdm-container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-container-size",
-          "label": "tdm-container-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        }
-      ],
-      "description": "Lists the TDM containers that are supported."
-    },
-    {
-      "id": "microwave-model:tdm-container-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-configuration",
-      "name": "tdm-container-configuration",
-      "language": "en-US",
-      "title": "tdm-container-configuration",
-      "elements": [
-        {
-          "id": "container-id",
-          "label": "container-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ContainterID in Netconf must be the same as TDM Flow ID so a connection can be made between the two items, which separately exist in the controller."
-        },
-        {
-          "id": "container-type",
-          "label": "container-type",
-          "uiType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:container-type",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of TDM container."
-        },
-        {
-          "id": "segment-id",
-          "label": "segment-id",
-          "uiType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:segment-id",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;"
-        },
-        {
-          "id": "performance-monitoring-collection-is-on",
-          "label": "performance-monitoring-collection-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Enables measurement, collection, storage and access to performance data."
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-configuration-g:container-type",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "container-type",
-      "language": "en-US",
-      "title": "container-type",
-      "elements": [
-        {
-          "id": "tdm-container-name",
-          "label": "tdm-container-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Names to be chosen from the following list: 'e1','t1','j1','e3','t3','stm1','cpri1','cpri2','cpri3','cpri4','cpri5','cpri6' or 'cpri7'"
-        },
-        {
-          "id": "tdm-container-size",
-          "label": "tdm-container-size",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "kbit/s",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Capacity required for transporting this type of container (in kbit/s). Values to be chosen from the following list: '2048','1544','34000','44736 ','155520','614400','1228800','2457600','3072000','4915200','6144000' or '9830400;"
-        }
-      ],
-      "description": "Type of TDM container."
-    },
-    {
-      "id": "microwave-model:tdm-container-configuration-g:segment-id",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "segment-id",
-      "language": "en-US",
-      "title": "segment-id",
-      "elements": [
-        {
-          "id": "structure-id-ref",
-          "label": "structure-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "segment-id-ref",
-          "label": "segment-id-ref",
-          "uiType": "number",
-          "min": -32768,
-          "max": 32767,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Combinations of structureId and segmentId must be unique inside the device to assure that every resource is used just once."
-        }
-      ],
-      "description": "Multiplicity = 1; One segment per TDM container; Type of segment must match type of container;"
-    },
-    {
-      "id": "microwave-model:tdm-container-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "microwave-model:tdm-container-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-status",
-      "name": "tdm-container-status",
-      "language": "en-US",
-      "title": "tdm-container-status",
-      "elements": [
-        {
-          "id": "last-status-change",
-          "label": "last-status-change",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time the Container entered its current operational status."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-current-problems",
-      "name": "tdm-container-current-problems",
-      "language": "en-US",
-      "title": "tdm-container-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to Container::ContainerCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:tdm-container-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-current-performance",
-      "name": "tdm-container-current-performance",
-      "language": "en-US",
-      "title": "tdm-container-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the TDM container at a particular moment."
-    },
-    {
-      "id": "microwave-model:tdm-container-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:tdm-container-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "mw-tdm-container-pac",
-      "object": "tdm-container-historical-performances",
-      "name": "tdm-container-historical-performances",
-      "language": "en-US",
-      "title": "tdm-container-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:tdm-container-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the TDM container for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:tdm-container-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:container-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-capability-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-capability",
-      "name": "wire-interface-capability",
-      "language": "en-US",
-      "title": "wire-interface-capability",
-      "elements": [
-        {
-          "id": "available-mau-list",
-          "label": "available-mau-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-capability-g:available-mau-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of Medium Attachment Units (MAUs) that are available for being selected. If rate and service configuration (e.g. SFF-8079) are not supported, the MAU determined by hardware shall be described."
-        },
-        {
-          "id": "auto-pmd-negotiation-is-avail",
-          "label": "auto-pmd-negotiation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = Indicates that device is supporting Auto-negotiation"
-        },
-        {
-          "id": "auto-pmd-negotiation-max-is-avail",
-          "label": "auto-pmd-negotiation-max-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that device is supporting definition of the maximum speed/Medium Attached Unit (MAU) automatically chosen when (autoNegotiationIsOn=1)"
-        },
-        {
-          "id": "supported-loop-back-kind-list",
-          "label": "supported-loop-back-kind-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of supported kinds of looping back of header information to the remote site. 802.3 45.2.1.12.1 PMA remote loopback ability"
-        },
-        {
-          "id": "maintenance-timer-range",
-          "label": "maintenance-timer-range",
-          "uiType": "string",
-          "unit": "Byte",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "MW IM Available time periods for maintenance configurations (e.g. the loop back) to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360')."
-        },
-        {
-          "id": "supported-alarm-list",
-          "label": "supported-alarm-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-capability-g:available-mau-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "available-mau-list",
-      "language": "en-US",
-      "title": "available-mau-list",
-      "elements": [
-        {
-          "id": "mau-id",
-          "label": "mau-id",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according to 30.5.1.1.1 aMAUID Unique identifier of the Medium Attachment Unit (MAU) instance within the data about the device"
-        },
-        {
-          "id": "mii-kind",
-          "label": "mii-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "gbic",
-              "value": "gbic",
-              "description": "none"
-            },
-            {
-              "key": "soldered-connector",
-              "value": "soldered-connector",
-              "description": "none"
-            },
-            {
-              "key": "sfp-sfp-plus-sfp28",
-              "value": "sfp-sfp-plus-sfp28",
-              "description": "none"
-            },
-            {
-              "key": "xbi-300-pin",
-              "value": "xbi-300-pin",
-              "description": "none"
-            },
-            {
-              "key": "xenpak",
-              "value": "xenpak",
-              "description": "none"
-            },
-            {
-              "key": "xfp",
-              "value": "xfp",
-              "description": "none"
-            },
-            {
-              "key": "xfp-e",
-              "value": "xfp-e",
-              "description": "none"
-            },
-            {
-              "key": "xpak",
-              "value": "xpak",
-              "description": "none"
-            },
-            {
-              "key": "x2",
-              "value": "x2",
-              "description": "none"
-            },
-            {
-              "key": "dwdm-sfp-sfp-plus",
-              "value": "dwdm-sfp-sfp-plus",
-              "description": "none"
-            },
-            {
-              "key": "qsfp",
-              "value": "qsfp",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus",
-              "value": "qsfp-plus",
-              "description": "none"
-            },
-            {
-              "key": "cxp",
-              "value": "cxp",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-4-x",
-              "value": "shielded-mini-multilane-hd-4-x",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-8-x",
-              "value": "shielded-mini-multilane-hd-8-x",
-              "description": "none"
-            },
-            {
-              "key": "qsfp28",
-              "value": "qsfp28",
-              "description": "none"
-            },
-            {
-              "key": "cxp2",
-              "value": "cxp2",
-              "description": "none"
-            },
-            {
-              "key": "cdfp-style1-style2",
-              "value": "cdfp-style1-style2",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-4-x-fan-out",
-              "value": "shielded-mini-multilane-hd-4-x-fan-out",
-              "description": "none"
-            },
-            {
-              "key": "shielded-mini-multilane-hd-8-x-fan-out",
-              "value": "shielded-mini-multilane-hd-8-x-fan-out",
-              "description": "none"
-            },
-            {
-              "key": "cdfp-style3",
-              "value": "cdfp-style3",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-micro",
-              "value": "qsfp-micro",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-dd",
-              "value": "qsfp-dd",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus-rate-select-v1",
-              "value": "qsfp-plus-rate-select-v1",
-              "description": "none"
-            },
-            {
-              "key": "qsfp-plus-rate-select-v2",
-              "value": "qsfp-plus-rate-select-v2",
-              "description": "none"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "SFF8472_SFF8636 Kind of Medium Independent Interface (MII) provided by this Medium Attachment Unit (MAU) (e.g. SFP, moldered port)"
-        },
-        {
-          "id": "mdi-kind",
-          "label": "mdi-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "sc",
-              "value": "sc",
-              "description": "Subscriber Connector"
-            },
-            {
-              "key": "fibre-channel-style-1",
-              "value": "fibre-channel-style-1",
-              "description": "Copper connector"
-            },
-            {
-              "key": "fibre-channel-style-2",
-              "value": "fibre-channel-style-2",
-              "description": "Copper connector"
-            },
-            {
-              "key": "bnc-tnc",
-              "value": "bnc-tnc",
-              "description": "Bayonet/Threaded Neill-Concelman"
-            },
-            {
-              "key": "fc",
-              "value": "fc",
-              "description": "Fibre Channel coax headers"
-            },
-            {
-              "key": "fiber-jack",
-              "value": "fiber-jack",
-              "description": "none"
-            },
-            {
-              "key": "lc",
-              "value": "lc",
-              "description": "Lucent Connector"
-            },
-            {
-              "key": "mt-rj",
-              "value": "mt-rj",
-              "description": "Mechanical Transfer - Registered Jack"
-            },
-            {
-              "key": "mu",
-              "value": "mu",
-              "description": "Multiple Optical"
-            },
-            {
-              "key": "sg",
-              "value": "sg",
-              "description": "none"
-            },
-            {
-              "key": "optical-pigtail",
-              "value": "optical-pigtail",
-              "description": "none"
-            },
-            {
-              "key": "mpo1-x12",
-              "value": "mpo1-x12",
-              "description": "Multifiber Parallel Optic"
-            },
-            {
-              "key": "mpo2-x16",
-              "value": "mpo2-x16",
-              "description": "Multifiber Parallel Optic"
-            },
-            {
-              "key": "hssdc-ii",
-              "value": "hssdc-ii",
-              "description": "High Speed Serial Data Connector"
-            },
-            {
-              "key": "copper-pigtail",
-              "value": "copper-pigtail",
-              "description": "none"
-            },
-            {
-              "key": "rj45",
-              "value": "rj45",
-              "description": "8P8C, according to Clause 3 and Figures 1 through 5 of IEC 60603-7"
-            },
-            {
-              "key": "no-seperable-connector",
-              "value": "no-seperable-connector",
-              "description": "none"
-            },
-            {
-              "key": "mxc2-x16",
-              "value": "mxc2-x16",
-              "description": "none"
-            },
-            {
-              "key": "st",
-              "value": "st",
-              "description": "according to IEC 60874-10:1992, also often called BFOC/2.5"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of Medium Dependent Interface (MDI) provided by this Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "required-medium-kind",
-          "label": "required-medium-kind",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "tp-cat3",
-              "value": "tp-cat3",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat5",
-              "value": "tp-cat5",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat6",
-              "value": "tp-cat6",
-              "description": "none"
-            },
-            {
-              "key": "tp-cat8",
-              "value": "tp-cat8",
-              "description": "none"
-            },
-            {
-              "key": "single-mode",
-              "value": "single-mode",
-              "description": "none"
-            },
-            {
-              "key": "multi-mode",
-              "value": "multi-mode",
-              "description": "none"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Kind of medium required for operating this Medium Attachment Unit (MAU), more like an information field"
-        },
-        {
-          "id": "wavelength-grid-min",
-          "label": "wavelength-grid-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Minimum grid spacing supported by the transceiver, -1 = not applicable, 0 = not known SFF-8690"
-        },
-        {
-          "id": "link-length-max",
-          "label": "link-length-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "m",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the maximum link length that is supported by the transceiver on the medium, which is specified in the standard referenced in TypeDefinitions::phyType::phyKind."
-        },
-        {
-          "id": "vendor-name",
-          "label": "vendor-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the vendor of the transceiver Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerName"
-        },
-        {
-          "id": "vendor-oui",
-          "label": "vendor-oui",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Describes the IEEE Company identifier of the vendor of the transceiver (1st part of 802.3 ResourceTypeID) 802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::ManufacturerProperties::manufacturerIdentifier"
-        },
-        {
-          "id": "part-number",
-          "label": "part-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as six bit model number Uniquely identifies the transceiver in the vendor's product lists Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::partTypeIdentifier"
-        },
-        {
-          "id": "revision-number",
-          "label": "revision-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Identifies the revision number of the transceiver (3rd part of 802.3 ResourceTypeID) 802.3 22.2.4.3.1 PHY Identifier; also referenced in 45.2.1.13 PMA/PMD package identifier as four-bit revision number Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentType::version"
-        },
-        {
-          "id": "serial-number",
-          "label": "serial-number",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Vendor's serial number for the transceiver. 0 = not applicable Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::serialNumber"
-        },
-        {
-          "id": "date-code",
-          "label": "date-code",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Vendor's date code for the transceiver Will be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::InvariantDetails::EquipmentInstance::manufactureDate"
-        },
-        {
-          "id": "auto-signal-ordering-is-avail",
-          "label": "auto-signal-ordering-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = there is a mechanism for automatically crossing over tx and rx implemented"
-        },
-        {
-          "id": "short-reach-mode-is-avail",
-          "label": "short-reach-mode-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64 is available"
-        },
-        {
-          "id": "eee-is-avail",
-          "label": "eee-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Indicates that Energy-Efficient Ethernet (EEE) is available at the device."
-        },
-        {
-          "id": "unidirectional-operation-is-avail",
-          "label": "unidirectional-operation-is-avail",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Medium Attachment Unit (MAU) able to transmit from Media Independent Interface (MII) regardless of whether the MAU has determined that a valid link has been established, 0 = MAU able to transmit from MII only when the MAU has determined that a valid link has been established 802.3"
-        },
-        {
-          "id": "wavelength-min",
-          "label": "wavelength-min",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "SFF-8690 Minimum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMax = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5"
-        },
-        {
-          "id": "wavelength-max",
-          "label": "wavelength-max",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Maximum laser wavelength in pico meter, -1 = not applicable, 0 = not known, wavelengthMin = wavelength cannot be configured; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5 SFF-8690"
-        },
-        {
-          "id": "pmd-list",
-          "label": "pmd-list",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "List of Physical Medium Dependent (PMD) that can be operated *** In case ordering of the signals depends on the PMD, pmdList has to be put into the datatype for the signal ordering ***"
-        },
-        {
-          "id": "supported-alarms",
-          "label": "supported-alarms",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "MW IM Available alarms to be listed. Mandatory:'txFault', 'rxLos', 'tempHigh', 'tempLow', 'rxLevelHigh', 'rxLevelLow'. Optional:'vccHigh', 'vccLow', 'txBiasHigh', 'txBiasLow', 'txPowerHigh', 'txPowerLow', 'laserTempHigh', 'laserTempLow', 'tecCurrentHigh', 'tecCurrentLow'. Further alarms might be added by the device. Names are to be separated by commas."
-        },
-        {
-          "id": "signal-ordering-list",
-          "label": "signal-ordering-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:mau-type-g:signal-ordering-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Describes the different (e.g. MDI, MDI-X) ways of ordering the signals on the physical medium"
-        }
-      ],
-      "description": "List of Medium Attachment Units (MAUs) that are available for being selected. If rate and service configuration (e.g. SFF-8079) are not supported, the MAU determined by hardware shall be described."
-    },
-    {
-      "id": "microwave-model:wire-interface-configuration-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-configuration",
-      "name": "wire-interface-configuration",
-      "language": "en-US",
-      "title": "wire-interface-configuration",
-      "elements": [
-        {
-          "id": "wire-interface-name",
-          "label": "wire-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Text field for the wire interface being named by the operator. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network Parameter"
-        },
-        {
-          "id": "remote-wire-interface-name",
-          "label": "remote-wire-interface-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Learning from MW IM Text field for defining the wire interface this one is connected with. Ideally used for entering unique numbers or names for unambiguously identifying the connection within the network"
-        },
-        {
-          "id": "interface-is-on",
-          "label": "interface-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Activation of the interface (it gets powered and can be managed even if the transceiver is not yet transmitting or receiving). In case there is no Medium Attachment Unit (MAU) (e.g. no SFP in the cage) SETting (interfaceIsOn=1) must be ignored and GETing must return (interfaceIsOn=0) 802.3 according 30.3.2.2.1 acPhyAdminControl"
-        },
-        {
-          "id": "transceiver-is-on-list",
-          "label": "transceiver-is-on-list",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 22.?.? and additionally 802.3 45.2.1.8 PMD transmit disable register (Register 1.9) 1 = Activation of the transmitter and receiver (e.g. laser) of the PHY; transceiverIsOnList[0]:total interface; transceiverIsOnList[1..10] different lanes of a multilane Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "auto-pmd-negotiation-is-on",
-          "label": "auto-pmd-negotiation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = Auto-negotiation is switched on"
-        },
-        {
-          "id": "fixed-pmd",
-          "label": "fixed-pmd",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoPmdNegotiationIsOn=0) configuration of the concrete kind of Physical Medium Dependent (PMD). If (autoNegotiationIsOn=1) value of this field becomes irrelevant"
-        },
-        {
-          "id": "auto-pmd-negotiation-max",
-          "label": "auto-pmd-negotiation-max",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter If (autoNegotiationIsOn=1) AND (autoNegotiationMauMaxIsAvail=1) configuration of the maximum speed/Physical Medium Dependent (PMD), which is automatically chosen by Auto-negotiation"
-        },
-        {
-          "id": "auto-signal-ordering-is-on",
-          "label": "auto-signal-ordering-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = e.g. auto-MDI-X is switched on"
-        },
-        {
-          "id": "fixed-signal-ordering",
-          "label": "fixed-signal-ordering",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoSignalOrderingIsOn=0) configuration of the concrete kind of signal ordering on the media (e.g. MDI, or MDI-X). If (autoSignalOrderingIsOn=1) value of this field becomes irrelevant"
-        },
-        {
-          "id": "short-reach-mode-is-on",
-          "label": "short-reach-mode-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Activation of the Short Reach Mode for 10GBASE-T according to 802.3 45.2.1.64"
-        },
-        {
-          "id": "unidirectional-operation-is-on",
-          "label": "unidirectional-operation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "If (autoNegotiationIsOn=1) OR manualDuplexSelection=0 (=half duplex), this bit is ignored. When autoNegotiationIsOn=0 AND manualDuplexSelection=1 (=full duplex): 1 = Enable transmit from media independent interface regardless of whether the PHY has determined that a valid link has been established, 0 = Enable transmit from media independent interface only when the PHY has determined that a valid link has been established 802.3 Parameter"
-        },
-        {
-          "id": "wavelength-list",
-          "label": "wavelength-list",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "unit": "pm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Wavelength of the signal of laser in pico meter; multiplicity=0..3 for 10GBASE-LX4 according to 802.3 53.5 SFF-8690"
-        },
-        {
-          "id": "temperature-high-threshold",
-          "label": "temperature-high-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming high temperature values. Will move to somewhere in the Physical Segment of the Core IM"
-        },
-        {
-          "id": "temperature-low-threshold",
-          "label": "temperature-low-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming low temperature values. Will move to somewhere in the Physical Segment of the Core IM"
-        },
-        {
-          "id": "rxlevel-high-threshold",
-          "label": "rxlevel-high-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming high RX levels."
-        },
-        {
-          "id": "rxlevel-low-threshold",
-          "label": "rxlevel-low-threshold",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Threshold for alarming low RX levels."
-        },
-        {
-          "id": "loop-back-kind-on",
-          "label": "loop-back-kind-on",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 802.3 according 22.2.4.1.2 Loopback Maintenance Feature. The currently configured type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site. Activation of local loopback mode on physical layer"
-        },
-        {
-          "id": "isolation-is-on",
-          "label": "isolation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Activation of the separation of the PHY from higher network layers 802.3"
-        },
-        {
-          "id": "restart-pmd-negotiation-is-on",
-          "label": "restart-pmd-negotiation-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Restarts the auto negotiation process 802.3"
-        },
-        {
-          "id": "reset-mau-is-on",
-          "label": "reset-mau-is-on",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 Resets the entire Medium Access Unit (MAU)"
-        },
-        {
-          "id": "maintenance-timer",
-          "label": "maintenance-timer",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter and MW IM Time of existence of any maintenance configuration (e.g. the loop back). Valid values are defined in WireInterface::WireInterfaceCapability::maintenanceTimerRange"
-        },
-        {
-          "id": "problem-kind-severity-list",
-          "label": "problem-kind-severity-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-configuration-g:problem-kind-severity-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem to be configured."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-configuration-g:problem-kind-severity-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "problem-kind-severity-list",
-      "language": "en-US",
-      "title": "problem-kind-severity-list",
-      "elements": [
-        {
-          "id": "problem-kind-name",
-          "label": "problem-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "problem-kind-severity",
-          "label": "problem-kind-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of this type of alarm."
-        }
-      ],
-      "description": "Severity of the problem to be configured."
-    },
-    {
-      "id": "microwave-model:wire-interface-status-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-status",
-      "name": "wire-interface-status",
-      "language": "en-US",
-      "title": "wire-interface-status",
-      "elements": [
-        {
-          "id": "interface-is-up",
-          "label": "interface-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 according 30.3.2.1.7 aPhyAdminState 1 = A Physical layer entity (PHY) exists (including Medium Attachment Unit (e.g. SFP) ) and it is powered and can be managed"
-        },
-        {
-          "id": "receive-signal-is-detected",
-          "label": "receive-signal-is-detected",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "802.3 45.2.1.9 PMD receive signal detect 1 = Receiver (e.g. laser) detects signal; receiveSignalIsDetected[0]:total interface; receiveSignalIsDetected[1..10] different lanes of a multilane Medium Attachment Unit (MAU)"
-        },
-        {
-          "id": "pmd-is-up",
-          "label": "pmd-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Inverse of 802.3 45.2.1.2.3 Fault (1.1.7) If (interfaceIsUp=1) BUT 0 = there is a fault in either transmit or receive path"
-        },
-        {
-          "id": "pmd-cur",
-          "label": "pmd-cur",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "10-base5",
-              "value": "10-base5",
-              "description": "Thick coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 8"
-            },
-            {
-              "key": "foirl",
-              "value": "foirl",
-              "description": "FOIRL Medium Attachment Unit (MAU) as specified in 802.3 Clause 9.9"
-            },
-            {
-              "key": "10-base2",
-              "value": "10-base2",
-              "description": "Thin coax Medium Attachment Unit (MAU) as specified in 802.3 Clause 10"
-            },
-            {
-              "key": "10-broad36",
-              "value": "10-broad36",
-              "description": "Broadband DTE Medium Attachment Unit (MAU) as specified in 802.3 Clause 11"
-            },
-            {
-              "key": "10-base-t",
-              "value": "10-base-t",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-thd",
-              "value": "10-base-thd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in half duplex mode"
-            },
-            {
-              "key": "10-base-tfd",
-              "value": "10-base-tfd",
-              "description": "Twisted-pair cabling Medium Attachment Unit (MAU) as specified in 802.3 Clause 14 in full duplex mode"
-            },
-            {
-              "key": "10-base-fp",
-              "value": "10-base-fp",
-              "description": "Passive fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 16"
-            },
-            {
-              "key": "10-base-fb",
-              "value": "10-base-fb",
-              "description": "Synchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 17"
-            },
-            {
-              "key": "10-base-fl",
-              "value": "10-base-fl",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "10-base-flhd",
-              "value": "10-base-flhd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in half duplex mode"
-            },
-            {
-              "key": "10-base-flfd",
-              "value": "10-base-flfd",
-              "description": "Asynchronous fiber Medium Attachment Unit (MAU) as specified in 802.3 Clause 18 in full duplex mode"
-            },
-            {
-              "key": "100-base-t4",
-              "value": "100-base-t4",
-              "description": "Four-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 23"
-            },
-            {
-              "key": "100-base-tx",
-              "value": "100-base-tx",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-txhd",
-              "value": "100-base-txhd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in half duplex mode"
-            },
-            {
-              "key": "100-base-txfd",
-              "value": "100-base-txfd",
-              "description": "Two-pair Category 5 twisted-pair cabling as specified in 802.3 Clause 25 in full duplex mode"
-            },
-            {
-              "key": "100-base-bx10-d",
-              "value": "100-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-bx10-u",
-              "value": "100-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-fx",
-              "value": "100-base-fx",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-fxhd",
-              "value": "100-base-fxhd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in half duplex mode"
-            },
-            {
-              "key": "100-base-fxfd",
-              "value": "100-base-fxfd",
-              "description": "X fiber over Physical Medium Dependent (PMD) as specified in 802.3 Clause 26 in full duplex mode"
-            },
-            {
-              "key": "100-base-lx10",
-              "value": "100-base-lx10",
-              "description": "Two fiber Physical layer entity (PHY) as specified in 802.3 Clause 58"
-            },
-            {
-              "key": "100-base-t2",
-              "value": "100-base-t2",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "100-base-t2-hd",
-              "value": "100-base-t2-hd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in half duplex mode"
-            },
-            {
-              "key": "100-base-t2-fd",
-              "value": "100-base-t2-fd",
-              "description": "Two-pair Category 3 twisted-pair cabling as specified in 802.3 Clause 32 in full duplex mode"
-            },
-            {
-              "key": "1000-base-x",
-              "value": "1000-base-x",
-              "description": "X as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD and duplex mode unknown"
-            },
-            {
-              "key": "1000-base-bx10-d",
-              "value": "1000-base-bx10-d",
-              "description": "One single-mode fiber Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-bx10-u",
-              "value": "1000-base-bx10-u",
-              "description": "One single-mode fiber Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-xhd",
-              "value": "1000-base-xhd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in half duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-xfd",
-              "value": "1000-base-xfd",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 36 over undefined Physical Medium Dependent (PMD) in full duplex mode. Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "1000-base-lx",
-              "value": "1000-base-lx",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-lxhd",
-              "value": "1000-base-lxhd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-lxfd",
-              "value": "1000-base-lxfd",
-              "description": "X fiber over long-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-lx10",
-              "value": "1000-base-lx10",
-              "description": "Two fiber 10km Physical layer entity (PHY) as specified in 802.3 Clause 59"
-            },
-            {
-              "key": "1000-base-sx",
-              "value": "1000-base-sx",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-sxhd",
-              "value": "1000-base-sxhd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in half duplex mode"
-            },
-            {
-              "key": "1000-base-sxfd",
-              "value": "1000-base-sxfd",
-              "description": "X fiber over short-wavelength laser Physical Medium Dependent (PMD) as specified in 802.3 Clause 38 in full duplex mode"
-            },
-            {
-              "key": "1000-base-cx",
-              "value": "1000-base-cx",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-cxhd",
-              "value": "1000-base-cxhd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in half duplex mode"
-            },
-            {
-              "key": "1000-base-cxfd",
-              "value": "1000-base-cxfd",
-              "description": "X copper over 150-Ohm balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 39 in full duplex mode"
-            },
-            {
-              "key": "1000-base-kx",
-              "value": "1000-base-kx",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 70"
-            },
-            {
-              "key": "1000-base-t",
-              "value": "1000-base-t",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40. Only to be applied when duplex mode unknown"
-            },
-            {
-              "key": "1000-base-thd",
-              "value": "1000-base-thd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in half duplex mode"
-            },
-            {
-              "key": "1000-base-tfd",
-              "value": "1000-base-tfd",
-              "description": "Four-pair Category 5 twisted-pair cabling Physical layer entity (PHY) as specified in 802.3 Clause 40 in full duplex mode"
-            },
-            {
-              "key": "10-gbase-x",
-              "value": "10-gbase-x",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 48 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-lx4",
-              "value": "10-gbase-lx4",
-              "description": "X fiber over 4 lane 1310nm optics as specified in 802.3 Clause 53"
-            },
-            {
-              "key": "10-gbase-cx4",
-              "value": "10-gbase-cx4",
-              "description": "X copper over 8 pair 100-Ohm balanced cable as specified in 802.3 Clause 54"
-            },
-            {
-              "key": "10-gbase-kx4",
-              "value": "10-gbase-kx4",
-              "description": "X Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 71"
-            },
-            {
-              "key": "10-gbase-r",
-              "value": "10-gbase-r",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) as specified in 802.3 Clause 49 over undefined Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "10-gbase-er",
-              "value": "10-gbase-er",
-              "description": "R fiber over 1550nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lr",
-              "value": "10-gbase-lr",
-              "description": "R fiber over 1310nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-sr",
-              "value": "10-gbase-sr",
-              "description": "R fiber over 850nm optics as specified in 802.3 Clause 52"
-            },
-            {
-              "key": "10-gbase-lrm",
-              "value": "10-gbase-lrm",
-              "description": "R fiber over 1310 nm optics as specified in 802.3 Clause 68"
-            },
-            {
-              "key": "10-gbase-kr",
-              "value": "10-gbase-kr",
-              "description": "R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 72"
-            },
-            {
-              "key": "10-gbase-t",
-              "value": "10-gbase-t",
-              "description": "Four-pair twisted-pair balanced copper cabling Physical layer entity (PHY) as specified in 802.3 Clause 55"
-            },
-            {
-              "key": "10-gbase-pr-d1",
-              "value": "10-gbase-pr-d1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d2",
-              "value": "10-gbase-pr-d2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d3",
-              "value": "10-gbase-pr-d3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-d4",
-              "value": "10-gbase-pr-d4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Line Terminal (OLT=>office side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u1",
-              "value": "10-gbase-pr-u1",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u2",
-              "value": "10-gbase-pr-u2",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u3",
-              "value": "10-gbase-pr-u3",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "10-gbase-pr-u4",
-              "value": "10-gbase-pr-u4",
-              "description": "One single-mode fiber 10.3125 GBd continuous downstream / burst mode upstream Optical Network Unit (ONU=>customer side) Physical layer entity (PHY) as specified in 802.3 Clause 75"
-            },
-            {
-              "key": "40-gbase-r",
-              "value": "40-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "40-gbase-kr4",
-              "value": "40-gbase-kr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 84"
-            },
-            {
-              "key": "40-gbase-cr4",
-              "value": "40-gbase-cr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "40-gbase-sr4",
-              "value": "40-gbase-sr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "4-x10-gbase-sr",
-              "value": "4-x10-gbase-sr",
-              "description": "4 times 10GBASE-S compatible to 802.3 Clause 52 over 4 lane multimode fiber"
-            },
-            {
-              "key": "40-gbase-lr4",
-              "value": "40-gbase-lr4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-er4",
-              "value": "40-gbase-er4",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 87"
-            },
-            {
-              "key": "40-gbase-fr",
-              "value": "40-gbase-fr",
-              "description": "40GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over single mode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 89"
-            },
-            {
-              "key": "100-gbase-r",
-              "value": "100-gbase-r",
-              "description": "Multi-lane PCS as specified in 802.3 Clause 82 over undefined 100GBASE-R or 100GBASE-P Physical Medium Attachment (PMA) and Physical Medium Dependent (PMD). Not to be configured and only to be returned when underlying PMD unknown"
-            },
-            {
-              "key": "100-gbase-cr4",
-              "value": "100-gbase-cr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 92"
-            },
-            {
-              "key": "100-gbase-kr4",
-              "value": "100-gbase-kr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 93"
-            },
-            {
-              "key": "100-gbase-kp4",
-              "value": "100-gbase-kp4",
-              "description": "100GBASE-P Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over an electrical backplane Physical Medium Dependent (PMD) as specified in 802.3 Clause 94"
-            },
-            {
-              "key": "100-gbase-cr10",
-              "value": "100-gbase-cr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane shielded copper balanced cable Physical Medium Dependent (PMD) as specified in 802.3 Clause 85"
-            },
-            {
-              "key": "100-gbase-sr4",
-              "value": "100-gbase-sr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 95"
-            },
-            {
-              "key": "100-gbase-sr10",
-              "value": "100-gbase-sr10",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 10 lane multimode fiber Physical Medium Dependent (PMD) as specified in 802.3 Clause 86"
-            },
-            {
-              "key": "2-x40-gbase-sr",
-              "value": "2-x40-gbase-sr",
-              "description": "2 times 40GBASE-S compatible to 802.3 Clause 86 over 10 lane multimode fiber"
-            },
-            {
-              "key": "10-x10-gbase-sr",
-              "value": "10-x10-gbase-sr",
-              "description": "10 times 10GBASE-S compatible to 802.3 Clause 52 over 10 lane multimode fiber"
-            },
-            {
-              "key": "12-x10-gbase-sr",
-              "value": "12-x10-gbase-sr",
-              "description": "12 times 10GBASE-S compatible to 802.3 Clause 52 over 12 lane multimode fiber"
-            },
-            {
-              "key": "100-gbase-lr4",
-              "value": "100-gbase-lr4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with long reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "100-gbase-er4",
-              "value": "100-gbase-er4",
-              "description": "100GBASE-R Physical Coding Sublayer (PCS) and Physical Medium Attachment (PMA) over 4 WDM lane single mode fiber Physical Medium Dependent (PMD), with extended reach, as specified in 802.3 Clause 88"
-            },
-            {
-              "key": "not-yet-defined",
-              "value": "not-yet-defined",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Indicates the kind of Physical Medium Dependent (PMD) currently operated at this interface"
-        },
-        {
-          "id": "signal-ordering-kind-cur",
-          "label": "signal-ordering-kind-cur",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-status-g:signal-ordering-kind-cur",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Reference on a SignalOrderingType for expressing the currently active way of ordering the signals on the physical medium. Must contain a value as defined in TypeDefinitions::SignalOrderingType::signalOrderingKindName"
-        },
-        {
-          "id": "eee-is-up",
-          "label": "eee-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = Energy Efficient Ethernet is supported at both ends of the link and it is activated"
-        },
-        {
-          "id": "link-is-up",
-          "label": "link-is-up",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Parameter 1 = (transceiverIsUp=1) AND communication is established to the remote site"
-        },
-        {
-          "id": "link-is-idle",
-          "label": "link-is-idle",
-          "uiType": "boolean",
-          "trueValue": "true",
-          "falseValue": "false",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "1 = (linkIsUp=1) AND (eeeIsAvail=1) AND (eeeIsOn=1) AND link is currently in idle mode. If Energy Efficient Ethernet is not supported or switched off, this attribute must be 0."
-        },
-        {
-          "id": "tx-level-cur",
-          "label": "tx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current transmit power"
-        },
-        {
-          "id": "rx-level-cur",
-          "label": "rx-level-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "dBm",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current receive power; Also used for receive signal power measured at the Medium Dependent Interface (MDI) of 10GBASE-T during training as described in 802.3 55.4.3.1"
-        },
-        {
-          "id": "temp-cur",
-          "label": "temp-cur",
-          "uiType": "number",
-          "min": -128,
-          "max": 127,
-          "format": "#",
-          "unit": "Celsius",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Current temperature (in degree Celsius) inside the transceiver To be moved to CoreModel::CorePhysicalModel-Initial::EquipmentDetail::ObjectClasses::DynamicDetails::PhysicalProperties"
-        },
-        {
-          "id": "loop-back-kind-up",
-          "label": "loop-back-kind-up",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "rf-to-remote",
-              "value": "rf-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "rf-to-local",
-              "value": "rf-to-local",
-              "description": "Returning the header information of the local site back to the local site on the radio interface between both outdoor units."
-            },
-            {
-              "key": "if-to-remote",
-              "value": "if-to-remote",
-              "description": "Returning the header information of the remote site back to the remote site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "if-to-local",
-              "value": "if-to-local",
-              "description": "Returning the header information of the local site back to the local site on the intermediate frequency interface between local indoor unit and outdoor unit."
-            },
-            {
-              "key": "none",
-              "value": "none",
-              "description": "none"
-            },
-            {
-              "key": "if",
-              "value": "if",
-              "description": "Intermediate Frequency on the interface between indoor and outdoor unit."
-            },
-            {
-              "key": "rf",
-              "value": "rf",
-              "description": "Radio Frequency on the interface between outdoor unit and outdoor unit at the remote site."
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Paramter and MW IM The currently active (not just configured) type of looping back of the wire interface header shall be expressed here. The received header is returned to the remote site."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-status-g:signal-ordering-kind-cur",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "signal-ordering-kind-cur",
-      "language": "en-US",
-      "title": "signal-ordering-kind-cur",
-      "elements": [
-        {
-          "id": "signal-ordering-kind-name",
-          "label": "signal-ordering-kind-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "To be filled according to TR-541. Must be unique for referencing during configuration of the interface."
-        },
-        {
-          "id": "signal-list",
-          "label": "signal-list",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Desciption of the signals on the Media Dependent Interface (MDI), might be e.g. 'TX+' in case of e.g. 10BASE-T, might be e.g. '1,295.56 nm' in case of e.g. 100GBASE-LR4"
-        }
-      ],
-      "description": "Reference on a SignalOrderingType for expressing the currently active way of ordering the signals on the physical medium. Must contain a value as defined in TypeDefinitions::SignalOrderingType::signalOrderingKindName"
-    },
-    {
-      "id": "microwave-model:wire-interface-current-problems-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-current-problems",
-      "name": "wire-interface-current-problems",
-      "language": "en-US",
-      "title": "wire-interface-current-problems",
-      "elements": [
-        {
-          "id": "current-problem-list",
-          "label": "current-problem-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-current-problems-g:current-problem-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-current-problems-g:current-problem-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-problem-list",
-      "language": "en-US",
-      "title": "current-problem-list",
-      "elements": [
-        {
-          "id": "problem-name",
-          "label": "problem-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the alarm according to WireInterface::WireInterfaceCapability::supportedAlarms"
-        },
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:wire-interface-current-performance-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-current-performance",
-      "name": "wire-interface-current-performance",
-      "language": "en-US",
-      "title": "wire-interface-current-performance",
-      "elements": [
-        {
-          "id": "current-performance-data-list",
-          "label": "current-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-current-performance-g:current-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-        }
-      ],
-      "description": "Aggregated performance information of the air interface at a particular moment."
-    },
-    {
-      "id": "microwave-model:wire-interface-current-performance-g:current-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "current-performance-data-list",
-      "language": "en-US",
-      "title": "current-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-current-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "At least values of the counters, which are reset every 15 minutes, are to be provided. If available, the current values of the counters, which are reset every 24 hour, can be provided, too."
-    },
-    {
-      "id": "microwave-model:wire-interface-historical-performances-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "wire-interface-pac",
-      "object": "wirebased-interface-historical-performances",
-      "name": "wire-interface-historical-performances",
-      "language": "en-US",
-      "title": "wire-interface-historical-performances",
-      "elements": [
-        {
-          "id": "historical-performance-data-list",
-          "label": "historical-performance-data-list",
-          "uiType": "list",
-          "listType": "object",
-          "viewId": "microwave-model:wire-interface-historical-performances-g:historical-performance-data-list",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "Aggregated performance information of the air interface for a pre-defined measurement interval."
-    },
-    {
-      "id": "microwave-model:wire-interface-historical-performances-g:historical-performance-data-list",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "name": "historical-performance-data-list",
-      "language": "en-US",
-      "title": "historical-performance-data-list",
-      "elements": [
-        {
-          "id": "performance-data",
-          "label": "performance-data",
-          "uiType": "object",
-          "viewId": "microwave-model:wire-interface-historical-performance-type-g:performance-data",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:mw-current-problem-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "air-interface-current-problem-type-g",
-      "name": "mw-current-problem",
-      "language": "en-US",
-      "title": "mw-current-problem",
-      "elements": [
-        {
-          "id": "sequence-number",
-          "label": "sequence-number",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Unique sequence number of the current problem object."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Time and date of the problem."
-        },
-        {
-          "id": "problem-severity",
-          "label": "problem-severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the alarm."
-        }
-      ],
-      "description": "none"
-    },
-    {
-      "id": "microwave-model:object-creation-notification-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "object-creation-notification",
-      "name": "object-creation-notification",
-      "language": "en-US",
-      "title": "object-creation-notification",
-      "elements": [
-        {
-          "id": "counter",
-          "label": "counter",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts object creation notifications."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "object-id-ref",
-          "label": "object-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac."
-        },
-        {
-          "id": "object-type",
-          "label": "object-type",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Type of Object to be chosen from the following list of values: 'MW_AirInterface_Pac', 'MW_AirInterfaceDiversity_Pac', 'MW_Structure_Pac', 'MW_PureEthernetStructure_Pac', 'MW_HybridMwStructure_Pac', 'MW_Container_Pac', 'MW_EthernetContainer_Pac' or 'MW_TdmContainer_Pac'."
-        }
-      ],
-      "description": "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac has to be instancieted in the controller."
-    },
-    {
-      "id": "microwave-model:object-deletion-notification-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "object-deletion-notification",
-      "name": "object-deletion-notification",
-      "language": "en-US",
-      "title": "object-deletion-notification",
-      "elements": [
-        {
-          "id": "counter",
-          "label": "counter",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts object deletion notifications."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "object-id-ref",
-          "label": "object-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac."
-        }
-      ],
-      "description": "To be sent when a new MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac instance has to be deleted in the controller."
-    },
-    {
-      "id": "microwave-model:attribute-value-changed-notification-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "attribute-value-changed-notification",
-      "name": "attribute-value-changed-notification",
-      "language": "en-US",
-      "title": "attribute-value-changed-notification",
-      "elements": [
-        {
-          "id": "counter",
-          "label": "counter",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts attribute value changed notifications."
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "object-id-ref",
-          "label": "object-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac."
-        },
-        {
-          "id": "attribute-name",
-          "label": "attribute-name",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the attribute that has been changed."
-        },
-        {
-          "id": "new-value",
-          "label": "new-value",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Attribute value converted to a string (xml, json, ...)"
-        }
-      ],
-      "description": "To be sent when an attribute has changed and one or more controllers have to update their data."
-    },
-    {
-      "id": "microwave-model:problem-notification-g",
-      "yangModule": "microwave-model",
-      "revision": "2018-10-10",
-      "package": "microwave-model",
-      "object": "problem-notification",
-      "name": "problem-notification",
-      "language": "en-US",
-      "title": "problem-notification",
-      "elements": [
-        {
-          "id": "counter",
-          "label": "counter",
-          "uiType": "number",
-          "min": -2147483648,
-          "max": 2147483647,
-          "format": "#",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Counts problem notifications"
-        },
-        {
-          "id": "time-stamp",
-          "label": "time-stamp",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "none"
-        },
-        {
-          "id": "object-id-ref",
-          "label": "object-id-ref",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "ID of the affected MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac."
-        },
-        {
-          "id": "problem",
-          "label": "problem",
-          "uiType": "string",
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Name of the problem according to AirInterface::AirInterfaceCapability::supportedAlarms or AirInterfaceDiversity::AirInterfaceDiversityCapability::supportedAlarms or Structure::StructureCapability::supportedAlarms or PureEthernetStructure::PureEthernetStructureCapability::supportedAlarms or HybridMwStructure::HybridMwStructureCapability::supportedAlarms or Container::ContainerCapability::supportedAlarms or EthernetContainer::EthernetContainerCapability::supportedAlarms or TdmContainer::TdmContainerCapability::supportedAlarms."
-        },
-        {
-          "id": "severity",
-          "label": "severity",
-          "uiType": "selection",
-          "options": [
-            {
-              "key": "non-alarmed",
-              "value": "non-alarmed",
-              "description": "none"
-            },
-            {
-              "key": "warning",
-              "value": "warning",
-              "description": "none"
-            },
-            {
-              "key": "minor",
-              "value": "minor",
-              "description": "none"
-            },
-            {
-              "key": "major",
-              "value": "major",
-              "description": "none"
-            },
-            {
-              "key": "critical",
-              "value": "critical",
-              "description": "none"
-            }
-          ],
-          "accessFlags": {
-            "read": true,
-            "write": false,
-            "create": false
-          },
-          "description": "Severity of the problem according to AirInterface::AirInterfaceConfiguration::problemSeverityList, AirInterfaceDiversity::AirInterfaceDiversityConfiguration::problemSeverityList, Structure::StructureConfiguration::problemSeverityList, PureEthernetStructure::PureEthernetStructureConfiguration::problemSeverityList, HybridMwStructure::HybridMwStructureConfiguration::problemSeverityList, Container::ContainerConfiguration::problemSeverityList, EthernetContainer::EthernetContainerConfiguration::problemSeverityList or TdmContainer::TdmContainerConfiguration::problemSeverityList"
-        }
-      ],
-      "description": "To be sent when a problem occurs at a MW_AirInterface_Pac, MW_AirInterfaceDiversity_Pac, MW_Structure_Pac, MW_PureEthernetStructure_Pac, MW_HybridMwStructure_Pac, MW_Container_Pac, MW_EthernetContainer_Pac or MW_TdmContainer_Pac."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/handlers/configurationAppRootHandler.ts b/sdnr/wt/odlux/apps/configurationApp/src/handlers/configurationAppRootHandler.ts
index b1fd5031d..04b63d39b 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/handlers/configurationAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/configurationApp/src/handlers/configurationAppRootHandler.ts
@@ -1,95 +1,29 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
-// main state handler
-
 import { combineActionHandler } from '../../../../framework/src/flux/middleware';
 
-import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
-import { IActionHandler } from '../../../../framework/src/flux/action';
-
-import { ViewSpecification } from '../models/uiModels';
-import { CoreModelNetworkElement } from '../models/coreModel';
-import { UpdateCoreModel, UpdateLoading, UpdateLp, UpdateViewData } from '../actions/configurationActions';
+import { IConnectedNetworkElementsState, connectedNetworkElementsActionHandler } from './connectedNetworkElementsHandler';
+import { IDeviceDescriptionState, deviceDescriptionHandler } from "./deviceDescriptionHandler";
+import { IViewDescriptionState, viewDescriptionHandler } from "./viewDescriptionHandler";
+import { IValueSelectorState, valueSelectorHandler } from "./valueSelectorHandler";
 
-export interface IConfigurationAppStoreState {
-  loading: boolean;
-  nodeId?: string;
-  lpId?: string;
-  viewId?: string;
-  indexValues?: string;
-  capability?: string;
-  conditionalPackage?: string,
-  coreModel?: CoreModelNetworkElement;
-  viewSpecifications: ViewSpecification[];
-  viewData: {};
+interface IConfigurationAppStoreState {
+  connectedNetworkElements: IConnectedNetworkElementsState; // used for ne selection
+  deviceDescription: IDeviceDescriptionState;               // contains ui and device descriptions
+  viewDescription: IViewDescriptionState;                   // contains current ui description
+  valueSelector: IValueSelectorState;
 }
 
 declare module '../../../../framework/src/store/applicationStore' {
   interface IApplicationStoreState {
-    configuration: IConfigurationAppStoreState
+    configuration: IConfigurationAppStoreState,
   }
 }
 
-const configurationAppStoreStateInit: IConfigurationAppStoreState = {
-  loading: false,
-  viewSpecifications: [],
-  viewData: {}
-};
-
-export const configurationAppRootHandler: IActionHandler<IConfigurationAppStoreState> = (state = configurationAppStoreStateInit, action) => {
-  if (action instanceof UpdateLoading) {
-    state = {
-      ...state,
-      loading: action.loading
-    };
-  } else if (action instanceof UpdateCoreModel) {
-    state = {
-      ...state,
-      nodeId: action.nodeId,
-      coreModel: action.coreModel,
-      lpId: undefined,
-      capability: undefined,
-      conditionalPackage: undefined,
-      viewSpecifications: [],
-      viewData: { },
-      indexValues: undefined,
-      viewId: undefined,
-    };
-  } else if (action instanceof UpdateLp) {
-    state = {
-      ...state,
-      lpId: action.lpId,
-      capability: action.capability,
-      conditionalPackage: action.conditionalPackage,
-      viewSpecifications: action.viewSpecifications,
-      viewData: { },
-      indexValues: undefined,
-      viewId: undefined,
-    };
-  } else if (action instanceof UpdateViewData) {
-    state = {
-      ...state,
-      viewData: action.viewData,
-      indexValues: action.indexValues,
-      viewId: action.viewId,
-    };
-  }
-  return state;
+const actionHandlers = {
+  connectedNetworkElements: connectedNetworkElementsActionHandler,
+  deviceDescription: deviceDescriptionHandler,
+  viewDescription: viewDescriptionHandler,
+  valueSelector: valueSelectorHandler,
 };
 
+export const configurationAppRootHandler = combineActionHandler<IConfigurationAppStoreState>(actionHandlers);
 export default configurationAppRootHandler;
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/handlers/connectedNetworkElementsHandler.ts b/sdnr/wt/odlux/apps/configurationApp/src/handlers/connectedNetworkElementsHandler.ts
new file mode 100644
index 000000000..6a68242eb
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/handlers/connectedNetworkElementsHandler.ts
@@ -0,0 +1,19 @@
+import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
+import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
+
+import { NetworkElementConnection } from '../models/networkElementConnection';
+
+export interface IConnectedNetworkElementsState extends IExternalTableState<NetworkElementConnection> { }
+
+// create eleactic search material data fetch handler
+const connectedNetworkElementsSearchHandler = createSearchDataHandler<NetworkElementConnection>('network-element-connection', { status: "Connected" });
+
+export const {
+  actionHandler: connectedNetworkElementsActionHandler,
+  createActions: createConnectedNetworkElementsActions,
+  createProperties: createConnectedNetworkElementsProperties,
+  reloadAction: connectedNetworkElementsReloadAction,
+
+  // set value action, to change a value
+} = createExternal<NetworkElementConnection>(connectedNetworkElementsSearchHandler, appState => appState.configuration.connectedNetworkElements);
+ 
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/handlers/deviceDescriptionHandler.ts b/sdnr/wt/odlux/apps/configurationApp/src/handlers/deviceDescriptionHandler.ts
new file mode 100644
index 000000000..3cc27aa95
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/handlers/deviceDescriptionHandler.ts
@@ -0,0 +1,30 @@
+import { Module } from "../models/yang";
+import { ViewSpecification } from "../models/uiModels";
+import { IActionHandler } from "../../../../framework/src/flux/action";
+import { UpdateDeviceDescription } from "../actions/deviceActions";
+
+export interface IDeviceDescriptionState {
+  nodeId: string,
+  modules: {
+    [name: string]: Module
+  },
+  views: ViewSpecification[],
+}
+
+const deviceDescriptionStateInit: IDeviceDescriptionState = {
+  nodeId: "",
+  modules: {},
+  views: []
+};
+
+export const deviceDescriptionHandler: IActionHandler<IDeviceDescriptionState> = (state = deviceDescriptionStateInit, action) => {
+  if (action instanceof UpdateDeviceDescription) {
+    state = {
+      ...state,
+      nodeId: action.nodeId,
+      modules: action.modules,
+      views: action.views
+    };
+  } 
+  return state;
+};
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/handlers/valueSelectorHandler.ts b/sdnr/wt/odlux/apps/configurationApp/src/handlers/valueSelectorHandler.ts
new file mode 100644
index 000000000..c9e7dd2cc
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/handlers/valueSelectorHandler.ts
@@ -0,0 +1,58 @@
+import { IActionHandler } from "../../../../framework/src/flux/action";
+import { ViewSpecification } from "../models/uiModels";
+import { EnableValueSelector, SetSelectedValue, UpdateDeviceDescription, SetCollectingSelectionData, UpdatViewDescription } from "../actions/deviceActions";
+
+export interface IValueSelectorState {
+  collectingData: boolean;
+  keyProperty: string | undefined;
+  listSpecification: ViewSpecification | null;
+  listData: any[];
+  onValueSelected: (value: any) => void;
+}
+
+const nc = (val: React.SyntheticEvent) => { };
+const valueSelectorStateInit: IValueSelectorState = {
+  collectingData: false,
+  keyProperty: undefined,
+  listSpecification: null,
+  listData: [],
+  onValueSelected: nc,
+};
+
+export const valueSelectorHandler: IActionHandler<IValueSelectorState> = (state = valueSelectorStateInit, action) => {
+  if (action instanceof SetCollectingSelectionData) {
+    state = {
+      ...state,
+     collectingData: action.busy,
+    };
+  } else if (action instanceof EnableValueSelector) {
+    state = {
+      ...state,
+      collectingData: false,
+      keyProperty: action.keyProperty,
+      listSpecification: action.listSpecification,
+      onValueSelected: action.onValueSelected,
+      listData: action.listData,
+    };
+  } else if (action instanceof SetSelectedValue) {
+    state.keyProperty && state.onValueSelected(action.value[state.keyProperty]);
+    state = {
+      ...state,
+      collectingData: false,
+      keyProperty: undefined,
+      listSpecification: null,
+      onValueSelected: nc,
+      listData: [],
+    };
+  } else if (action instanceof UpdateDeviceDescription || action instanceof UpdatViewDescription) {
+    state = {
+      ...state,
+      collectingData: false,
+      keyProperty: undefined,
+      listSpecification: null,
+      onValueSelected: nc,
+      listData: [],
+    };
+  }
+  return state;
+};
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/handlers/viewDescriptionHandler.ts b/sdnr/wt/odlux/apps/configurationApp/src/handlers/viewDescriptionHandler.ts
new file mode 100644
index 000000000..48155ee1e
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/handlers/viewDescriptionHandler.ts
@@ -0,0 +1,42 @@
+import { IActionHandler } from "../../../../framework/src/flux/action";
+
+import { UpdatViewDescription } from "../actions/deviceActions";
+import { ViewSpecification } from "../models/uiModels";
+
+export interface IViewDescriptionState {
+  vPath: string | null;
+  keyProperty: string | undefined;
+  displayAsList: boolean;
+  viewSpecification: ViewSpecification;
+  viewData: any
+}
+
+const viewDescriptionStateInit: IViewDescriptionState = {
+  vPath: null,
+  keyProperty: undefined,
+  displayAsList: false,
+  viewSpecification: {
+    id: "empty",
+    canEdit: false,
+    parentView: "",
+    name: "emplty",
+    language: "en-US",
+    title: "empty",
+    elements: {}
+  },
+  viewData: null
+};
+
+export const viewDescriptionHandler: IActionHandler<IViewDescriptionState> = (state = viewDescriptionStateInit, action) => {
+  if (action instanceof UpdatViewDescription) {
+    state = {
+      ...state,
+      vPath: action.vPath,
+      keyProperty: action.key,
+      displayAsList: action.displayAsList,
+      viewSpecification: action.view,
+      viewData: action.viewData,
+    }
+  }
+  return state;
+};
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/models/coreModel.ts b/sdnr/wt/odlux/apps/configurationApp/src/models/coreModel.ts
deleted file mode 100644
index ea37a23f1..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/models/coreModel.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 interface NameValue {
-  "value-name": string;
-  value: string;
-}
-
-export interface LpResponse {
-  uuid: string;
-  "administrative-state": AdministrativeState;
-  "is-protection-lock-out": boolean;
-  "termination-state": string;
-  "local-id": NameValue[];
-  "configured-client-capacity": string;
-  "extension": NameValue[];
-  "operational-state": string;
-  "administrative-control": string;
-  "name": NameValue[];
-  "lp-direction": string;
-  "fc-blocks-signal-to-lp": string;
-  "layer-protocol-name": string;
-  "lifecycle-state": string;
-  "label": NameValue[];
-}
-
-export interface LtpResponse {
-  uuid: string;
-  "administrative-state": AdministrativeState;
-  "local-id": NameValue[];
-  extension: NameValue[];
-  "operational-state": string;
-  lp: LpResponse[];
-  "administrative-control": string;
-  name: NameValue[];
-  "ltp-in-other-view": string[];
-  "ltp-direction": string;
-  "lifecycle-state": string;
-  "client-ltp": string[];
-  "label": NameValue[];
-  "server-ltp": string[];
-}
-
-export interface CoreModelNetworkElement {
-  "administrative-state": AdministrativeState;
-  ltp: LtpResponse[];
-  "local-id": NameValue[];
-  "lifecycle-state": string;
-  uuid: string;
-  label: NameValue[];
-  extension: NameValue[];
-  "operational-state": string;
-  "administrative-control": string;
-  name: NameValue[];
-}
-
-
-export type AdministrativeState = "unlocked" | "locked";
-
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/models/networkElementConnection.ts b/sdnr/wt/odlux/apps/configurationApp/src/models/networkElementConnection.ts
new file mode 100644
index 000000000..2575500a3
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/models/networkElementConnection.ts
@@ -0,0 +1,19 @@
+export type NetworkElementConnection = {
+  id?: string;
+  nodeId: string;
+  host: string;
+  port: number;
+  username?: string;
+  password?: string;
+  isRequired?: boolean;
+  status?: "connected" | "mounted" | "unmounted" | "connecting" | "disconnected" | "idle";
+  coreModelCapability?: string;
+  deviceType?: string;
+  nodeDetails?: {
+    availableCapabilities: string[];
+    unavailableCapabilities: {
+      failureReason: string;
+      capability: string;
+    }[];
+  }
+}
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/models/uiModels.ts b/sdnr/wt/odlux/apps/configurationApp/src/models/uiModels.ts
index 69a807a3c..441d1281d 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/models/uiModels.ts
+++ b/sdnr/wt/odlux/apps/configurationApp/src/models/uiModels.ts
@@ -1,90 +1,142 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 interface AccessFlags {
-  "read": boolean,
-  "write": boolean,
-  "create": boolean
-}
-
-export interface ViewElementBase {
+export type ViewElementBase = {
   "id": string;
   "label": string;
-  "viewId": string;
-  "leafrefPath": string;
-  "accessFlags": AccessFlags;
-  "description": string;
+  "config": boolean;
+  "ifFeature"?: string;
+  "when"?: string;
+  "mandatory"?: boolean;
+  "description"?: string;
+  "isList"?: boolean;
+  "default"?: string;
+  "status"?: "current" | "deprecated" | "obsolete",
+  "reference"?: string, // https://tools.ietf.org/html/rfc7950#section-7.21.4
+}
+
+// https://tools.ietf.org/html/rfc7950#section-9.8
+export type ViewElementBinary = ViewElementBase & {
+  "uiType": "binary";
+  "length"?: number;  // number of octets
+}
+
+// https://tools.ietf.org/html/rfc7950#section-9.7.4
+export type ViewElementBits = ViewElementBase & {
+  "uiType": "bits";
+  "flags": {
+    [name: string]: number | undefined;    // 0 - 4294967295
+  }
 }
 
-export interface ViewElementString extends ViewElementBase {
+// https://tools.ietf.org/html/rfc7950#section-9
+export type ViewElementString = ViewElementBase & {
   "uiType": "string";
+  "pattern"?: string[];
+  "length"?: string;
+  "invertMatch"?: true;
 }
 
-export interface ViewElementNumber extends ViewElementBase {
+// https://tools.ietf.org/html/rfc7950#section-9.3
+export type ViewElementNumber = ViewElementBase & {
   "uiType": "number";
   "min"?: number;
   "max"?: number;
-  "unit"?: string;
+  "units"?: string;
   "format"?: string;
+  "fDigits"?: number;
 }
 
-export interface ViewElementBoolean extends ViewElementBase {
+// https://tools.ietf.org/html/rfc7950#section-9.5
+export type ViewElementBoolean = ViewElementBase & {
   "uiType": "boolean";
   "trueValue"?: string;
   "falseValue"?: string;
 }
 
-export interface ViewElementObject extends ViewElementBase {
-  "uiType": "object";
-  "viewId": string;
-}
-
-export interface ViewElementSelection extends ViewElementBase {
+// https://tools.ietf.org/html/rfc7950#section-9.6.4
+export type ViewElementSelection = ViewElementBase & {
   "uiType": "selection";
   "multiSelect"?: boolean
   "options": {
-    "key": string,
-    "value": string,
-    "description": string
-  }[],
+    "key": string;
+    "value": string;
+    "description"?: string,
+    "status"?: "current" | "deprecated" | "obsolete",
+    "reference"?: string,
+  }[];
 }
 
-export interface ViewElementList extends ViewElementBase {
-  "uiType": "list",
-  "listType": "object" | "string" | "number",
-  "viewId": string,
+// is a list if isList is true ;-)
+export type ViewElementObject = ViewElementBase & {
+  "uiType": "object";
+  "isList"?: false;
+  "viewId": string;
+}
+
+// Hint: read only lists do not need a key
+export type ViewElementList = (ViewElementBase & {
+  "uiType": "object";
+  "isList": true;
+  "viewId": string;
+  "key"?: string;
+});
+
+export type ViewElementReference = ViewElementBase & {
+  "uiType": "reference";
+  "referencePath": string;
+  "ref": (currentPath: string) => ViewElement | null;
 }
 
 export type ViewElement =
+  | ViewElementBits
+  | ViewElementBinary
   | ViewElementString
   | ViewElementNumber
   | ViewElementBoolean
   | ViewElementObject
+  | ViewElementList
   | ViewElementSelection
-  | ViewElementList;
+  | ViewElementReference;
+
+export const isViewElementString = (viewElement: ViewElement): viewElement is ViewElementString => {
+  return viewElement && viewElement.uiType === "string";
+}
 
-export interface ViewSpecification {
+export const isViewElementNumber = (viewElement: ViewElement): viewElement is ViewElementNumber => {
+  return viewElement && viewElement.uiType === "number" ;
+}
+
+export const isViewElementBoolean = (viewElement: ViewElement): viewElement is ViewElementBoolean => {
+  return viewElement && viewElement.uiType === "boolean";
+}
+
+export const isViewElementObject = (viewElement: ViewElement): viewElement is ViewElementObject => {
+  return viewElement && viewElement.uiType === "object" && viewElement.isList === false;
+}
+
+export const isViewElementList = (viewElement: ViewElement): viewElement is ViewElementList => {
+  return viewElement && viewElement.uiType === "object" && viewElement.isList === true;
+}
+
+export const isViewElementObjectOrList = (viewElement: ViewElement): viewElement is ViewElementObject | ViewElementList => {
+  return viewElement && viewElement.uiType === "object";
+}
+
+export const isViewElementSelection = (viewElement: ViewElement): viewElement is ViewElementSelection => {
+  return viewElement && viewElement.uiType === "selection";
+}
+
+export const isViewElementReference = (viewElement: ViewElement): viewElement is ViewElementReference => {
+  return viewElement && viewElement.uiType === "reference";
+}
+
+export type ViewSpecification = {
   "id": string;
-  "parentView": string;
   "name": string;
-  "language": string;
   "title"?: string;
-  "url": string;
-  "dataPath": string;
-  "elements": ViewElement[];
+  "parentView"?: string;
+  "language": string;
+  "ifFeature"?: string;
+  "when"?: string;
+  "uses"?: string[];
+  "elements": { [name: string]: ViewElement };
+  readonly "canEdit": boolean;
 }
-
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/models/yang.ts b/sdnr/wt/odlux/apps/configurationApp/src/models/yang.ts
new file mode 100644
index 000000000..57edf803f
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/models/yang.ts
@@ -0,0 +1,44 @@
+import { ViewElement, ViewSpecification } from "./uiModels";
+
+export type Token = {
+  name: string;
+  value: string;
+  start: number;
+  end: number;
+}
+
+export type Statement = {
+  key: string;
+  arg?: string;
+  sub?: Statement[];
+}
+
+export type Identity = {
+  id: string,
+  label: string,
+  base?: string,
+  description?: string,
+  reference?: string,
+  children?: Identity[],
+  values?: Identity[],
+}
+
+export type Revision = {
+  description?: string,
+  reference?: string
+};
+
+export type Module = {
+  name: string;
+  namespace?: string;
+  prefix?: string;
+  identities: { [name: string]: Identity };
+  revisions: { [version: string]: Revision } ;
+  imports: { [prefix: string]: string };
+  features: { [feature: string]: { description?: string } };
+  typedefs: { [type: string]: ViewElement };
+  augments: { [path: string]: ViewSpecification[] };
+  groupings: { [group: string]: ViewSpecification };
+  views: { [view: string]: ViewSpecification };
+  elements: { [view: string]: ViewElement };
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/plugin.tsx b/sdnr/wt/odlux/apps/configurationApp/src/plugin.tsx
deleted file mode 100644
index 4d5faf559..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/plugin.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
-// app configuration and main entry point for the app
-
-import * as React from "react";
-import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom';
-
-import { faAdjust } from '@fortawesome/free-solid-svg-icons';  // select app icon
-
-import connect, { Connect, IDispatcher } from '../../../framework/src/flux/connect';
-import applicationManager from '../../../framework/src/services/applicationManager';
-import { IApplicationStoreState } from "../../../framework/src/store/applicationStore";
-
-import { configurationAppRootHandler } from './handlers/configurationAppRootHandler';
-import configurationService from "./services/configurationService";
-
-import ConfigurationApplication from "./views/configurationApplication";
-import { updateMountIdAsyncActionCreator, updateLpIdAsyncActionCreator, updateViewDataAsyncActionCreator } from "./actions/configurationActions";
-
-let currentMountId: string | null | undefined = undefined;
-let currentLpId: string | null |undefined = undefined;
-let currentViewId: string | null | undefined = undefined;
-let currentIndex: string | null | undefined = undefined;
-let lastUrl: string | undefined = undefined;
-
-const mapProps = (state: IApplicationStoreState) => ({
-  // currentProblemsProperties: createCurrentProblemsProperties(state),
-});
-
-const mapDisp = (dispatcher: IDispatcher) => ({
-  updateMountId: (mountId: string | undefined) => dispatcher.dispatch(updateMountIdAsyncActionCreator(mountId)),
-  updateLpId: (lpId: string | undefined) => dispatcher.dispatch(updateLpIdAsyncActionCreator(lpId)),
-  updateViewData: (viewPath: string, indexValues: string[]) => dispatcher.dispatch(updateViewDataAsyncActionCreator(viewPath, indexValues)),
-});
-
-const ConfigurationApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ mountId?: string, lpId?: string, viewId?: string, "0"?: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
-  if (props.location.pathname !== lastUrl) {
-    // ensure the asynchronus update will only be called once per path
-    lastUrl = props.location.pathname;
-    window.setTimeout(async () => {
-
-      // check if the mountId has changed
-      if (currentMountId !== props.match.params.mountId) {
-        currentMountId = props.match.params.mountId || undefined;
-        currentLpId = null;
-        currentViewId = null;
-        currentIndex = null;
-        await props.updateMountId(currentMountId);
-      }
-
-      // check if the lpId has changed
-      if (currentLpId !== props.match.params.lpId) {
-        currentLpId = props.match.params.lpId || undefined;
-        currentViewId = null;
-        currentIndex = null;
-        currentMountId && await props.updateLpId(currentLpId);
-      }
-
-      // check if the viewId or the indices has changed
-      if (currentViewId !== props.match.params.viewId || currentIndex !== props.match.params[0]) {
-        currentViewId = props.match.params.viewId || undefined;
-        currentIndex = props.match.params[0] || undefined;
-        currentLpId && await props.updateViewData(currentViewId || '', currentIndex && currentIndex.split("/") || [] );
-      }
-
-    });
-  }
-  return (
-    <ConfigurationApplication />
-  );
-});
-
-const App = withRouter((props: RouteComponentProps) => (
-  <Switch>
-    <Route path={`${props.match.path}/:mountId/:lpId/:viewId/*`} component={ConfigurationApplicationRouteAdapter} />
-    <Route path={`${props.match.path}/:mountId/:lpId/:viewId`} component={ConfigurationApplicationRouteAdapter} />
-    <Route path={`${props.match.path}/:mountId/:lpId`} component={ConfigurationApplicationRouteAdapter} />
-    <Route path={`${props.match.path}/:mountId`} component={ConfigurationApplicationRouteAdapter} />
-    <Route path={`${props.match.path}`} component={ConfigurationApplicationRouteAdapter} />
-    <Redirect to={`${props.match.path}`} />
-  </Switch>
-));
-
-export function register() {
-  applicationManager.registerApplication({
-    name: "configuration",
-    icon: faAdjust,
-    rootComponent: App,
-    rootActionHandler: configurationAppRootHandler,
-    menuEntry: "Configuration"
-  });
-}
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/pluginConfiguration.tsx b/sdnr/wt/odlux/apps/configurationApp/src/pluginConfiguration.tsx
new file mode 100644
index 000000000..7fd3a97f9
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/pluginConfiguration.tsx
@@ -0,0 +1,77 @@
+import * as React from "react";
+import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom';
+
+import { faAdjust } from '@fortawesome/free-solid-svg-icons';  // select app icon
+
+import connect, { Connect, IDispatcher } from '../../../framework/src/flux/connect';
+import applicationManager from '../../../framework/src/services/applicationManager';
+import { IApplicationStoreState } from "../../../framework/src/store/applicationStore";
+import { configurationAppRootHandler } from "./handlers/configurationAppRootHandler";
+import { NetworkElementSelector } from "./views/networkElementSelector";
+
+import ConfigurationApplication from "./views/configurationApplication";
+import { updateNodeIdAsyncActionCreator, updateViewActionAsyncCreator } from "./actions/deviceActions";
+
+let currentNodeId: string | null | undefined = undefined;
+let currentVirtualPath: string | null | undefined = undefined;
+let lastUrl: string | undefined = undefined;
+
+const mapProps = (state: IApplicationStoreState) => ({
+  // currentProblemsProperties: createCurrentProblemsProperties(state),
+});
+
+const mapDisp = (dispatcher: IDispatcher) => ({
+  updateNodeId: (nodeId: string) => dispatcher.dispatch(updateNodeIdAsyncActionCreator(nodeId)),
+  updateView: (vPath: string) => dispatcher.dispatch(updateViewActionAsyncCreator(vPath)),
+});
+
+const ConfigurationApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ nodeId?: string, 0: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
+  React.useEffect(() => {
+    return () => {
+      lastUrl = undefined;
+      currentNodeId = undefined;
+      currentVirtualPath = undefined;
+    }
+  },[]);
+  if (props.location.pathname !== lastUrl) {
+    // ensure the asynchronus update will only be called once per path
+    lastUrl = props.location.pathname;
+    window.setTimeout(async () => {
+
+      // check if the nodeId has changed
+      if (currentNodeId !== props.match.params.nodeId) {
+        currentNodeId = props.match.params.nodeId || undefined;
+        currentVirtualPath = null;
+        currentNodeId && await props.updateNodeId(currentNodeId);
+      }
+
+      if (currentVirtualPath !== props.match.params[0]) {
+        currentVirtualPath = props.match.params[0];
+        await props.updateView(currentVirtualPath);
+      }
+
+    });
+  }
+  return (
+    <ConfigurationApplication />
+  );
+});
+
+const App = withRouter((props: RouteComponentProps) => (
+  <Switch>
+    <Route path={`${props.match.url}/:nodeId/*`} component={ ConfigurationApplicationRouteAdapter } />
+    <Route path={`${props.match.url}/:nodeId`} component={ ConfigurationApplicationRouteAdapter } />
+    <Route path={`${props.match.url}`} component={ NetworkElementSelector } />
+    <Redirect to={`${props.match.url}`} />
+  </Switch>
+));
+
+export function register() {
+  applicationManager.registerApplication({
+    name: "configuration",
+    icon: faAdjust,
+    rootComponent: App,
+    rootActionHandler: configurationAppRootHandler,
+    menuEntry: "Configuration"
+  });
+}
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/services/configurationService.ts b/sdnr/wt/odlux/apps/configurationApp/src/services/configurationService.ts
deleted file mode 100644
index f78730480..000000000
--- a/sdnr/wt/odlux/apps/configurationApp/src/services/configurationService.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { requestRest } from '../../../../framework/src/services/restService';
-
-import { CoreModelNetworkElement, NameValue } from '../models/coreModel';
-import { ViewSpecification } from '../models/uiModels';
-
-export const getValueByName = (name: string, nameValuePairs: NameValue[], defaultValue: string | null = null): string | null => {
-  const entry = nameValuePairs.find(p => p["value-name"] === name);
-  return entry && entry.value || defaultValue;
-};
-
-class ConfigurationService {
-
-  /** Gets the core model for a network element by its mountId. */
-  public async getCoreModelByNodeId(nodeId: string): Promise<CoreModelNetworkElement | null> {
-    const path = `restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount/core-model:network-element`;
-    const ne = await requestRest<{ "network-element": CoreModelNetworkElement }>(path, { method: "GET" });
-    return ne && ne["network-element"] || null;
-  }
-
-  public async getViewData(path: string): Promise<{} | null> {
-    const viewData = await requestRest<{}>(path, { method: "GET" });
-    return viewData || null;
-  }
-
-  /** Gets the UI description object for a capability of a network element. */
-  public async getUIDescriptionByCapability(capability: string, revision: string | null): Promise<ViewSpecification[] | null> {
-    const capFile = capability && revision && `${capability}@${revision}.json`;
-    const coreModelResponse = capFile && await requestRest<{ views: ViewSpecification[] }>(`assets/${capFile}`, { method: "GET" }, false, true);
-    return coreModelResponse && coreModelResponse.views || null;
-  }
-
-}
-
-export const configurationService = new ConfigurationService();
-export default configurationService;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/services/restServices.ts b/sdnr/wt/odlux/apps/configurationApp/src/services/restServices.ts
new file mode 100644
index 000000000..061be05ec
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/services/restServices.ts
@@ -0,0 +1,38 @@
+import { requestRest, requestRestExt } from "../../../../framework/src/services/restService";
+import { convertPropertyNames, replaceHyphen } from "../../../../framework/src/utilities/yangHelper";
+
+import { NetworkElementConnection } from "../models/networkElementConnection";
+
+class RestService {
+  public async getMountedNetworkElementByMountId(nodeId: string): Promise<NetworkElementConnection | null> {
+    // const path = 'restconf/operational/network-topology:network-topology/topology/topology-netconf/node/' + nodeId;
+    // const connectedNetworkElement = await requestRest<NetworkElementConnection>(path, { method: "GET" });
+    // return connectedNetworkElement || null;
+
+    const path = "/restconf/operations/data-provider:read-network-element-connection-list";
+    const body = { "input": { "filter": [{ "property": "node-id", "filtervalue": nodeId }], "sortorder": [], "pagination": { "size": 1, "page": 1 } } };
+    const networkElementResult = await requestRest<{ output: { data: NetworkElementConnection[] } }>(path, { method: "POST", body: JSON.stringify(body) });
+    return networkElementResult && networkElementResult.output && networkElementResult.output.data &&
+      networkElementResult.output.data.map(obj => convertPropertyNames(obj, replaceHyphen))[0] || null;
+  }
+
+  /** Reads the config data by restconf path.
+  * @param path The restconf path to be used for read.
+  * @returns The data.
+  */
+  public getConfigData(path: string) {
+    return requestRestExt<{ [key: string]: any }>(path, { method: "GET" });
+  }
+
+  /** Updates or creates the config data by restconf path using data.
+   * @param path The restconf path to identify the note to update.
+   * @param data The data to be updated.
+   * @returns The written data.
+   */
+  public setConfigData(path: string, data: any) {
+    return requestRestExt<{ [key: string]: any }>(path, { method: "PUT", body: JSON.stringify(data) });
+  }
+ }
+
+export const restService = new RestService();
+export default restService;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/services/yangService.ts b/sdnr/wt/odlux/apps/configurationApp/src/services/yangService.ts
new file mode 100644
index 000000000..17a4e43a7
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/services/yangService.ts
@@ -0,0 +1,25 @@
+type YangInfo = [string, (string | null | undefined)];
+
+const cache: { [path: string]: string } = {
+
+};
+
+class YangService {
+
+  public async getCapability(capability: string, version?: string) {
+    const url = `/yang-schema/${capability}${version ? `/${version}` : ""}`;
+
+    const cacheHit = cache[url];
+    if (cacheHit) return cacheHit;
+
+    const res = await fetch(url);
+    const yangFile = res.ok && await res.text();
+    if (yangFile !== false && yangFile !== null) {
+      cache[url] = yangFile;
+    }
+    return yangFile;
+  }
+}
+
+export const yangService = new YangService();
+export default yangService;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
index d5189fcd0..24a4af8b2 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
+++ b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
@@ -15,306 +15,450 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
+
 import * as React from 'react';
+import { RouteComponentProps, withRouter } from 'react-router-dom';
+
+import { WithStyles, withStyles, createStyles, Theme } from '@material-ui/core/styles';
 
-import { MaterialTable, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
-import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
-import { IConnectAppStoreState } from '../../../connectApp/src/handlers/connectAppRootHandler';
-import { MountedNetworkElementType } from '../../../connectApp/src/models/mountedNetworkElements';
-import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
-import { Dispatch } from '../../../../framework/src/flux/store';
+import connect, { IDispatcher, Connect } from "../../../../framework/src/flux/connect";
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import MaterialTable, { ColumnModel, ColumnType, MaterialTableCtorType } from "../../../../framework/src/components/material-table";
+import { Loader } from "../../../../framework/src/components/material-ui/loader";
 
-import TextField from '@material-ui/core/TextField';
-import { Tooltip, Button, FormControl, InputLabel, Select, MenuItem, InputAdornment } from '@material-ui/core';
-import Link from '@material-ui/core/Link';
+import { SetSelectedValue, splitVPath, updateDataActionAsyncCreator } from "../actions/deviceActions";
+import { ViewSpecification, isViewElementString, isViewElementNumber, isViewElementBoolean, isViewElementObjectOrList, isViewElementSelection } from "../models/uiModels";
 
-import Table from '@material-ui/core/Table';
-import TableBody from '@material-ui/core/TableBody';
-import TableCell from '@material-ui/core/TableCell';
-import TableHead from '@material-ui/core/TableHead';
-import TableRow from '@material-ui/core/TableRow';
+import Fab from '@material-ui/core/Fab';
+import AddIcon from '@material-ui/icons/Add';
+import RemoveIcon from '@material-ui/icons/RemoveCircleOutline';
+import SaveIcon from '@material-ui/icons/Save';
+import EditIcon from '@material-ui/icons/Edit';
+import Tooltip from "@material-ui/core/Tooltip";
+import TextField from "@material-ui/core/TextField";
+import FormControl from "@material-ui/core/FormControl";
+import IconButton from "@material-ui/core/IconButton";
+import Button from "@material-ui/core/Button";
+import InputAdornment from "@material-ui/core/InputAdornment";
+import InputLabel from "@material-ui/core/InputLabel";
+import Select from "@material-ui/core/Select";
+import MenuItem from "@material-ui/core/MenuItem";
+import Breadcrumbs from "@material-ui/core/Breadcrumbs";
+import Link from "@material-ui/core/Link";
+import FormHelperText from '@material-ui/core/FormHelperText';
 
-import { ViewSpecification } from '../models/uiModels';
+const styles = (theme: Theme) => createStyles({
+  header: {
+    "display": "flex",
+    "justifyContent": "space-between",
+  },
+  leftButton: {
+    "justifyContent": "left"
+  },
+  outer: {
+    "flex": "1",
+    "heigh": "100%",
+    "display": "flex",
+    "alignItems": "center",
+    "justifyContent": "center",
+  },
+  inner: {
 
-const NetworkElementTable = MaterialTable as MaterialTableCtorType<MountedNetworkElementType>;
+  },
+  "icon": {
+    "marginRight": theme.spacing(0.5),
+    "width": 20,
+    "height": 20,
+  },
+  "fab": {
+    "margin": theme.spacing(1),
+  },
+  button: {
+    margin: 0,
+    padding: "6px 6px",
+    minWidth: 'unset'
+  },
+  readOnly: {
+    '& label.Mui-focused': {
+      color: 'green',
+    },
+    '& .MuiInput-underline:after': {
+      borderBottomColor: 'green',
+    },
+    '& .MuiOutlinedInput-root': {
+      '& fieldset': {
+        borderColor: 'red',
+      },
+      '&:hover fieldset': {
+        borderColor: 'yellow',
+      },
+      '&.Mui-focused fieldset': {
+        borderColor: 'green',
+      },
+    },
+  },
+});
 
 const mapProps = (state: IApplicationStoreState) => ({
-  ...state.configuration,
-  avaliableDevices: state.connect.mountedNetworkElements.elements.filter(el => el.connectionStatus === "connected")
+  collectingData: state.configuration.valueSelector.collectingData,
+  listKeyProperty: state.configuration.valueSelector.keyProperty,
+  listSpecification: state.configuration.valueSelector.listSpecification,
+  listData: state.configuration.valueSelector.listData,
+  vPath: state.configuration.viewDescription.vPath,
+  nodeId: state.configuration.deviceDescription.nodeId,
+  viewData: state.configuration.viewDescription.viewData,
+  viewSpecification: state.configuration.viewDescription.viewSpecification,
+  displayAsList: state.configuration.viewDescription.displayAsList,
+  keyProperty: state.configuration.viewDescription.keyProperty,
 });
-const mapDisp = (dispatcher: IDispatcher) => ({
-  navigateTo: (viewId: string, index?: string | number) => dispatcher.dispatch((dispatch: Dispatch, getState: () => IApplicationStoreState) => {
-    const { configuration: { nodeId, lpId, indexValues } } = getState();
-    const newIndexValues = typeof index === 'number' && indexValues
-      ? indexValues.split('/').slice(0, index).join("/")
-      : indexValues
-        ? `${indexValues}${index ? `/${index}` : ''}`
-        : index;
-    dispatch(new NavigateToApplication("configuration", `${nodeId}/${lpId}/${viewId}${newIndexValues ? `/${newIndexValues}` : ''}`));
-
-  }),
-  changeNode: (ndoeId: string) => dispatcher.dispatch((dispatch: Dispatch) => {
-    dispatch(new NavigateToApplication("configuration", ndoeId));
-  }),
-  changeLp: (lpId: string) => dispatcher.dispatch((dispatch: Dispatch, getState: () => IApplicationStoreState) => {
-    const { configuration: { nodeId } } = getState();
-    dispatch(new NavigateToApplication("configuration", `${nodeId}/${lpId}`));
-  })
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+  onValueSelected: (value: any) => dispatcher.dispatch(new SetSelectedValue(value)),
+  onUpdateData: (vPath: string, data: any) => dispatcher.dispatch(updateDataActionAsyncCreator(vPath, data)),
 });
 
-type ConfigurationApplicationProps = Connect<typeof mapProps, typeof mapDisp>;
+const SelectElementTable = MaterialTable as MaterialTableCtorType<{ [key: string]: any }>;
 
-type ConfigurationApplicationState = {
+type ConfigurationApplicationComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDispatch> & WithStyles<typeof styles>;
 
+type ConfigurationApplicationComponentState = {
+  isNew: boolean;
+  editMode: boolean;
+  canEdit: boolean;
+  viewData: { [key: string]: any } | null;
 }
 
-class ConfigurationApplicationComponent extends React.Component<ConfigurationApplicationProps, ConfigurationApplicationState> {
-
- render() {
-    if (this.props.loading) {
-      return (
-        <h2>Collecting data from network element. Please wait ...</h2>
-      );
-    } else if (!this.props.nodeId) {
-      return (
-        <>
-          <h2>Please select an network element to configure !</h2>
-          <NetworkElementTable idProperty={"mountId"} rows={this.props.avaliableDevices} asynchronus
-            onHandleClick={(evetm, rowData) => { this.props.changeNode(rowData.mountId) }} columns={
-            [{ property:"mountId" }]
-          } />
-        </>
-      );
-    } else if (!this.props.lpId) {
-      return this.props.coreModel && this.props.coreModel.ltp && this.props.coreModel.ltp.length
-       ? (
-        <>
-          <h2>Please select an existing LP first !</h2>
-          <ul>
-            { this.props.coreModel.ltp.map(ltp => {
-              return <li key={ltp.uuid}>
-                <Link component="a" variant="body2" color="secondary" onClick={() => {
-                  this.props.changeLp(ltp.lp[0].uuid);
-                }}>{ltp.lp[0].label[0].value}</Link>
-              </li>
-            }) || null}
-          </ul>
-        </>
-      ) 
-      : (
-        <>
-         <h2>No LTP / LP found !</h2>
-        </>
-      );
-    } else if (!this.props.capability && !this.props.viewId) {
-      return (
-        <h2>Please select a capability or viewId first !</h2>
-      );
+const OldProps = Symbol("OldProps");
+class ConfigurationApplicationComponent extends React.Component<ConfigurationApplicationComponentProps, ConfigurationApplicationComponentState> {
+
+  /**
+   *
+   */
+  constructor (props: ConfigurationApplicationComponentProps) {
+    super(props);
+
+    this.state = {
+      isNew: false,
+      canEdit: false,
+      editMode: false,
+      viewData: null
     }
-    const viewData = this.props.viewData;
-    const viewSpecification = this.props.viewId
-      ? this.props.viewSpecifications.find(d => d.id === this.props.viewId)
-      : this.props.viewSpecifications.find(d => d.name === this.props.conditionalPackage);
-
-    return viewSpecification
-      ? (
-        <>
-          <hgroup style={{ marginBottom: 15 }}>
-            <h2>{`${this.props.nodeId} - ${this.props.lpId}`}</h2>
-            {this.createBreadCrump(viewSpecification.id, this.props.viewSpecifications)}
-          </hgroup>
-          <div style={{ display: "flex", flexWrap: "wrap", overflow: "auto" }}>
-            {
+  }
 
-            (this.props.viewData && this.props.viewData instanceof Array)
-              ? this.renderUIList(viewSpecification, viewData as { [key: string]: string | number }[])
-              : this.renderUIElement(viewSpecification, viewData as { [key: string]: string | number })
-          }
-            {/* { <pre>{JSON.stringify(this.props.viewData, null, 2)} </pre> } */}
+  static getDerivedStateFromProps(nextProps: ConfigurationApplicationComponentProps, prevState: ConfigurationApplicationComponentState & { [OldProps]: ConfigurationApplicationComponentProps  }) {
 
-        </div>
-        </>
-      )
-      : <h2>View [{this.props.viewId || this.props.conditionalPackage}] Not Found ! {this.props.viewSpecifications.length} </h2>;
+    if (!prevState || !prevState[OldProps] || (prevState[OldProps].viewData !== nextProps.viewData)) {
+      const isNew: boolean = nextProps.vPath?.endsWith("[]") || false;
+      const state = {
+        ...prevState,
+        isNew: isNew,
+        editMode: isNew,
+        viewData: nextProps.viewData || null,
+        [OldProps]: nextProps,
+      }
+      return state;
+    }
+    return null;
   }
 
-  private static keyPropertyParser = /\$\$INDEX:(\d+):?([a-z\-]+)?\$\$$/;
-  private renderUIList = (viewSpecification: ViewSpecification, viewData: { [key: string]: string | number }[]) => {
-    const keyMatch = ConfigurationApplicationComponent.keyPropertyParser.exec(viewSpecification.dataPath);
-    const keyProperty = keyMatch && keyMatch[2];
-    return (
-      <Table>
-        <TableHead>
-          <TableRow>
-            {viewSpecification.elements.map(uiElement => {
-              switch (uiElement.uiType) {
-                case "number":
-                return (
-                  <TableCell key={uiElement.id} align={"right"} >{uiElement.label}</TableCell>
-                );
-                case "selection":
-                case "object":
-                case "list":
-                case "string":
-                case "boolean":
-                  return (
-                    <TableCell key={uiElement.id} align={"left"} >{uiElement.label}</TableCell>
-                  );
-                default:
-                  if (process.env.NODE_ENV !== "production") {
-                    console.error(`Unknown column type - ${(uiElement as any).uiType} in ${(uiElement as any).id}.`)
-                  }
-                  return null;
-              }
-            })
-            }
-            <TableCell align={"right"} >Actions</TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {viewData.map((row, ind) => (
-            <TableRow key={keyProperty && row[keyProperty] || ind}>
-              {viewSpecification.elements.map(uiElement => {
-                switch (uiElement.uiType) {
-                  case "string":
-                  case "number":
-                    return (
-                      <TableCell key={uiElement.id} component="td" scope="row" align={uiElement.uiType === "number" ? "right" : "left"}>{row[uiElement.id] == null ? "---" : row[uiElement.id] } </TableCell>
-                    );
-                  case "boolean":
-                    return (
-                      <TableCell key={uiElement.id} component="td" scope="row" align={"left"} >{row[uiElement.id] == null ? "---" : row[uiElement.id] ? uiElement.trueValue || 'True' : uiElement.falseValue || 'False'} </TableCell>
-                    );
-                  case "list":
-                  case "object":
-                    return (
-                      <TableCell key={uiElement.id} component="td" scope="row" align={"left"} >
-                        <Tooltip title={uiElement.description || ''}>
-                          <Link component="a" variant="body2" color="secondary" onClick={() => {
-                            this.props.navigateTo(uiElement.viewId, String(ind));
-                          }}>{uiElement.label}</Link>
-                        </Tooltip></TableCell>
-                    );
-                  case "selection":
-                    const option = row[uiElement.id] ? uiElement.options.find(opt => opt.key === row[uiElement.id]) : null;
-                    return (
-                      <TableCell key={uiElement.id} component="td" scope="row" align={"left"} >{option ? option.value : row[uiElement.id] == null ? "---" : row[uiElement.id]  } </TableCell>
-                    );
-                  default:
-                    if (process.env.NODE_ENV !== "production") {
-                      console.error(`Unknown column type - ${(uiElement as any).uiType} in ${(uiElement as any).id}.`)
-                    }
-                    return null;
-                }
-              })}
-              <TableCell align={"right"} ><Button onClick={() => {
-                this.props.navigateTo(this.props.viewId || '', String(/*keyProperty && row[keyProperty] || */ ind));
-              }} >Details</Button>
-              </TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-      </Table>
-    );
+  private navigate = (path: string) => {
+    this.props.history.push(`${this.props.match.url}${path}`);
   }
 
-  private renderUIElement = (viewSpecification: ViewSpecification, viewData: { [key: string]: string | number }) => (
-    viewSpecification.elements.map(uiElement => {
-      if (uiElement.leafrefPath) {
-        return null;
+  private changeValueFor = (property: string, value: any) => {
+    this.setState({
+      viewData: {
+        ...this.state.viewData,
+        [property]: value
       }
-      switch (uiElement.uiType) {
-        case "selection":
-          return (viewData[uiElement.id] != null
+    });
+  }
+
+  private renderUIElement = (viewSpecification: ViewSpecification, viewData: { [key: string]: any }, keyProperty: string | undefined, editMode: boolean, isNew: boolean) => {
+    const elements = viewSpecification.elements;
+    return (
+      Object.keys(elements).sort((a, b) => {
+        const vsA = elements[a];
+        const vsB = elements[b];
+        if (keyProperty) {
+          // if (vsA.label === vsB.label) return 0;
+          if (vsA.label === keyProperty) return -1;
+          if (vsB.label === keyProperty) return +1;
+        }
+
+        if (vsA.uiType === vsB.uiType) return 0;
+        if (vsA.uiType !== "object" && vsB.uiType !== "object") return 0;
+        if (vsA.uiType === "object") return +1;
+        return -1;
+      }).map(key => {
+        const uiElement = elements[key];
+        const isKey = (uiElement.label === keyProperty);
+        const canEdit = editMode && (isNew || (uiElement.config && !isKey));
+        if (isViewElementSelection(uiElement)) {
+          let error = ""
+          const value = String(viewData[uiElement.id]).toLowerCase();
+          if (uiElement.mandatory && !!value) {
+            error = "Error";
+          }
+          return (canEdit || viewData[uiElement.id] != null
             ? (<FormControl key={uiElement.id} style={{ width: 485, marginLeft: 20, marginRight: 20 }}>
               <InputLabel htmlFor={`select-${uiElement.id}`} >{uiElement.label}</InputLabel>
               <Select
-                readOnly={ true }
+                required={!!uiElement.mandatory}
+                error={!!error}
+                onChange={(e) => { this.changeValueFor(uiElement.id, e.target.value) }}
+                readOnly={!canEdit}
+                disabled={editMode && !canEdit}
                 value={(viewData[uiElement.id] || '').toString().toLowerCase()}
                 inputProps={{
                   name: uiElement.id,
                   id: `select-${uiElement.id}`,
                 }}
               >
-                {uiElement.options.map(option => (<MenuItem title={option.description} value={option.value}>{option.key}</MenuItem>))}
+                {uiElement.options.map(option => (<MenuItem key={option.key} title={option.description} value={option.value}>{option.key}</MenuItem>))}
               </Select>
+              <FormHelperText>{error}</FormHelperText>
             </FormControl>)
             : null
           );
-        case "boolean":
-          return (viewData[uiElement.id] != null
+        } else if (isViewElementBoolean(uiElement)) {
+          let error = ""
+          const value = String(viewData[uiElement.id]).toLowerCase();
+          if (uiElement.mandatory && value !== "true" && value !== "false") {
+            error = "Error";
+          }
+          return (canEdit || viewData[uiElement.id] != null
             ? (<FormControl key={uiElement.id} style={{ width: 485, marginLeft: 20, marginRight: 20 }}>
               <InputLabel htmlFor={`select-${uiElement.id}`} >{uiElement.label}</InputLabel>
               <Select
-                readOnly={ true }
-
-                  value={String(viewData[uiElement.id]).toLowerCase()}
-                  inputProps={{
-                    name: uiElement.id,
-                    id: `select-${uiElement.id}`,
-                  }}
-                >
-                  <MenuItem value={'true'}>{uiElement.trueValue || 'True'}</MenuItem>
-                  <MenuItem value={'false'}>{uiElement.falseValue || 'False'}</MenuItem>
-
-                </Select>
+                required={!!uiElement.mandatory}
+                error={!!error}
+                onChange={(e) => { this.changeValueFor(uiElement.id, e.target.value) }}
+                readOnly={!canEdit}
+                disabled={editMode && !canEdit}
+                value={value}
+                inputProps={{
+                  name: uiElement.id,
+                  id: `select-${uiElement.id}`,
+                }}
+              >
+                <MenuItem value={'true'}>{uiElement.trueValue || 'True'}</MenuItem>
+                <MenuItem value={'false'}>{uiElement.falseValue || 'False'}</MenuItem>
+
+              </Select>
+              <FormHelperText>{error}</FormHelperText>
             </FormControl>)
             : null
           );
-        case "string":
+        } else if (isViewElementString(uiElement)) {
           return (
             <Tooltip key={uiElement.id} title={uiElement.description || ''}>
-              <TextField InputProps={{ readOnly: true }} spellCheck={false} autoFocus margin="dense"
-                id={uiElement.id} label={uiElement.label} type="text" value={viewData[uiElement.id] || ''} style={{ width: 485, marginLeft: 20, marginRight: 20 }} />
+              <TextField InputProps={{ readOnly: !canEdit, disabled: editMode && !canEdit }} spellCheck={false} autoFocus margin="dense"
+                id={uiElement.id} label={isKey ? "🔑 " + uiElement.label : uiElement.label} type="text" value={viewData[uiElement.id] || ''}
+                style={{ width: 485, marginLeft: 20, marginRight: 20 }}
+                onChange={(e) => { this.changeValueFor(uiElement.id, e.target.value) }}
+              />
             </Tooltip>
           );
-        case "number":
+        } else if (isViewElementNumber(uiElement)) {
           return (
             <Tooltip key={uiElement.id} title={uiElement.description || ''}>
-              <TextField InputProps={{ readOnly: true, startAdornment: uiElement.unit != null ? <InputAdornment position="start">{uiElement.unit}</InputAdornment> : undefined }} spellCheck={false} autoFocus margin="dense"
-                id={uiElement.id} label={uiElement.label} type="text" value={viewData[uiElement.id] || ''} style={{ width: 485, marginLeft: 20, marginRight: 20 }} />
+              <TextField InputProps={{ readOnly: !canEdit, disabled: editMode && !canEdit, startAdornment: uiElement.units != null ? <InputAdornment position="start">{uiElement.units}</InputAdornment> : undefined }} spellCheck={false} autoFocus margin="dense"
+                id={uiElement.id} label={uiElement.label} type="text" value={viewData[uiElement.id] == null ? '' : viewData[uiElement.id]}
+                style={{ width: 485, marginLeft: 20, marginRight: 20 }}
+                onChange={(e) => { this.changeValueFor(uiElement.id, e.target.value) }}
+              />
             </Tooltip>
           );
-        case "list":
-        case "object":
+        } else if (isViewElementObjectOrList(uiElement)) {
           return (
-            <Tooltip key={uiElement.id} title={uiElement.description || ''}>
-              <Link component="a" variant="body2" color="secondary" style={{ width: 485, marginLeft: 20, marginRight: 20 }}  onClick={() => {
-                this.props.navigateTo(uiElement.viewId);
-              }}>{uiElement.label}</Link>
-            </Tooltip>
+            <FormControl key={uiElement.id} style={{ width: 485, marginLeft: 20, marginRight: 20 }}>
+              <Tooltip title={uiElement.description || ''}>
+                <Button className={this.props.classes.leftButton} color="secondary" disabled={this.state.editMode} onClick={() => {
+                  this.navigate(`/${uiElement.id}`);
+                }}>{uiElement.label}</Button>
+              </Tooltip>
+            </FormControl>
           );
-        default:
+        } else {
           if (process.env.NODE_ENV !== "production") {
             console.error(`Unknown type - ${(uiElement as any).uiType} in ${(uiElement as any).id}.`)
           }
           return null;
+        }
+      })
+    );
+  };
+
+  private renderUIElementList(listSpecification: ViewSpecification, listKeyProperty: string, listData: { [key: string]: any }[]) {
+    const listElements = listSpecification.elements;
+
+    const navigate = (path: string) => {
+      this.props.history.push(`${this.props.match.url}${path}`);
+    };
+
+    const addNewElementAction = {
+      icon: AddIcon, tooltip: 'Add', onClick: () => {
+        navigate("[]"); // empty key means new element
       }
-    })
-  )
-
-  private createBreadCrump = (viewId: string, viewSpecifications: ViewSpecification[]) => {
-    const result: JSX.Element[] = [];
-    const hasIndex = /\/\$\$INDEX:(\d+):?([a-z\-]+)?\$\$/i;
-    let currentViewSpecification = viewSpecifications.find(s => s.id === viewId);
-    let indexCounter = 0;
-    while (currentViewSpecification != null) {
-      const currentViewId = currentViewSpecification.id;
-      const currentDataPathHasIndex = hasIndex.test(currentViewSpecification.dataPath);
-      result.unshift((
-        <span>
-          <Link component="a" variant="body2" color="secondary" onClick={() => {
-            this.props.navigateTo(currentViewId, currentDataPathHasIndex ? ++indexCounter : indexCounter);
-          }}>{currentViewSpecification.name}</Link>
-          {viewId === currentViewId ? null : " | "}
-        </span>
-      ));
-      currentViewSpecification = viewSpecifications.find(s => s.id === (currentViewSpecification && currentViewSpecification.parentView || ''));
+    };
+
+    const { classes } = this.props;
+
+    return (
+      <SelectElementTable idProperty={listKeyProperty} rows={listData} customActionButtons={[addNewElementAction]} columns={
+        Object.keys(listElements).reduce<ColumnModel<{ [key: string]: any }>[]>((acc, cur) => {
+          const elm = listElements[cur];
+          if (elm.uiType !== "object" && listData.every(entry => entry[elm.label] != null)) {
+            if (elm.label !== listKeyProperty) {
+              acc.push({ property: elm.label, type: elm.uiType === "number" ? ColumnType.numeric : ColumnType.text });
+            } else {
+              acc.unshift({ property: elm.label, type: elm.uiType === "number" ? ColumnType.numeric : ColumnType.text });
+            }
+          }
+          return acc;
+        }, []).concat([{
+          property: "Actions", disableFilter: true, disableSorting: true, type: ColumnType.custom, customControl: (row => {
+            return (
+              <Tooltip title={"Remove"} >
+                <IconButton className={classes.button} onClick={event => {
+
+                }} >
+                  <RemoveIcon />
+                </IconButton>
+              </Tooltip>
+            )
+          })
+        }])
+      } onHandleClick={(ev, row) => {
+        ev.preventDefault();
+        navigate(`[${row[listKeyProperty]}]`);
+      }} ></SelectElementTable>
+    );
+  }
+
+  private renderBreadCrumps() {
+    const { editMode } = this.state;
+    const { viewSpecification, displayAsList } = this.props;
+    const { vPath, match: { url, path }, nodeId } = this.props;
+    const pathParts = splitVPath(vPath!, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
+    let lastPath = `/configuration`;
+    let basePath = `/configuration/${nodeId}`;
+    return (
+      <div className={this.props.classes.header}>
+        <div>
+          <Breadcrumbs aria-label="breadcrumb">
+            <Link color="inherit" href="#" onClick={(ev: React.MouseEvent<HTMLElement>) => {
+              ev.preventDefault();
+              this.props.history.push(lastPath);
+            }}>Back</Link>
+            <Link color="inherit" href="#" onClick={(ev: React.MouseEvent<HTMLElement>) => {
+              ev.preventDefault();
+              this.props.history.push(`/configuration/${nodeId}`);
+            }}><span>{nodeId}</span></Link>
+            {
+              pathParts.map(([prop, key], ind) => {
+                const path = `${basePath}/${prop}`;
+                const keyPath = key && `${basePath}/${prop}[${key}]`;
+                const ret = (
+                  <span key={ind}>
+                    <Link color="inherit" href="#" onClick={(ev: React.MouseEvent<HTMLElement>) => {
+                      ev.preventDefault();
+                      this.props.history.push(path);
+                    }}><span>{prop.replace(/^[^:]+:/, "")}</span></Link>
+                    {
+                      keyPath && <Link color="inherit" href="#" onClick={(ev: React.MouseEvent<HTMLElement>) => {
+                        ev.preventDefault();
+                        this.props.history.push(keyPath);
+                      }}>{`[${key}]`}</Link> || null
+                    }
+                  </span>
+                );
+                lastPath = basePath;
+                basePath = keyPath || path;
+                return ret;
+              })
+            }
+          </Breadcrumbs>
+        </div>
+        { /* do not show edit if this is a list or it can't be edited */
+          !displayAsList && viewSpecification.canEdit && (<div>
+            <Fab color="secondary" aria-label="edit" className={this.props.classes.fab} onClick={() => {
+              if (this.state.editMode) {
+                this.props.onUpdateData(this.props.vPath!, this.state.viewData);
+              }
+              this.setState({ editMode: !editMode });
+            }}>
+              {editMode
+                ? <SaveIcon />
+                : <EditIcon />
+              }
+            </Fab>
+          </div> || null)
+        }
+      </div>
+    );
+  }
+
+  private renderValueSelector() {
+    const { listKeyProperty, listSpecification, listData, onValueSelected } = this.props;
+    if (!listKeyProperty || !listSpecification) {
+      throw new Error("ListKex ot view not specified.");
     }
-    return result;
+
+    return (
+      <div>
+        <SelectElementTable idProperty={listKeyProperty} rows={listData} columns={
+          Object.keys(listSpecification.elements).reduce<ColumnModel<{ [key: string]: any }>[]>((acc, cur) => {
+            const elm = listSpecification.elements[cur];
+            if (elm.uiType !== "object" && listData.every(entry => entry[elm.label] != null)) {
+              if (elm.label !== listKeyProperty) {
+                acc.push({ property: elm.label, type: elm.uiType === "number" ? ColumnType.numeric : ColumnType.text });
+              } else {
+                acc.unshift({ property: elm.label, type: elm.uiType === "number" ? ColumnType.numeric : ColumnType.text });
+              }
+            }
+            return acc;
+          }, [])
+        } onHandleClick={(ev, row) => { ev.preventDefault(); onValueSelected(row); }} ></SelectElementTable>
+      </div>
+    );
+  }
+
+  private renderValueEditor() {
+    const { keyProperty, displayAsList, viewSpecification } = this.props;
+    const { viewData, editMode, isNew } = this.state;
+
+    return (
+      <div>
+        { this.renderBreadCrumps() }
+        { displayAsList && viewData instanceof Array
+            ? this.renderUIElementList(viewSpecification, keyProperty!, viewData)
+            : this.renderUIElement(viewSpecification, viewData!, keyProperty, editMode, isNew)
+        }
+      </div >
+    );
+  }
+
+  private renderCollectingData() {
+    return (
+      <div className={this.props.classes.outer}>
+        <div className={this.props.classes.inner}>
+          <Loader />
+          <h3>Collecting Data ...</h3>
+        </div>
+      </div>
+    );
+  }
+
+  render() {
+    return this.props.collectingData || !this.state.viewData
+      ? this.renderCollectingData()
+      : this.props.listSpecification
+        ? this.renderValueSelector()
+        : this.renderValueEditor();
   }
 }
 
-export const ConfigurationApplication = connect(mapProps, mapDisp)(ConfigurationApplicationComponent);
+export const ConfigurationApplication = withStyles(styles)(withRouter(connect(mapProps, mapDispatch)(ConfigurationApplicationComponent)));
 export default ConfigurationApplication;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/views/networkElementSelector.tsx b/sdnr/wt/odlux/apps/configurationApp/src/views/networkElementSelector.tsx
new file mode 100644
index 000000000..6fd5c8cf0
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/views/networkElementSelector.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import { RouteComponentProps, withRouter } from 'react-router-dom';
+
+import connect, { IDispatcher, Connect } from "../../../../framework/src/flux/connect";
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import { MaterialTable, MaterialTableCtorType, ColumnType } from "../../../../framework/src/components/material-table";
+import { createConnectedNetworkElementsProperties, createConnectedNetworkElementsActions } from "../../../configurationApp/src/handlers/connectedNetworkElementsHandler";
+
+import { NetworkElementConnection } from "../models/networkElementConnection";
+import { Tooltip, Button, IconButton } from "@material-ui/core";
+
+const mapProps = (state: IApplicationStoreState) => ({
+  connectedNetworkElementsProperties: createConnectedNetworkElementsProperties(state),
+});
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+  connectedNetworkElementsActions: createConnectedNetworkElementsActions(dispatcher.dispatch),
+});
+
+const ConnectedElementTable = MaterialTable as MaterialTableCtorType<NetworkElementConnection>;
+
+type NetworkElementSelectorComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDispatch>;
+
+class NetworkElementSelectorComponent extends React.Component<NetworkElementSelectorComponentProps> {
+
+  componentDidMount() {
+    this.props.connectedNetworkElementsActions.onRefresh();
+  }
+
+  render() {
+    return (
+      <ConnectedElementTable onHandleClick={(e, row) => { this.props.history.push(`${ this.props.match.path }/${row.nodeId}`) }} columns={[
+        { property: "nodeId", title: "Name", type: ColumnType.text },
+        { property: "isRequired", title: "Required ?", type: ColumnType.boolean },
+        { property: "host", title: "Host", type: ColumnType.text },
+        { property: "port", title: "Port", type: ColumnType.numeric },
+        { property: "coreModelCapability", title: "Core Model", type: ColumnType.text },
+        { property: "deviceType", title: "Type", type: ColumnType.text },
+      ]} idProperty="id" {...this.props.connectedNetworkElementsActions} {...this.props.connectedNetworkElementsProperties} asynchronus >
+      </ConnectedElementTable>
+    );
+  }
+}
+
+export const NetworkElementSelector = withRouter(connect(mapProps, mapDispatch)(NetworkElementSelectorComponent));
+export default NetworkElementSelector;
+
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
new file mode 100644
index 000000000..c7ab5e4a3
--- /dev/null
+++ b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
@@ -0,0 +1,1099 @@
+
+import { Token, Statement, Module, Identity } from "../models/yang";
+import { ViewSpecification, ViewElement, isViewElementObjectOrList, ViewElementBase, isViewElementReference } from "../models/uiModels";
+import { yangService } from "../services/yangService";
+
+export const splitVPath = (vPath: string, vPathParser: RegExp): RegExpMatchArray[] => {
+  const pathParts: RegExpMatchArray[] = [];
+  let partMatch: RegExpExecArray | null;
+  if (vPath) do {
+    partMatch = vPathParser.exec(vPath);
+    if (partMatch) {
+      pathParts.push(partMatch);
+    }
+  } while (partMatch)
+  return pathParts;
+}
+
+class YangLexer {
+
+  private pos: number = 0;
+  private buf: string = "";
+
+  constructor(input: string) {
+    this.pos = 0;
+    this.buf = input;
+  }
+
+  private _optable: { [key: string]: string } = {
+    ';': 'SEMI',
+    '{': 'L_BRACE',
+    '}': 'R_BRACE',
+  };
+
+  private _isNewline(char: string): boolean {
+    return char === '\r' || char === '\n';
+  }
+
+  private _isWhitespace(char: string): boolean {
+    return char === ' ' || char === '\t' || this._isNewline(char);
+  }
+
+  private _isDigit(char: string): boolean {
+    return char >= '0' && char <= '9';
+  }
+
+  private _isAlpha(char: string): boolean {
+    return (char >= 'a' && char <= 'z') ||
+      (char >= 'A' && char <= 'Z')
+  }
+
+  private _isAlphanum(char: string): boolean {
+    return this._isAlpha(char) || this._isDigit(char) ||
+      char === '_' || char === '-' || char === '.';
+  }
+
+  private _skipNontokens() {
+    while (this.pos < this.buf.length) {
+      const char = this.buf.charAt(this.pos);
+      if (this._isWhitespace(char)) {
+        this.pos++;
+      } else {
+        break;
+      }
+    }
+  }
+
+  private _processString(terminator: string | null): Token {
+    // this.pos points at the opening quote. Find the ending quote.
+    let end_index = this.pos + 1;
+    while (end_index < this.buf.length) {
+      const char = this.buf.charAt(end_index);
+      if (char === "\\") {
+        end_index += 2;
+        continue;
+      };
+      if (terminator === null && (this._isWhitespace(char) || this._optable[char] !== undefined) || char === terminator) {
+        break;
+      }
+      end_index++;
+    }
+
+    if (end_index >= this.buf.length) {
+      throw Error('Unterminated quote at ' + this.pos);
+    } else {
+      const start = this.pos + (terminator ? 1 : 0);
+      const end = end_index;
+      const tok = {
+        name: 'STRING',
+        value: this.buf.substring(start, end),
+        start,
+        end
+      };
+      this.pos = terminator ? end + 1 : end;
+      return tok;
+    }
+  }
+
+  private _processIdentifier(): Token {
+    let endpos = this.pos + 1;
+    while (endpos < this.buf.length &&
+      this._isAlphanum(this.buf.charAt(endpos))) {
+      endpos++;
+    }
+
+    const tok = {
+      name: 'IDENTIFIER',
+      value: this.buf.substring(this.pos, endpos),
+      start: this.pos,
+      end: endpos
+    };
+    this.pos = endpos;
+    return tok;
+  }
+
+  private _processNumber(): Token {
+    let endpos = this.pos + 1;
+    while (endpos < this.buf.length &&
+      this._isDigit(this.buf.charAt(endpos))) {
+      endpos++;
+    }
+
+    const tok = {
+      name: 'NUMBER',
+      value: this.buf.substring(this.pos, endpos),
+      start: this.pos,
+      end: endpos
+    };
+    this.pos = endpos;
+    return tok;
+  }
+
+  private _processLineComment() {
+    var endpos = this.pos + 2;
+    // Skip until the end of the line
+    while (endpos < this.buf.length && !this._isNewline(this.buf.charAt(endpos))) {
+      endpos++;
+    }
+    this.pos = endpos + 1;
+  }
+
+  private _processBlockComment() {
+    var endpos = this.pos + 2;
+    // Skip until the end of the line
+    while (endpos < this.buf.length && !((this.buf.charAt(endpos) === "/" && this.buf.charAt(endpos - 1) === "*"))) {
+      endpos++;
+    }
+    this.pos = endpos + 1;
+  }
+
+  public tokenize(): Token[] {
+    const result: Token[] = [];
+    this._skipNontokens();
+    while (this.pos < this.buf.length) {
+
+      const char = this.buf.charAt(this.pos);
+      const op = this._optable[char];
+
+      if (op !== undefined) {
+        result.push({ name: op, value: char, start: this.pos, end: ++this.pos });
+      } else if (this._isAlpha(char)) {
+        result.push(this._processIdentifier());
+        this._skipNontokens();
+        const peekChar = this.buf.charAt(this.pos);
+        if (this._optable[peekChar] === undefined) {
+          result.push((peekChar !== "'" && peekChar !== '"')
+            ? this._processString(null)
+            : this._processString(peekChar));
+        }
+      } else if (char === '/' && this.buf.charAt(this.pos + 1) === "/") {
+        this._processLineComment();
+      } else if (char === '/' && this.buf.charAt(this.pos + 1) === "*") {
+        this._processBlockComment();
+      } else {
+        throw Error('Token error at ' + this.pos + " " + this.buf[this.pos]);
+      }
+      this._skipNontokens();
+    }
+    return result;
+  }
+
+  public tokenize2(): Statement {
+    let stack: Statement[] = [{ key: "ROOT", sub: [] }];
+    let current: Statement | null = null;
+
+    this._skipNontokens();
+    while (this.pos < this.buf.length) {
+
+      const char = this.buf.charAt(this.pos);
+      const op = this._optable[char];
+
+      if (op !== undefined) {
+        if (op === "L_BRACE") {
+          current && stack.unshift(current);
+          current = null;
+        } else if (op === "R_BRACE") {
+          current = stack.shift() || null;
+        }
+        this.pos++;
+      } else if (this._isAlpha(char)) {
+        const key = this._processIdentifier().value;
+        this._skipNontokens();
+        let peekChar = this.buf.charAt(this.pos);
+        let arg = undefined;
+        if (this._optable[peekChar] === undefined) {
+          arg = (peekChar === '"' || peekChar === "'")
+            ? this._processString(peekChar).value
+            : this._processString(null).value;
+        }
+        do {
+          this._skipNontokens();
+          peekChar = this.buf.charAt(this.pos);
+          if (peekChar !== "+") break;
+          this.pos++;
+          this._skipNontokens();
+          peekChar = this.buf.charAt(this.pos);
+          arg += (peekChar === '"' || peekChar === "'")
+            ? this._processString(peekChar).value
+            : this._processString(null).value;
+        } while (true);
+        current = { key, arg, sub: [] };
+        stack[0].sub!.push(current);
+      } else if (char === '/' && this.buf.charAt(this.pos + 1) === "/") {
+        this._processLineComment();
+      } else if (char === '/' && this.buf.charAt(this.pos + 1) === "*") {
+        this._processBlockComment();
+      } else {
+        throw Error('Token error at ' + this.pos + " " + this.buf.slice(this.pos - 10, this.pos + 10));
+      }
+      this._skipNontokens();
+    }
+    if (stack[0].key !== "ROOT" || !stack[0].sub![0]) {
+      throw new Error("Internal Perser Error");
+    }
+    return stack[0].sub![0];
+  }
+}
+
+export class YangParser {
+  private _groupingsToResolve: (() => void)[] = [];
+  private _identityToResolve: (() => void)[] = [];
+
+  private _modules: { [name: string]: Module } = {};
+  private _views: ViewSpecification[] = [{
+    id: "0",
+    name: "root",
+    language: "en-US",
+    canEdit: false,
+    parentView: "0",
+    title: "root",
+    elements: {},
+   }];
+
+  constructor() {
+
+  }
+
+  public get modules() {
+    return this._modules;
+  }
+
+  public get views() {
+    return this._views;
+  }
+
+  public async addCapability(capability: string, version?: string) {
+    // do not add twice
+    if (this._modules[capability]) {
+      return;
+    }
+
+    const data = await yangService.getCapability(capability, version);
+    if (!data) {
+      throw new Error(`Could not load yang file for ${capability}.`);
+    }
+
+    const rootStatement = new YangLexer(data).tokenize2();
+
+    if (rootStatement.key !== "module") {
+      throw new Error(`Root element of ${capability} is not a module.`);
+    }
+    if (rootStatement.arg !== capability) {
+      throw new Error(`Root element capability ${rootStatement.arg} does not requested ${capability}.`);
+    }
+
+    const module = this._modules[capability] = {
+      name: rootStatement.arg,
+      revisions: {},
+      imports: {},
+      features: {},
+      identities: {},
+      augments: {},
+      groupings: {},
+      typedefs: {},
+      views: {},
+      elements: {}
+    };
+
+    await this.handleModule(module, rootStatement, capability);
+  }
+
+  private async handleModule(module: Module, rootStatement: Statement, capability: string) {
+
+    // extract namespace && prefix
+    module.namespace = this.extractValue(rootStatement, "namespace");
+    module.prefix = this.extractValue(rootStatement, "prefix");
+    if (module.prefix) {
+      module.imports[module.prefix] = capability;
+    }
+
+    // extract revisions
+    const revisions = this.extractNodes(rootStatement, "revision");
+    module.revisions = {
+      ...module.revisions,
+      ...revisions.reduce<{ [version: string]: { }}>((acc, version) => {
+        if (!version.arg) {
+          throw new Error(`Module [${module.name}] has a version w/o version number.`);
+        }
+        const description = this.extractValue(version, "description");
+        const reference = this.extractValue(version,"reference");
+        acc[version.arg] = {
+          description,
+          reference,
+        };
+        return acc;
+      }, {})
+    };
+
+    // extract features
+    const features = this.extractNodes(rootStatement, "feature");
+    module.features = {
+      ...module.features,
+      ...features.reduce<{ [version: string]: {} }>((acc, feature) => {
+        if (!feature.arg) {
+          throw new Error(`Module [${module.name}] has a feature w/o name.`);
+        }
+        const description = this.extractValue(feature, "description");
+        acc[feature.arg] = {
+          description,
+        };
+        return acc;
+      }, {})
+    };
+
+    // extract imports
+    const imports = this.extractNodes(rootStatement, "import");
+    module.imports = {
+      ...module.imports,
+      ...imports.reduce < { [key: string]: string }>((acc, imp) => {
+        const prefix = imp.sub && imp.sub.filter(s => s.key === "prefix");
+        if (!imp.arg) {
+           throw new Error(`Module [${module.name}] has an import with neither name nor prefix.`);
+        }
+        acc[prefix && prefix.length === 1 && prefix[0].arg || imp.arg] = imp.arg;
+        return acc;
+      }, {})
+    };
+
+    // import all required files
+    if (imports) for (let ind = 0; ind < imports.length; ++ind) {
+      await this.addCapability(imports[ind].arg!);
+    }
+
+    this.extractTypeDefinitions(rootStatement, module, "");
+
+    this.extractIdentites(rootStatement, 0, module, "");
+
+    const groupings = this.extractGroupings(rootStatement, 0, module, "");
+    this._views.push(...groupings);
+
+    const augments = this.extractAugments(rootStatement, 0, module, "");
+    this._views.push(...augments);
+
+    // the default for config on module level is config = true;
+    const [currentView, subViews] = this.extractSubViews(rootStatement, 0, module, "");
+    this._views.push(currentView, ...subViews);
+
+    // create the root elements for this module
+    module.elements = currentView.elements;
+    Object.keys(module.elements).forEach(key => {
+      const viewElement = module.elements[key];
+      if (!isViewElementObjectOrList(viewElement)) {
+        throw new Error(`Module: [${module}]. Only List or Object allowed on root level.`);
+      }
+      const viewIdIndex = Number(viewElement.viewId);
+      module.views[key] = this._views[viewIdIndex];
+      this._views[0].elements[key] = module.elements[key];
+    });
+    return module;
+  }
+
+  public postProcess() {
+    // process all groupings
+    // execute all post processes like resolving in propper order
+    this._groupingsToResolve.forEach(cb => {
+      try { cb(); } catch (error) {
+        console.warn(`Error resolving: [${error.message}]`);
+      }
+    });
+
+    // process all augmentations
+    Object.keys(this.modules).forEach(modKey => {
+      const module = this.modules[modKey];
+      Object.keys(module.augments).forEach(augKey => {
+        const augments = module.augments[augKey];
+        const viewSpec = this.resolveView(augKey);
+        if (!viewSpec) console.warn(`Could not find view to augment [${augKey}] in [${module.name}].`);
+        if (augments && viewSpec) {
+          augments.forEach(augment => Object.keys(augment.elements).forEach(key => {
+            const elm = augment.elements[key];
+            viewSpec.elements[key] = {
+              ...augment.elements[key],
+              when: elm.when ? `(${augment.when}) and (${elm.when})` : augment.when,
+              ifFeature: elm.ifFeature ? `(${augment.ifFeature}) and (${elm.ifFeature})` : augment.ifFeature,
+            };
+          }));
+        }
+      });
+    });
+
+    // process Identities
+    const traverseIdentity = (identities : Identity[]) => {
+      const result: Identity[] = [];
+      for (let identity of identities) {
+        if (identity.children && identity.children.length > 0) {
+          result.push(...traverseIdentity(identity.children));
+        } else {
+          result.push(identity);
+        }
+      }
+      return result;
+    }
+
+
+    const baseIdentites: Identity[] = [];
+    Object.keys(this.modules).forEach(modKey => {
+      const module = this.modules[modKey];
+      Object.keys(module.identities).forEach(idKey => {
+        const identity = module.identities[idKey];
+        if (identity.base != null) {
+          const base = this.resolveIdentity(identity.base, module);
+          base.children?.push(identity);
+        } else {
+          baseIdentites.push(identity);
+        }
+      });
+    });
+    baseIdentites.forEach(identity => {
+      identity.values = identity.children && traverseIdentity(identity.children) || [];
+    });
+
+    this._identityToResolve.forEach(cb => {
+      try { cb(); } catch (error) {
+        console.warn(error.message);
+      }
+    });
+  };
+
+
+  private _nextId = 1;
+  private get nextId() {
+    return this._nextId++;
+  }
+
+  private extractNodes(statement: Statement, key: string): Statement[] {
+    return statement.sub && statement.sub.filter(s => s.key === key) || [];
+  }
+
+  private extractValue(statement: Statement, key: string): string | undefined;
+  private extractValue(statement: Statement, key: string, parser: RegExp): RegExpExecArray | undefined;
+  private extractValue(statement: Statement, key: string, parser?: RegExp): string | RegExpExecArray | undefined {
+    const typeNodes = this.extractNodes(statement, key);
+    const rawValue = typeNodes.length > 0 && typeNodes[0].arg || undefined;
+    return parser
+      ? rawValue && parser.exec(rawValue) || undefined
+      : rawValue;
+  }
+
+  private extractTypeDefinitions(statement: Statement, module: Module, currentPath: string): void {
+    const typedefs = this.extractNodes(statement, "typedef");
+    typedefs && typedefs.forEach(def => {
+      if (! def.arg) {
+        throw new Error(`Module: [${module.name}]. Found typefed without name.`);
+      }
+      module.typedefs[def.arg] = this.getViewElement(def, module, 0, currentPath, false);
+    });
+  }
+
+  /** Handles Goupings like named Container */
+  private extractGroupings(statement: Statement, parentId: number, module: Module, currentPath: string): ViewSpecification[] {
+    const subViews: ViewSpecification[] = [];
+    const groupings = this.extractNodes(statement, "grouping");
+    if (groupings && groupings.length > 0) {
+      subViews.push(...groupings.reduce<ViewSpecification[]>((acc, cur) => {
+        if (!cur.arg) {
+          throw new Error(`Module: [${module.name}][${currentPath}]. Found grouping without name.`);
+        }
+        const grouping = cur.arg;
+
+        // the default for config on module level is config = true;
+        const [currentView, subViews] = this.extractSubViews(cur, parentId, module, currentPath);
+        grouping && (module.groupings[grouping] = currentView);
+        acc.push(currentView, ...subViews);
+        return acc;
+      }, []));
+    }
+
+    return subViews;
+  }
+
+  /** Handles Augmants also like named Container */
+  private extractAugments(statement: Statement, parentId: number, module: Module, currentPath: string): ViewSpecification[] {
+    const subViews: ViewSpecification[] = [];
+    const augments = this.extractNodes(statement, "augment");
+    if (augments && augments.length > 0) {
+      subViews.push(...augments.reduce<ViewSpecification[]>((acc, cur) => {
+        if (!cur.arg) {
+          throw new Error(`Module: [${module.name}][${currentPath}]. Found augment without path.`);
+        }
+        const augment = this.resolveReferencePath(cur.arg, module);
+
+        // the default for config on module level is config = true;
+        const [currentView, subViews] = this.extractSubViews(cur, parentId, module, currentPath);
+        if (augment) {
+          module.augments[augment] = module.augments[augment] || [];
+          module.augments[augment].push(currentView);
+        }
+        acc.push(currentView, ...subViews);
+        return acc;
+      }, []));
+    }
+
+    return subViews;
+  }
+
+  /** Handles Identities  */
+  private extractIdentites(statement: Statement, parentId: number, module: Module, currentPath: string) {
+    const identities = this.extractNodes(statement, "identity");
+    module.identities = identities.reduce<{ [name: string]: Identity }>((acc, cur) => {
+      if (!cur.arg) {
+        throw new Error(`Module: [${module.name}][${currentPath}]. Found identiy without name.`);
+      }
+      acc[cur.arg] = {
+        id: `${module.name}:${cur.arg}`,
+        label: cur.arg,
+        base: this.extractValue(cur, "base"),
+        description: this.extractValue(cur, "description"),
+        reference: this.extractValue(cur, "reference"),
+        children: []
+      }
+      return acc;
+    }, {});
+  }
+
+  private extractSubViews(statement: Statement, parentId: number, module: Module, currentPath: string): [ViewSpecification, ViewSpecification[]] {
+    const subViews: ViewSpecification[] = [];
+    const currentId = this.nextId;
+    let elements: ViewElement[] = [];
+
+    const configValue = this.extractValue(statement, "config");
+    const config = configValue == null ? true : configValue.toLocaleLowerCase() !== "false";
+
+    // extract conditions
+    const ifFeature = this.extractValue(statement, "if-feature");
+    const whenCondition = this.extractValue(statement, "when");
+
+    // extract all container
+    const container = this.extractNodes(statement, "container");
+    if (container && container.length > 0) {
+      subViews.push(...container.reduce<ViewSpecification[]>((acc, cur) => {
+        if (!cur.arg) {
+          throw new Error(`Module: [${module.name}]. Found container without name.`);
+        }
+        const [currentView, subViews] = this.extractSubViews(cur, currentId, module, `${currentPath}/${module.name}:${cur.arg}`);
+        elements.push({
+          id: parentId === 0 ? `${module.name}:${cur.arg}` : cur.arg,
+          label: cur.arg,
+          uiType: "object",
+          viewId: currentView.id,
+          config: config
+        });
+        acc.push(currentView, ...subViews);
+        return acc;
+      }, []));
+    }
+
+    // process all lists
+    // a list is a list of containers with the leafs contained in the list
+    const lists = this.extractNodes(statement, "list");
+    if (lists && lists.length > 0) {
+      subViews.push(...lists.reduce<ViewSpecification[]>((acc, cur) => {
+        if (!cur.arg) {
+          throw new Error(`Module: [${module.name}]. Found list without name.`);
+        }
+        const key = this.extractValue(cur, "key") || undefined;
+        if (config && !key) {
+          throw new Error(`Module: [${module.name}]. Found configurable list without key.`);
+        }
+        const [currentView, subViews] = this.extractSubViews(cur, currentId, module, `${currentPath}/${module.name}:${cur.arg}`);
+        elements.push({
+          id: parentId === 0 ? `${module.name}:${cur.arg}` : cur.arg,
+          label: cur.arg,
+          isList: true,
+          uiType: "object",
+          viewId: currentView.id,
+          key: key,
+          config: config
+        });
+        acc.push(currentView, ...subViews);
+        return acc;
+      }, []));
+    }
+
+    // process all leaf-lists
+    // a leaf-list is a list of some type
+    const leafLists = this.extractNodes(statement, "leaf-list");
+    if (leafLists && leafLists.length > 0) {
+      elements.push(...leafLists.reduce<ViewElement[]>((acc, cur) => {
+        const element = this.getViewElement(cur, module, parentId, currentPath, true);
+        element && acc.push(element);
+        return acc;
+      }, []));
+    }
+
+    // process all leafs
+    // a leaf is mainly a property of an object
+    const leafs = this.extractNodes(statement, "leaf");
+    if (leafs && leafs.length > 0) {
+      elements.push(...leafs.reduce<ViewElement[]>((acc, cur) => {
+        const element = this.getViewElement(cur, module, parentId, currentPath, false);
+        element && acc.push(element);
+        return acc;
+      }, []));
+    }
+
+
+    const choiceStms = this.extractNodes(statement, "choice");
+    if (choiceStms && choiceStms.length > 0) {
+      for (let i = 0; i < choiceStms.length; ++i) {
+        const cases = this.extractNodes(choiceStms[i], "case");
+        console.warn(`Choice found ${choiceStms[i].arg}::${cases.map(c => c.arg).join(";")}`, choiceStms[i]);
+      }
+    }
+
+    const rpcs = this.extractNodes(statement, "rpc");
+    if (rpcs && rpcs.length > 0) {
+      // todo:
+    }
+
+    if (!statement.arg) {
+      throw new Error(`Module: [${module.name}]. Found statement without name.`);
+    }
+
+    const viewSpec: ViewSpecification = {
+      id: String(currentId),
+      parentView: String(parentId),
+      name: statement.arg,
+      title: statement.arg,
+      language: "en-us",
+      canEdit: false,
+      ifFeature: ifFeature,
+      when: whenCondition,
+      elements: elements.reduce<{ [name: string]: ViewElement }>((acc, cur) => {
+        acc[cur.id] = cur;
+        return acc;
+      }, {}),
+    };
+
+    // evaluate canEdit depending on all conditions
+    Object.defineProperty(viewSpec, "canEdit", {
+      get: () => {
+        return Object.keys(viewSpec.elements).some(key => {
+          const elm = viewSpec.elements[key];
+          return (!isViewElementObjectOrList(elm) && elm.config);
+        });
+      }
+    });
+
+    // merge in all uses references and resolve groupings
+    const usesRefs = this.extractNodes(statement, "uses");
+    if (usesRefs && usesRefs.length > 0) {
+
+      viewSpec.uses = (viewSpec.uses || []);
+      for (let i = 0; i < usesRefs.length; ++i) {
+        const groupingName = usesRefs[i].arg;
+        if (!groupingName) {
+          throw new Error(`Module: [${module.name}]. Found an uses statement without a grouping name.`);
+        }
+
+        viewSpec.uses.push(this.resolveReferencePath(groupingName, module));
+
+        this._groupingsToResolve.push(() => {
+          const groupingViewSpec = this.resolveGrouping(groupingName, module);
+          if (groupingViewSpec) {
+            Object.keys(groupingViewSpec.elements).forEach(key => {
+              const elm = groupingViewSpec.elements[key];
+              viewSpec.elements[key] = {
+                ...groupingViewSpec.elements[key],
+                when: elm.when ? `(${groupingViewSpec.when}) and (${elm.when})` : groupingViewSpec.when,
+                ifFeature: elm.ifFeature ? `(${groupingViewSpec.ifFeature}) and (${elm.ifFeature})` : groupingViewSpec.ifFeature,
+              };
+            });
+          }
+        });
+      }
+    }
+
+    return [viewSpec, subViews];
+  }
+
+  /** Extracts the UI View from the type in the cur statement. */
+  private getViewElement(cur: Statement, module: Module, parentId: number, currentPath: string, isList: boolean): ViewElement {
+
+    const type = this.extractValue(cur, "type");
+    const defaultVal = this.extractValue(cur, "default") || undefined;
+    const description = this.extractValue(cur, "description") || undefined;
+    const rangeMatch = this.extractValue(cur, "range", /^(\d+)\.\.(\d+)/) || undefined;
+
+    const configValue = this.extractValue(cur, "config");
+    const config = configValue == null ? true : configValue.toLocaleLowerCase() !== "false";
+
+    const mandatory = this.extractValue(cur, "mandatory") === "true" || false;
+
+    if (!cur.arg) {
+      throw new Error(`Module: [${module.name}]. Found element without name.`);
+    }
+
+    if (!type) {
+      throw new Error(`Module: [${module.name}].[${cur.arg}]. Found element without type.`);
+    }
+
+    const element: ViewElementBase = {
+      id: parentId === 0 ? `${module.name}:${cur.arg}`: cur.arg,
+      label: cur.arg,
+      config: config,
+      mandatory: mandatory,
+      isList: isList,
+      default: defaultVal,
+      description: description
+    };
+
+    if (type === "string") {
+      return ({
+        ...element,
+        uiType: "string",
+        pattern: this.extractNodes(this.extractNodes(cur, "type")[0]!, "pattern").map(p => p.arg!).filter(p => !!p),
+      });
+    } else if (type === "boolean") {
+      return ({
+        ...element,
+        uiType: "boolean"
+      });
+    } else if (type === "uint8") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +255,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "uint16") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +65535,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "uint32") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +4294967295,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "uint64") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +18446744073709551615,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "int8") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : -128,
+        max: rangeMatch ? Number(rangeMatch[1]) : +127,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "int16") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : -32768,
+        max: rangeMatch ? Number(rangeMatch[1]) : +32767,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "int32") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : -2147483648,
+        max: rangeMatch ? Number(rangeMatch[1]) : +2147483647,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "int64") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +18446744073709551615,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+      });
+    } else if (type === "decimal16") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +18446744073709551615,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+        fDigits: Number(this.extractValue(this.extractNodes(cur, "type")[0]!, "fraction-digits")) || -1
+      });
+    } else if (type === "decimal32") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +18446744073709551615,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+        fDigits: Number(this.extractValue(this.extractNodes(cur, "type")[0]!, "fraction-digits")) || -1
+      });
+    } else if (type === "decimal64") {
+      return ({
+        ...element,
+        uiType: "number",
+        min: rangeMatch ? Number(rangeMatch[0]) : 0,
+        max: rangeMatch ? Number(rangeMatch[1]) : +18446744073709551615,
+        units: this.extractValue(cur, "units") || undefined,
+        format: this.extractValue(cur, "format") || undefined,
+        fDigits: Number(this.extractValue(this.extractNodes(cur, "type")[0]!, "fraction-digits")) || -1
+      });
+    } else if (type === "enumeration") {
+      const typeNode = this.extractNodes(cur, "type")[0]!;
+      const enumNodes = this.extractNodes(typeNode, "enum");
+      return ({
+        ...element,
+        uiType: "selection",
+        options: enumNodes.reduce<{ key: string; value: string; description?: string }[]>((acc, enumNode) => {
+          if (!enumNode.arg) {
+            throw new Error(`Module: [${module.name}][${currentPath}][${cur.arg}]. Found option without name.`);
+          }
+          const ifClause = this.extractValue(enumNode, "if-feature");
+          const value = this.extractValue(enumNode, "value");
+          const enumOption = {
+            key: enumNode.arg,
+            value: value != null ? value : enumNode.arg,
+            description: this.extractValue(enumNode, "description") || undefined
+          };
+          // todo: ❗ handle the if clause ⚡
+          acc.push(enumOption);
+          return acc;
+        }, [])
+      });
+    } else if (type === "leafref") {
+      const typeNode = this.extractNodes(cur, "type")[0]!;
+      const vPath = this.extractValue(typeNode, "path");
+      if (!vPath) {
+        throw new Error(`Module: [${module.name}][${currentPath}][${cur.arg}]. Found leafref without path.`);
+      }
+      const refPath = this.resolveReferencePath(vPath, module);
+      const resolve = this.resolveReference.bind(this);
+      const res : ViewElement = {
+        ...element,
+        uiType: "reference",
+        referencePath: refPath,
+        ref(this: ViewElement, currentPath: string) {
+          const resolved = resolve(refPath, currentPath);
+          return resolved && {
+            ...resolved,
+            id: this.id,
+            label: this.label,
+            config: this.config,
+            mandatory: this.mandatory,
+            isList: this.isList,
+            default: this.default,
+            description: this.description,
+          } as ViewElement;
+        }
+      };
+      return res;
+    } else if (type === "identityref") {
+      const typeNode = this.extractNodes(cur, "type")[0]!;
+      const base = this.extractValue(typeNode, "base");
+      if (!base) {
+        throw new Error(`Module: [${module.name}][${currentPath}][${cur.arg}]. Found identityref without base.`);
+      }
+      const res: ViewElement = {
+        ...element,
+        uiType: "selection",
+        options: []
+      };
+      this._identityToResolve.push(() => {
+        const identity : Identity = this.resolveIdentity(base, module);
+        if (!identity) {
+          throw new Error(`Module: [${module.name}][${currentPath}][${cur.arg}]. Could not resolve identity [${base}].`);
+        }
+        if (!identity.values || identity.values.length === 0) {
+          throw new Error(`Identity: [${base}] has no values.`);
+        }
+        res.options = identity.values.map(val => ({
+          key: val.id,
+          value: val.id,
+          description: val.description
+        }));
+      });
+      return res ;
+    } else if (type === "empty") {
+      // todo: ❗ handle empty ⚡
+      /*  9.11.  The empty Built-In Type
+          The empty built-in type represents a leaf that does not have any
+          value, it conveys information by its presence or absence. */
+      console.warn(`found type: empty in [${module.name}][${currentPath}][${element.label}]`);
+      return {
+        ...element,
+        uiType: "string",
+      };
+    } else if (type === "union") {
+      // todo: ❗ handle union ⚡
+      /* 9.12.  The union Built-In Type */
+      console.warn(`found type: union in [${module.name}][${currentPath}][${element.label}]`);
+      return {
+        ...element,
+        uiType: "string",
+      };
+    } else if (type === "bits") {
+      const typeNode = this.extractNodes(cur, "type")[0]!;
+      const bitNodes = this.extractNodes(typeNode, "bit");
+      return {
+        ...element,
+        uiType: "bits",
+        flags: bitNodes.reduce<{[name: string]: number | undefined; }>((acc, bitNode) => {
+          if (!bitNode.arg) {
+            throw new Error(`Module: [${module.name}][${currentPath}][${cur.arg}]. Found bit without name.`);
+          }
+          const ifClause = this.extractValue(bitNode, "if-feature");
+          const pos = Number(this.extractValue(bitNode, "position"));
+          acc[bitNode.arg] = pos === pos ? pos : undefined;
+          return acc;
+        }, {})
+      };
+    } else if (type === "binary") {
+      const typeNode = this.extractNodes(cur, "type")[0]!;
+      const length = Number(this.extractValue(typeNode, "length"));
+      return {
+        ...element,
+        uiType: "binary",
+        length: length === length ? length : undefined
+      };
+    } else {
+      // not a build in type, have to resolve type
+      const typeRef = this.resolveType(type, module);
+      if (typeRef == null) console.error(new Error(`Could not resolve type ${type} in [${module.name}][${currentPath}].`));
+      return ({
+        ...typeRef,
+        ...element,
+        description: description
+      }) as ViewElement;
+    }
+  }
+
+  private resolveReferencePath(vPath: string, module: Module) {
+    const vPathParser = /(?:(?:([^\/\:]+):)?([^\/]+))/g // 1 = opt: namespace / 2 = property
+    return vPath.replace(vPathParser, (_, ns, property) => {
+      const nameSpace = ns && module.imports[ns] || module.name;
+      return `${nameSpace}:${property}`;
+    });
+  }
+
+
+  private resolveReference(vPath: string, currentPath: string) {
+    const vPathParser = /(?:(?:([^\/\[\]\:]+):)?([^\/\[\]]+)(\[[^\]]+\])?)/g // 1 = opt: namespace / 2 = property / 3 = opt: indexPath
+    let element : ViewElement | null = null;
+    let moduleName = "";
+
+    const vPathParts = splitVPath(vPath, vPathParser).map(p => ({ ns: p[1], property: p[2], ind: p[3] }));
+    const resultPathParts = !vPath.startsWith("/")
+      ? splitVPath(currentPath, vPathParser).map(p => ({ ns: p[1], property: p[2], ind: p[3] }))
+      : [];
+
+    for (let i = 0; i < vPathParts.length; ++i){
+      const vPathPart = vPathParts[i];
+      if (vPathPart.property === "..") {
+        resultPathParts.pop();
+      } else if (vPathPart.property !== ".") {
+        resultPathParts.push(vPathPart);
+      }
+    }
+
+    // resolve element by path
+    for (let j = 0; j < resultPathParts.length;++j){
+      const pathPart = resultPathParts[j];
+        if (j===0) {
+          moduleName = pathPart.ns;
+          const rootModule = this._modules[moduleName];
+          if (!rootModule) throw new Error("Could not resolve module [" + moduleName +"].\r\n" + vPath);
+          element = rootModule.elements[`${pathPart.ns}:${pathPart.property}`];
+        } else if (element && isViewElementObjectOrList(element)) {
+          const view: ViewSpecification = this._views[+element.viewId];
+          if (moduleName !== pathPart.ns) {
+            moduleName = pathPart.ns;
+            element = view.elements[`${moduleName}:${pathPart.property}`];
+          } else {
+            element = view.elements[pathPart.property] || view.elements[`${moduleName}:${pathPart.property}`];
+          }
+        } else {
+          throw new Error("Could not resolve reference.\r\n" + vPath);
+        }
+        if (!element) throw new Error("Could not resolve path [" + pathPart.property + "] in ["+ currentPath +"] \r\n" + vPath);
+      }
+
+    return element;
+  }
+
+  private resolveView(vPath: string) {
+    const vPathParser = /(?:(?:([^\/\[\]\:]+):)?([^\/\[\]]+)(\[[^\]]+\])?)/g // 1 = opt: namespace / 2 = property / 3 = opt: indexPath
+    let element: ViewElement | null = null;
+    let partMatch: RegExpExecArray | null;
+    let view: ViewSpecification | null = null;
+    let moduleName = "";
+    if (vPath) do {
+      partMatch = vPathParser.exec(vPath);
+      if (partMatch) {
+        if (element === null) {
+          moduleName = partMatch[1]!;
+          const rootModule = this._modules[moduleName];
+          if (!rootModule) return null;
+          element = rootModule.elements[`${moduleName}:${partMatch[2]!}`];
+        } else if (isViewElementObjectOrList(element)) {
+          view = this._views[+element.viewId];
+          if (moduleName !== partMatch[1]) {
+            moduleName = partMatch[1];
+            element = view.elements[`${moduleName}:${partMatch[2]}`];
+          } else {
+            element = view.elements[partMatch[2]];
+          }
+        } else {
+          return null;
+        }
+        if (!element) return null;
+      }
+    } while (partMatch)
+    return element && isViewElementObjectOrList(element) && this._views[+element.viewId] || null;
+  }
+
+  private resolveType(type: string, module: Module) {
+    const collonInd = type.indexOf(":");
+    const preFix = collonInd > -1 ? type.slice(0, collonInd) : "";
+    const typeName = collonInd > -1 ? type.slice(collonInd + 1) : type;
+
+    const res = preFix
+      ? this._modules[module.imports[preFix]].typedefs[typeName]
+      : module.typedefs[typeName];
+    return res;
+  }
+
+  private resolveGrouping(grouping: string, module: Module) {
+    const collonInd = grouping.indexOf(":");
+    const preFix = collonInd > -1 ? grouping.slice(0, collonInd) : "";
+    const groupingName = collonInd > -1 ? grouping.slice(collonInd + 1) : grouping;
+
+    return preFix
+      ? this._modules[module.imports[preFix]].groupings[groupingName]
+      : module.groupings[groupingName];
+
+  }
+
+  private resolveIdentity(identity: string, module: Module) {
+    const collonInd = identity.indexOf(":");
+    const preFix = collonInd > -1 ? identity.slice(0, collonInd) : "";
+    const identityName = collonInd > -1 ? identity.slice(collonInd + 1) : identity;
+
+    return preFix
+      ? this._modules[module.imports[preFix]].identities[identityName]
+      : module.identities[identityName];
+
+  }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/configurationApp/webpack.config.js b/sdnr/wt/odlux/apps/configurationApp/webpack.config.js
index e44b9322b..6a5c5d55e 100644
--- a/sdnr/wt/odlux/apps/configurationApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/configurationApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      configurationApp: ["./plugin.tsx"]
+      configurationApp: ["./pluginConfiguration.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -86,10 +86,6 @@ module.exports = (env) => {
         manifest: require(path.resolve(frameworkPath, "app-manifest.json")),
         sourceType: "umd2"
       }),
-      new CopyWebpackPlugin([{
-        from: "assets",
-        to: path.resolve(distPath, "assets")
-      }]),
       ...(env === "release") ? [
         new webpack.DefinePlugin({
           "process.env": {
@@ -131,25 +127,29 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/yang-schema/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
-        "/websocket/": {
-          target: "http://localhost:3000",
+        "/websocket": {
+          target: "http://10.20.6.29:48181",
           ws: true,
-          changeOrigin: true,
+          changeOrigin: false,
           secure: false
         }
       }
diff --git a/sdnr/wt/odlux/apps/connectApp/package.json b/sdnr/wt/odlux/apps/connectApp/package.json
index 269fa2a8c..04653d520 100644
--- a/sdnr/wt/odlux/apps/connectApp/package.json
+++ b/sdnr/wt/odlux/apps/connectApp/package.json
@@ -21,20 +21,20 @@
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
   "dependencies": {
-    "@odlux/framework" : "*"
+    "@odlux/framework": "*"
   },
   "peerDependencies": {
-     "@types/react": "16.4.14",
-     "@types/react-dom": "16.0.8",
-     "@types/react-router-dom": "4.3.1",
-     "@material-ui/core": "3.8.3",
-     "@material-ui/icons": "3.0.2",
-     "@types/classnames": "2.2.6",
-     "@types/flux": "3.1.8",
-     "@types/jquery": "3.3.10",
-     "jquery": "3.3.1",
-     "react": "16.5.2",
-     "react-dom": "16.5.2",
-     "react-router-dom": "4.3.1"
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
+    "@types/react-router-dom": "4.3.1",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
+    "@types/classnames": "2.2.6",
+    "@types/flux": "3.1.8",
+    "@types/jquery": "3.3.10",
+    "jquery": "3.3.1",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
+    "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml
index 3da282c39..36a5cf8bf 100644
--- a/sdnr/wt/odlux/apps/connectApp/pom.xml
+++ b/sdnr/wt/odlux/apps/connectApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-connectApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-connectApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts
new file mode 100644
index 000000000..bf4778b5b
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts
@@ -0,0 +1,113 @@
+// update action erstellen, die unterscheiden kann, ob die eine oder die andere Ansicht gerade aktive ist und diese katualisiert.
+// Diese action wird dann bei jeder aktualisierung in den anderen Actions und bei eintreffen von notifikationen verwendet.
+
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../../../../framework/src/flux/action';
+import { Dispatch } from '../../../../framework/src/flux/store';
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
+
+import { networkElementsReloadAction } from '../handlers/networkElementsHandler';
+import { connectionStatusLogReloadAction } from '../handlers/connectionStatusLogHandler';
+
+import { PanelId } from '../models/panelId';
+import { guiCutThrough } from '../models/guiCutTrough';
+import connectService from '../services/connectService';
+import { NetworkElementConnection } from '../models/networkElementConnection';
+
+export class SetPanelAction extends Action {
+  constructor(public panelId: PanelId) {
+    super();
+  }
+}
+
+export class AddWebUriList extends Action {
+  constructor(public element: guiCutThrough[], public knownElements: string[]) {
+    super();
+  }
+}
+
+export class RemoveWebUri extends Action {
+  constructor(public element: string) {
+    super();
+  }
+}
+
+export const removeWebUriAction = (nodeId: string) => {
+  return new RemoveWebUri(nodeId);
+}
+
+let isBusy = false;
+export const findWebUrisForGuiCutThroughAsyncAction = (dispatcher: Dispatch) => (networkElements: NetworkElementConnection[], knownElements: string[]) => {
+
+  // keep method from executing simultanously; state not used because change of iu isn't needed
+  if (isBusy)
+    return;
+  isBusy = true;
+
+  const nodeIds = networkElements.map(element => { return element.id as string });
+
+  if (knownElements.length > 0) {
+
+    let elementsToSearch: string[] = [];
+
+    nodeIds.forEach(element => {
+      // find index of nodeId
+      const index = knownElements.indexOf(element);
+
+      // if element dosen't exist, add it to list
+      if (index === -1) {
+        elementsToSearch.push(element)
+      }
+    });
+
+    // if new elements were found, search for weburi
+    if (elementsToSearch.length > 0) {
+      const foundWebUris = connectService.getAllWebUriExtensionsForNetworkElementListAsync(elementsToSearch);
+      foundWebUris.then(result => {
+        dispatcher(new AddWebUriList(result, elementsToSearch));
+        isBusy = false;
+      })
+
+    } else {
+      isBusy = false;
+    }
+
+  } else {
+    connectService.getAllWebUriExtensionsForNetworkElementListAsync(nodeIds).then(result => {
+      dispatcher(new AddWebUriList(result, nodeIds));
+      isBusy = false;
+    })
+  }
+}
+
+export const setPanelAction = (panelId: PanelId) => {
+  return new SetPanelAction(panelId);
+}
+
+export const updateCurrentViewAsyncAction = () => (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
+  const { connect: { currentOpenPanel } } = getState();
+  if (currentOpenPanel === "NetworkElements") {
+    return dispatch(networkElementsReloadAction);
+  }
+  else {
+    return dispatch(connectionStatusLogReloadAction);
+  }
+};
+
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/infoNetworkElementActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/infoNetworkElementActions.ts
new file mode 100644
index 000000000..4ae28aab2
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/infoNetworkElementActions.ts
@@ -0,0 +1,57 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../../../../framework/src/flux/action';
+import { Dispatch } from '../../../../framework/src/flux/store';
+
+import { TopologyNode } from '../models/topologyNetconf';
+import { connectService } from '../services/connectService';
+
+/** 
+ * Represents the base action. 
+ */
+export class BaseAction extends Action { }
+
+/** 
+ * Represents an action causing the store to load all element Yang capabilities.
+ */
+export class LoadAllElementInfoAction extends BaseAction { }
+
+/** 
+ * Represents an action causing the store to update element Yang capabilities. 
+ */
+export class AllElementInfoLoadedAction extends BaseAction {
+  /**
+   * Initialize this instance.
+   * @param elementInfo The information of the element which is returned.
+   */
+  constructor(public elementInfo: TopologyNode | null, public error?: string) {
+    super();
+  }
+}
+
+/** 
+ * Represents an asynchronous thunk  action to load all yang capabilities. 
+ */
+export const loadAllInfoElementAsync = (nodeId: string) => (dispatch: Dispatch) => {
+  dispatch(new LoadAllElementInfoAction());
+  connectService.infoNetworkElement(nodeId).then(info => {
+    dispatch(new AllElementInfoLoadedAction(info));
+  }, error => {
+    dispatch(new AllElementInfoLoadedAction(null, error));
+  });
+} 
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/mountedNetworkElementsActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/mountedNetworkElementsActions.ts
index 12f7c8594..84e73ae5a 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/actions/mountedNetworkElementsActions.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/mountedNetworkElementsActions.ts
@@ -15,107 +15,45 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
+
 import { Action } from '../../../../framework/src/flux/action';
 import { Dispatch } from '../../../../framework/src/flux/store';
 
-import { MountedNetworkElementType } from '../models/mountedNetworkElements';
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-
 import { connectService } from '../services/connectService';
+import { NetworkElementConnection } from '../models/networkElementConnection';
 import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
+import { updateCurrentViewAsyncAction } from './commonNetworkElementsActions';
 
 /** Represents the base action. */
 export class BaseAction extends Action { }
 
-/** Represents an action causing the store to load all mounted network elements. */
-export class LoadAllMountedNetworkElementsAction extends BaseAction { }
-
-/** Represents an action causing the store to update all mounted network elements. */
-export class AllMountedNetworkElementsLoadedAction extends BaseAction {
-  constructor(public mountedNetworkElements: MountedNetworkElementType[] | null, public error?: string) {
-    super();
-  }
-}
-
-/** Represents an action causing the store to update all mounted network elements. */
-export class AddOrUpdateMountedNetworkElement extends BaseAction {
-  constructor(public mountedNetworkElement: MountedNetworkElementType | null, public error?: string) {
-    super();
-  }
-}
-
-export class RemoveMountedNetworkElement extends BaseAction {
-  constructor(public mountId: string) {
-    super();
-  }
-}
-
-export class UpdateConnectionStateMountedNetworkElement extends BaseAction {
-  constructor(public mountId: string, connectionState: string) {
-    super();
-  }
-}
-
-
-export class UpdateRequiredMountedNetworkElement extends BaseAction {
-  constructor(public mountId: string, public required: boolean) {
-    super();
-  }
-}
-
-/**
- *  Represents an action crator for a async thunk action to add an allready mounted element to the state of this app.
- *  Note: Use this action to add created object notified by the websocket.
-*/
-export const addMountedNetworkElementAsyncActionCreator = (mountId: string) => async (dispatch: Dispatch) => {
-  return connectService.getMountedNetworkElementByMountId(mountId).then(mountedNetworkElement => {
-    mountedNetworkElement && dispatch(new AddOrUpdateMountedNetworkElement(mountedNetworkElement));
-  }).catch(error => {
-    dispatch(new AddOrUpdateMountedNetworkElement(null, error));
-  });
-};
-
-export const updateMountedNetworkElementAsyncActionCreator = (mountId: string) => async (dispatch: Dispatch) => {
-  return connectService.getMountedNetworkElementByMountId(mountId).then(mountedNetworkElement => {
-    if (mountedNetworkElement) {
-      dispatch(new AddOrUpdateMountedNetworkElement(mountedNetworkElement));
-    } else {
-      dispatch(new RemoveMountedNetworkElement(mountId));
-    }
-  }).catch(error => {
-    dispatch(new AddOrUpdateMountedNetworkElement(null, error));
-  });
-};
-
-/** Represents an async thunk action to load all mounted network elements. */
-export const loadAllMountedNetworkElementsAsync = (dispatch: Dispatch) => {
-  dispatch(new LoadAllMountedNetworkElementsAction());
-  return connectService.getMountedNetworkElementsList().then(mountedNetworkElements => {
-      mountedNetworkElements && dispatch(new AllMountedNetworkElementsLoadedAction(mountedNetworkElements));
-  }).catch(error => {
-    dispatch(new AllMountedNetworkElementsLoadedAction(null, error));
-  });
-};
-
 /** Represents an action crator for a async thunk action to mount a network element. */
-export const mountNetworkElementAsyncActionCreator = (networkElement: RequiredNetworkElementType) => (dispatch: Dispatch) => {
+export const mountNetworkElementAsyncActionCreator = (networkElement: NetworkElementConnection) => (dispatch: Dispatch) => {
   return connectService.mountNetworkElement(networkElement).then((success) => {
-    success && (
-      dispatch(addMountedNetworkElementAsyncActionCreator(networkElement.mountId)) &&
-      dispatch(new AddSnackbarNotification({ message: `Requesting mount [${networkElement.mountId}]`, options: { variant: 'info' } }))
-     ) || dispatch(new AddSnackbarNotification({ message: `Failed to mount [${ networkElement.mountId }]`, options: { variant: 'warning' } }));
+    if (success) {
+      dispatch(updateCurrentViewAsyncAction());
+      dispatch(new AddSnackbarNotification({ message: `Requesting mount [${networkElement.nodeId}]`, options: { variant: 'info' } }))
+    } else {
+      dispatch(new AddSnackbarNotification({ message: `Failed to mount [${networkElement.nodeId}]`, options: { variant: 'warning' } }));
+    }
   }).catch(error => {
-    dispatch(new AddOrUpdateMountedNetworkElement(null, error));
+    dispatch(new AddSnackbarNotification({ message: `Failed to mount [${networkElement.nodeId}]`, options: { variant: 'error' } }));
+    console.error(error);
   });
 };
 
 /** Represents an action crator for a async thunk action to unmount a network element. */
-export const unmountNetworkElementAsyncActionCreator = (mountId: string) => (dispatch: Dispatch) => {
-  return connectService.unmountNetworkElement(mountId).then((success) => {
-    success && dispatch(new AddSnackbarNotification({ message: `Requesting unmount [${ mountId }]`, options: { variant: 'info' } }))
-      || dispatch(new AddSnackbarNotification({ message: `Failed to unmount [${ mountId }]`, options: { variant: 'warning' } }));
+export const unmountNetworkElementAsyncActionCreator = (nodeId: string) => (dispatch: Dispatch) => {
+  return connectService.unmountNetworkElement(nodeId).then((success) => {
+    if (success) {
+      dispatch(updateCurrentViewAsyncAction());
+      dispatch(new AddSnackbarNotification({ message: `Requesting unmount [${nodeId}]`, options: { variant: 'info' } }));
+    } else {
+      dispatch(new AddSnackbarNotification({ message: `Failed to unmount [${nodeId}]`, options: { variant: 'warning' } }));
+    }
   }).catch(error => {
-    dispatch(new AddOrUpdateMountedNetworkElement(null, error));
+    dispatch(new AddSnackbarNotification({ message: `Failed to unmount [${nodeId}]`, options: { variant: 'error' } }));
+    console.error(error);
   });
 };
 
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/networkElementsActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/networkElementsActions.ts
new file mode 100644
index 000000000..1a86f94b1
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/networkElementsActions.ts
@@ -0,0 +1,61 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../../../../framework/src/flux/action';
+import { Dispatch } from '../../../../framework/src/flux/store';
+
+import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
+
+import { NetworkElementConnection, ConnectionStatus, UpdateNetworkElement } from '../models/networkElementConnection';
+import { connectService } from '../services/connectService';
+import { updateCurrentViewAsyncAction } from './commonNetworkElementsActions';
+import { unmountNetworkElementAsyncActionCreator } from './mountedNetworkElementsActions';
+
+/** Represents the base action. */
+export class BaseAction extends Action { }
+
+/** Represents an async thunk action creator to add an element to the network elements. */
+export const addNewNetworkElementAsyncActionCreator = (element: NetworkElementConnection) => async (dispatch: Dispatch) => {
+  const res = await connectService.createNetworkElement({ ...element });
+  dispatch(updateCurrentViewAsyncAction());
+  dispatch(new AddSnackbarNotification({ message: `Successfully added [${element.nodeId}]`, options: { variant: 'success' } }));
+};
+
+/** Represents an async thunk action creator to edit network element. */
+export const editNetworkElementAsyncActionCreator = (element: UpdateNetworkElement) => async (dispatch: Dispatch) => {
+  const connectionStatus: ConnectionStatus[] = await connectService.getNetworkElementConnectionStatus(element.id).then(ne => (ne)) || [];
+  const currentConnectionStatus = connectionStatus[0].status;
+  if (currentConnectionStatus === "Disconnected") {
+    const res = await connectService.deleteNetworkElement(element);
+  }
+  else {
+      const res = await connectService.updateNetworkElement(element);
+  }
+  dispatch(updateCurrentViewAsyncAction());
+  dispatch(new AddSnackbarNotification({ message: `Successfully modified [${element.id}]`, options: { variant: 'success' } }));
+};
+
+
+/** Represents an async thunk action creator to delete an element from network elements. */
+export const removeNetworkElementAsyncActionCreator = (element: UpdateNetworkElement) => async (dispatch: Dispatch) => {
+  const res = await connectService.deleteNetworkElement(element);
+  await dispatch(unmountNetworkElementAsyncActionCreator(element && element.id));
+  dispatch(updateCurrentViewAsyncAction());
+};
+
+
+
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/requiredNetworkElementsActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/requiredNetworkElementsActions.ts
deleted file mode 100644
index 0e55cadf4..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/actions/requiredNetworkElementsActions.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../../../../framework/src/flux/action';
-import { Dispatch } from '../../../../framework/src/flux/store';
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-import { requiredNetworkElementsReloadAction } from '../handlers/requiredNetworkElementsHandler';
-import { UpdateRequiredMountedNetworkElement } from '../actions/mountedNetworkElementsActions';
-
-import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
-
-import { connectService } from '../services/connectService';
-
-/** Represents the base action. */
-export class BaseAction extends Action { }
-
-
-/** Represents an async thunk action creator to add an element to the required network elements. */
-export const addToRequiredNetworkElementsAsyncActionCreator = (element: RequiredNetworkElementType) => (dispatch: Dispatch) => {
-  connectService.insertRequiredNetworkElement(element).then(_ => {
-    window.setTimeout(() => {
-      dispatch(requiredNetworkElementsReloadAction);
-      dispatch(new UpdateRequiredMountedNetworkElement(element.mountId, true));
-      dispatch(new AddSnackbarNotification({ message: `Successfully added [${ element.mountId }]`, options: { variant: 'success' } }));
-    }, 900);
-  });
-};
-
-/** Represents an async thunk action creator to delete an element from the required network elements. */
-export const removeFromRequiredNetworkElementsAsyncActionCreator = (element: RequiredNetworkElementType) => (dispatch: Dispatch) => {
-  connectService.deleteRequiredNetworkElement(element).then(_ => {
-    window.setTimeout(() => {
-      dispatch(requiredNetworkElementsReloadAction);
-      dispatch(new UpdateRequiredMountedNetworkElement(element.mountId, false));
-      dispatch(new AddSnackbarNotification({ message: `Successfully removed [${ element.mountId }]`, options: { variant: 'success' } }));
-    }, 900);
-  });
-};
-
-
-
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/connectionStatusLog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/connectionStatusLog.tsx
index 3cc104836..4e5ca65e1 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/components/connectionStatusLog.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/connectionStatusLog.tsx
@@ -21,32 +21,31 @@ import { IApplicationStoreState } from '../../../../framework/src/store/applicat
 import { MaterialTable, ColumnType, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
 
 import { createConnectionStatusLogActions, createConnectionStatusLogProperties } from '../handlers/connectionStatusLogHandler';
-import { ConnectionStatusLogType } from '../models/connectionStatusLog';
+import { NetworkElementConnectionLog } from '../models/networkElementConnectionLog';
 
 const mapProps = (state: IApplicationStoreState) => ({
   connectionStatusLogProperties: createConnectionStatusLogProperties(state),
 });
 
 const mapDispatch = (dispatcher: IDispatcher) => ({
-    connectionStatusLogActions: createConnectionStatusLogActions(dispatcher.dispatch),
+  connectionStatusLogActions: createConnectionStatusLogActions(dispatcher.dispatch),
 });
-  
-const ConnectionStatusTable = MaterialTable as MaterialTableCtorType<ConnectionStatusLogType>;
+
+const ConnectionStatusTable = MaterialTable as MaterialTableCtorType<NetworkElementConnectionLog>;
 
 type ConnectionStatusLogComponentProps = Connect<typeof mapProps, typeof mapDispatch>;
 
 class ConnectionStatusLogComponent extends React.Component<ConnectionStatusLogComponentProps> {
   render(): JSX.Element {
     return (
-      <ConnectionStatusTable columns={ [
-        { property: "timeStamp", title: "Time", type: ColumnType.text },
-        { property: "objectId", title: "Name", type: ColumnType.text },
-        { property: "elementStatus", title: "Connection status", type: ColumnType.text, disableFilter: true, disableSorting: true },
-      ] } idProperty="_id" { ...this.props.connectionStatusLogActions } {...this.props.connectionStatusLogProperties } >
+      <ConnectionStatusTable tableId="connection-status-table" columns={[
+        { property: "timestamp", title: "Time", type: ColumnType.text },
+        { property: "nodeId", title: "Node Name", type: ColumnType.text },
+        { property: "status", title: "Connection status", type: ColumnType.text },
+      ]} idProperty="id" {...this.props.connectionStatusLogActions} {...this.props.connectionStatusLogProperties} >
       </ConnectionStatusTable>
     );
   };
-
 }
 
 export const ConnectionStatusLog = connect(mapProps, mapDispatch)(ConnectionStatusLogComponent);
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
index 32b23a41e..1e1f11523 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
@@ -24,46 +24,47 @@ import DialogActions from '@material-ui/core/DialogActions';
 import DialogContent from '@material-ui/core/DialogContent';
 import DialogContentText from '@material-ui/core/DialogContentText';
 import DialogTitle from '@material-ui/core/DialogTitle';
+import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
 
 import { IDispatcher, connect, Connect } from '../../../../framework/src/flux/connect';
 
 import {
-  addToRequiredNetworkElementsAsyncActionCreator,
-  removeFromRequiredNetworkElementsAsyncActionCreator
-} from '../actions/requiredNetworkElementsActions';
+  editNetworkElementAsyncActionCreator,
+  addNewNetworkElementAsyncActionCreator,
+  removeNetworkElementAsyncActionCreator
+} from '../actions/networkElementsActions';
 
 import { unmountNetworkElementAsyncActionCreator, mountNetworkElementAsyncActionCreator } from '../actions/mountedNetworkElementsActions';
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
+import { NetworkElementConnection, UpdateNetworkElement } from '../models/networkElementConnection';
+import { removeWebUriAction } from '../actions/commonNetworkElementsActions';
 
 export enum EditNetworkElementDialogMode {
   None = "none",
-  UnknownNetworkElementToRequiredNetworkElements = "unknownNetworkElementToRequiredNetworkElements",
-  RequiredNetworkElementToUnknownNetworkElements = "requiredNetworkElementToUnknownNetworkElements",
-  MountNetworkElementToRequiredNetworkElements = "mountNetworkElementToRequiredNetworkElements",
-  MountNetworkElementToUnknonwNetworkElements = "mountNetworkElementToRequiredUnknownElements",
+  EditNetworkElement = "editNetworkElement",
+  RemoveNetworkElement = "removeNetworkElement",
+  AddNewNetworkElement = "addNewNetworkElement",
   MountNetworkElement = "mountNetworkElement",
   UnmountNetworkElement = "unmountNetworkElement",
 }
 
 const mapDispatch = (dispatcher: IDispatcher) => ({
-  addToRequiredNetworkElements: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(addToRequiredNetworkElementsAsyncActionCreator(element));
+  addNewNetworkElement: async (element: NetworkElementConnection) => {
+    await dispatcher.dispatch(addNewNetworkElementAsyncActionCreator(element));
+    await dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
   },
-  removeFromRequiredNetworkElements: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(removeFromRequiredNetworkElementsAsyncActionCreator(element));
+  mountNetworkElement: (element: NetworkElementConnection) => dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element)),
+  unmountNetworkElement: (element: NetworkElementConnection) => {
+    dispatcher.dispatch(unmountNetworkElementAsyncActionCreator(element && element.nodeId));
   },
-  mountNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
+  editNetworkElement: async (element: UpdateNetworkElement, mountElement: NetworkElementConnection) => {
+    await dispatcher.dispatch(editNetworkElementAsyncActionCreator(element));
+    await dispatcher.dispatch(mountNetworkElementAsyncActionCreator(mountElement));
   },
-  mountAndRquireNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(addToRequiredNetworkElementsAsyncActionCreator(element));
-    dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
-  },
-  unmountNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(unmountNetworkElementAsyncActionCreator(element && element.mountId));
+  removeNetworkElement: (element: UpdateNetworkElement) => {
+    dispatcher.dispatch(removeNetworkElementAsyncActionCreator(element));
+    dispatcher.dispatch(removeWebUriAction(element.id));
   }
-}
-);
+});
 
 type DialogSettings = {
   dialogTitle: string,
@@ -85,37 +86,11 @@ const settings: { [key: string]: DialogSettings } = {
     enableUsernameEditor: false,
     enableExtendedEditor: false,
   },
-  [EditNetworkElementDialogMode.UnknownNetworkElementToRequiredNetworkElements] : {
-    dialogTitle: "Add to required network elements" ,
-    dialogDescription: "Create a new NetworkElement in planning database as clone of existing real NetworkElement." ,
-    applyButtonText: "Add to required network elements" ,
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: false,
-    enableUsernameEditor: true,
-    enableExtendedEditor: false,
-  },
-  [EditNetworkElementDialogMode.RequiredNetworkElementToUnknownNetworkElements]: {
-    dialogTitle: "Remove from required network elements",
-    dialogDescription: "Do you really want to remove the required element:",
-    applyButtonText: "Remove network element",
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: false,
-    enableUsernameEditor: false,
-    enableExtendedEditor: false,
-  },
-  [EditNetworkElementDialogMode.MountNetworkElementToUnknonwNetworkElements]: {
-    dialogTitle: "Mount to unknown network elements",
-    dialogDescription: "Mount this network element:",
-    applyButtonText: "Mount network element",
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: true,
-    enableUsernameEditor: true,
-    enableExtendedEditor: true,
-  },
-  [EditNetworkElementDialogMode.MountNetworkElementToRequiredNetworkElements]: {
-    dialogTitle: "Mount to required network elements",
-    dialogDescription: "Mount this network element:",
-    applyButtonText: "Mount network element",
+
+  [EditNetworkElementDialogMode.AddNewNetworkElement]: {
+    dialogTitle: "Add new network element",
+    dialogDescription: "Add this new network element:",
+    applyButtonText: "Add network element",
     cancelButtonText: "Cancel",
     enableMountIdEditor: true,
     enableUsernameEditor: true,
@@ -139,83 +114,102 @@ const settings: { [key: string]: DialogSettings } = {
     enableUsernameEditor: false,
     enableExtendedEditor: false,
   },
+  [EditNetworkElementDialogMode.EditNetworkElement]: {
+    dialogTitle: "Modify the network elements",
+    dialogDescription: "Modify this network element",
+    applyButtonText: "Modify",
+    cancelButtonText: "Cancel",
+    enableMountIdEditor: false,
+    enableUsernameEditor: true,
+    enableExtendedEditor: false,
+  },
+  [EditNetworkElementDialogMode.RemoveNetworkElement]: {
+    dialogTitle: "Remove network element",
+    dialogDescription: "Do you really want to remove this network element:",
+    applyButtonText: "Remove network element",
+    cancelButtonText: "Cancel",
+    enableMountIdEditor: false,
+    enableUsernameEditor: false,
+    enableExtendedEditor: false,
+  }
 }
 
-type EditNetworkElementDialogComponentProps = Connect<undefined,typeof mapDispatch> & {
+type EditNetworkElementDialogComponentProps = Connect<undefined, typeof mapDispatch> & {
   mode: EditNetworkElementDialogMode;
-  initialNetworkElement: RequiredNetworkElementType;
+  initialNetworkElement: NetworkElementConnection;
   onClose: () => void;
 };
 
-type EditNetworkElementDialogComponentState = RequiredNetworkElementType & {
-  required: boolean;
-};
+type EditNetworkElementDialogComponentState = NetworkElementConnection;
 
 class EditNetworkElementDialogComponent extends React.Component<EditNetworkElementDialogComponentProps, EditNetworkElementDialogComponentState> {
   constructor(props: EditNetworkElementDialogComponentProps) {
     super(props);
 
     this.state = {
-      mountId: this.props.initialNetworkElement.mountId,
+      nodeId: this.props.initialNetworkElement.nodeId,
+      isRequired: false,
       host: this.props.initialNetworkElement.host,
       port: this.props.initialNetworkElement.port,
-      password: this.props.initialNetworkElement.password,
-      username: this.props.initialNetworkElement.username,
-      required: false
     };
   }
 
   render(): JSX.Element {
     const setting = settings[this.props.mode];
     return (
-      <Dialog open={ this.props.mode !== EditNetworkElementDialogMode.None }>
-        <DialogTitle id="form-dialog-title">{ setting.dialogTitle }</DialogTitle>
+      <Dialog open={this.props.mode !== EditNetworkElementDialogMode.None}>
+        <DialogTitle id="form-dialog-title">{setting.dialogTitle}</DialogTitle>
         <DialogContent>
           <DialogContentText>
-            { setting.dialogDescription }
+            {setting.dialogDescription}
           </DialogContentText>
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={ this.state.mountId } onChange={(event)=>{ this.setState({mountId: event.target.value}); } } />
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} margin="dense" id="ipaddress" label="IP address" type="text" fullWidth value={ this.state.host } onChange={(event)=>{ this.setState({host: event.target.value}); } }/>
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} margin="dense" id="netconfport" label="NetConf port" type="number" fullWidth value={ this.state.port.toString() } onChange={(event)=>{ this.setState({port: +event.target.value}); } }/>
-          { setting.enableUsernameEditor && <TextField disabled={ !setting.enableUsernameEditor } spellCheck={ false } margin="dense" id="username" label="Username" type="text" fullWidth value={ this.state.username } onChange={ (event) => { this.setState({ username: event.target.value }); } } /> || null }
-          { setting.enableUsernameEditor && <TextField disabled={ !setting.enableUsernameEditor } spellCheck={ false } margin="dense" id="password" label="Password" type="password" fullWidth value={ this.state.password } onChange={ (event) => { this.setState({ password: event.target.value }); } } /> || null }
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} autoFocus margin="dense" id="name" label="Name" aria-label="name" type="text" fullWidth value={this.state.nodeId} onChange={(event) => { this.setState({ nodeId: event.target.value }); }} />
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} margin="dense" id="ipaddress" label="IP address" aria-label="ip adress" type="text" fullWidth value={this.state.host} onChange={(event) => { this.setState({ host: event.target.value }); }} />
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} margin="dense" id="netconfport" label="NetConf port" aria-label="netconf port" type="number" fullWidth value={this.state.port.toString()} onChange={(event) => { this.setState({ port: +event.target.value }); }} />
+          {setting.enableUsernameEditor && <TextField disabled={!setting.enableUsernameEditor} spellCheck={false} margin="dense" id="username" label="Username" aria-label="username" type="text" fullWidth value={this.state.username} onChange={(event) => { this.setState({ username: event.target.value }); }} /> || null}
+          {setting.enableUsernameEditor && <TextField disabled={!setting.enableUsernameEditor} spellCheck={false} margin="dense" id="password" label="Password" aria-label="password" type="password" fullWidth value={this.state.password} onChange={(event) => { this.setState({ password: event.target.value }); }} /> || null}
+          <FormControl fullWidth disabled={!setting.enableUsernameEditor}>
+            <InputLabel htmlFor="active">Required</InputLabel>
+            <Select value={this.state.isRequired || false} onChange={(event) => {
+              this.setState({ isRequired: event.target.value as any as boolean });
+            }} inputProps={{ name: 'required', id: 'required' }} fullWidth >
+              <MenuItem value={true as any as string} >True</MenuItem>
+              <MenuItem value={false as any as string} >False</MenuItem>
+            </Select>
+          </FormControl>
         </DialogContent>
         <DialogActions>
-          <Button onClick={ (event) => {
+          <Button onClick={(event) => {
             this.onApply({
-              mountId: this.state.mountId,
+              isRequired: this.state.isRequired,
+              id: this.state.nodeId,
+              nodeId: this.state.nodeId,
               host: this.state.host,
               port: this.state.port,
               username: this.state.username,
-              password: this.state.password
+              password: this.state.password,
             });
             event.preventDefault();
             event.stopPropagation();
-          } } > { setting.applyButtonText } </Button>
-          <Button onClick={ (event) => {
+          }} > {setting.applyButtonText} </Button>
+          <Button onClick={(event) => {
             this.onCancel();
             event.preventDefault();
             event.stopPropagation();
-          } } color="secondary"> { setting.cancelButtonText } </Button>
+          }} color="secondary"> {setting.cancelButtonText} </Button>
         </DialogActions>
       </Dialog>
     )
   }
 
-  private onApply = (element: RequiredNetworkElementType) => {
+  private onApply = (element: NetworkElementConnection) => {
     this.props.onClose && this.props.onClose();
+    let updateElement: UpdateNetworkElement = {
+      id: this.state.nodeId
+    }
     switch (this.props.mode) {
-      case EditNetworkElementDialogMode.UnknownNetworkElementToRequiredNetworkElements:
-        element && this.props.addToRequiredNetworkElements(element);
-        break;
-      case EditNetworkElementDialogMode.RequiredNetworkElementToUnknownNetworkElements:
-        element && this.props.removeFromRequiredNetworkElements(element);
-        break;
-      case EditNetworkElementDialogMode.MountNetworkElementToUnknonwNetworkElements:
-        element && this.props.mountNetworkElement(element);
-        break;
-      case EditNetworkElementDialogMode.MountNetworkElementToRequiredNetworkElements:
-        element && this.props.mountAndRquireNetworkElement(element);
+      case EditNetworkElementDialogMode.AddNewNetworkElement:
+        element && this.props.addNewNetworkElement(element);
         break;
       case EditNetworkElementDialogMode.MountNetworkElement:
         element && this.props.mountNetworkElement(element);
@@ -223,6 +217,18 @@ class EditNetworkElementDialogComponent extends React.Component<EditNetworkEleme
       case EditNetworkElementDialogMode.UnmountNetworkElement:
         element && this.props.unmountNetworkElement(element);
         break;
+      case EditNetworkElementDialogMode.EditNetworkElement:
+        if (this.props.initialNetworkElement.isRequired !== this.state.isRequired)
+          updateElement.isRequired = this.state.isRequired;
+        if (this.props.initialNetworkElement.username !== this.state.username)
+          updateElement.username = this.state.username;
+        if (this.props.initialNetworkElement.password !== this.state.password)
+          updateElement.password = this.state.password;
+        element && this.props.editNetworkElement(updateElement, element);
+        break;
+      case EditNetworkElementDialogMode.RemoveNetworkElement:
+        element && this.props.removeNetworkElement(updateElement);
+        break;
     }
   };
 
@@ -230,7 +236,7 @@ class EditNetworkElementDialogComponent extends React.Component<EditNetworkEleme
     this.props.onClose && this.props.onClose();
   }
 
-  static getDerivedStateFromProps(props: EditNetworkElementDialogComponentProps, state: EditNetworkElementDialogComponentState & { _initialNetworkElement: RequiredNetworkElementType }): EditNetworkElementDialogComponentState & { _initialNetworkElement: RequiredNetworkElementType } {
+  static getDerivedStateFromProps(props: EditNetworkElementDialogComponentProps, state: EditNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection }): EditNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection } {
     if (props.initialNetworkElement !== state._initialNetworkElement) {
       state = {
         ...state,
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx
new file mode 100644
index 000000000..ea9d419ec
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx
@@ -0,0 +1,154 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';
+
+import Button from '@material-ui/core/Button';
+import Dialog from '@material-ui/core/Dialog';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogContentText from '@material-ui/core/DialogContentText';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import Table from '@material-ui/core/Table';
+import TableBody from '@material-ui/core/TableBody';
+import TableCell from '@material-ui/core/TableCell';
+import TableHead from '@material-ui/core/TableHead';
+import TableRow from '@material-ui/core/TableRow';
+import { IDispatcher, connect, Connect } from '../../../../framework/src/flux/connect';
+
+import { NetworkElementConnection } from '../models/networkElementConnection';
+import { AvailableCapabilities } from '../models/yangCapabilitiesType'
+
+export enum InfoNetworkElementDialogMode {
+  None = "none",
+  InfoNetworkElement = "infoNetworkElement"
+}
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+});
+
+type DialogSettings = {
+  dialogTitle: string,
+  dialogDescription: string,
+  cancelButtonText: string,
+}
+
+const settings: { [key: string]: DialogSettings } = {
+  [InfoNetworkElementDialogMode.None]: {
+    dialogTitle: "",
+    dialogDescription: "",
+    cancelButtonText: "",
+  },
+  [InfoNetworkElementDialogMode.InfoNetworkElement]: {
+    dialogTitle: "Yang capabilities of the network element",
+    dialogDescription: "Available capabilities of the network element",
+    cancelButtonText: "Cancel",
+  }
+}
+
+type InfoNetworkElementDialogComponentProps = Connect<undefined, typeof mapDispatch> & {
+  mode: InfoNetworkElementDialogMode;
+  initialNetworkElement: NetworkElementConnection;
+  onClose: () => void;
+};
+
+type InfoNetworkElementDialogComponentState = NetworkElementConnection;
+
+class InfoNetworkElementDialogComponent extends React.Component<InfoNetworkElementDialogComponentProps, InfoNetworkElementDialogComponentState> {
+  constructor(props: InfoNetworkElementDialogComponentProps) {
+    super(props);
+
+    this.state = {
+      nodeId: this.props.initialNetworkElement.nodeId,
+      isRequired: false,
+      host: this.props.initialNetworkElement.host,
+      port: this.props.initialNetworkElement.port,
+    };
+  }
+
+  render(): JSX.Element {
+    const setting = settings[this.props.mode];
+    const availableCapabilities = this.props.state.connect.elementInfo.elementInfo["netconf-node-topology:available-capabilities"]["available-capability"];
+    let yangCapabilities: AvailableCapabilities[] = [];
+    
+    availableCapabilities.forEach(value => {
+      const capabilty = value.capability;
+      const indexRevision = capabilty.indexOf("revision=");
+      const indexModule = capabilty.indexOf(")", indexRevision);
+      if (indexRevision > 0 && indexModule > 0) {
+        yangCapabilities.push({
+          module: capabilty.substr(indexModule + 1),
+          revision: capabilty.substr(indexRevision + 9, 10)
+        });
+      }
+    });
+
+    return (
+      <Dialog open={this.props.mode !== InfoNetworkElementDialogMode.None}>
+        <DialogTitle id="form-dialog-title">{setting.dialogTitle}</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            {setting.dialogDescription + " " + this.state.nodeId}
+          </DialogContentText>
+          <Table >
+            <TableHead>
+              <TableRow>
+                <TableCell align="right">S.No</TableCell>
+                <TableCell >Module</TableCell>
+                <TableCell >Revision</TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {yangCapabilities.map((yang, index) => (
+                <TableRow>
+                  <TableCell>{index + 1}</TableCell>
+                  <TableCell>{yang.module}</TableCell>
+                  <TableCell>{yang.revision}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={(event) => {
+            this.onCancel();
+            event.preventDefault();
+            event.stopPropagation();
+          }} color="secondary"> {setting.cancelButtonText} </Button>
+        </DialogActions>
+      </Dialog>
+    )
+  }
+
+  private onCancel = () => {
+    this.props.onClose();
+  }
+
+  static getDerivedStateFromProps(props: InfoNetworkElementDialogComponentProps, state: InfoNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection }): InfoNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection } {
+    if (props.initialNetworkElement !== state._initialNetworkElement) {
+      state = {
+        ...state,
+        ...props.initialNetworkElement,
+        _initialNetworkElement: props.initialNetworkElement,
+      };
+    }
+    return state;
+  }
+}
+
+export const InfoNetworkElementDialog = connect(undefined, mapDispatch)(InfoNetworkElementDialogComponent);
+export default InfoNetworkElementDialog;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/networkElements.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/networkElements.tsx
new file mode 100644
index 000000000..0f4b0e8ff
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/networkElements.tsx
@@ -0,0 +1,259 @@
+/**
+* ============LICENSE_START========================================================================
+* ONAP : ccsdk feature sdnr wt odlux
+* =================================================================================================
+* Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';
+import { Theme, createStyles, withStyles, WithStyles } from '@material-ui/core/styles';
+
+import AddIcon from '@material-ui/icons/Add';
+import LinkIcon from '@material-ui/icons/Link';
+import LinkOffIcon from '@material-ui/icons/LinkOff';
+import RemoveIcon from '@material-ui/icons/RemoveCircleOutline';
+import EditIcon from '@material-ui/icons/Edit';
+import Info from '@material-ui/icons/Info';
+import ComputerIcon from '@material-ui/icons/Computer';
+
+import Button from '@material-ui/core/Button';
+import IconButton from '@material-ui/core/IconButton';
+import Tooltip from '@material-ui/core/Tooltip';
+
+import { MaterialTable, ColumnType, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
+import { connect, Connect, IDispatcher } from '../../../../framework/src/flux/connect';
+import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
+
+import { createNetworkElementsActions, createNetworkElementsProperties } from '../handlers/networkElementsHandler';
+
+import { NetworkElementConnection } from '../models/networkElementConnection';
+import EditNetworkElementDialog, { EditNetworkElementDialogMode } from './editNetworkElementDialog';
+
+import InfoNetworkElementDialog, { InfoNetworkElementDialogMode } from './infoNetworkElementDialog';
+import { loadAllInfoElementAsync } from '../actions/infoNetworkElementActions';
+import { TopologyNode } from '../models/topologyNetconf';
+
+const styles = (theme: Theme) => createStyles({
+  connectionStatusConnected: {
+    color: 'darkgreen',
+  },
+  connectionStatusConnecting: {
+    color: 'blue',
+  },
+  connectionStatusDisconnected: {
+    color: 'red',
+  },
+  button: {
+    margin: 0,
+    padding: "6px 6px",
+    minWidth: 'unset'
+  },
+  spacer: {
+    marginLeft: theme.spacing(1),
+    marginRight: theme.spacing(1),
+    display: "inline"
+  }
+});
+
+const mapProps = (state: IApplicationStoreState) => ({
+  networkElementsProperties: createNetworkElementsProperties(state),
+});
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+  networkElementsActions: createNetworkElementsActions(dispatcher.dispatch),
+  navigateToApplication: (applicationName: string, path?: string) => dispatcher.dispatch(new NavigateToApplication(applicationName, path)),
+  networkElementInfo: async (nodeId: string) => await dispatcher.dispatch(loadAllInfoElementAsync(nodeId)),
+});
+
+type NetworkElementsListComponentProps = WithStyles<typeof styles> & Connect<typeof mapProps, typeof mapDispatch>;
+type NetworkElementsListComponentState = {
+  networkElementToEdit: NetworkElementConnection,
+  networkElementEditorMode: EditNetworkElementDialogMode,
+  infoNetworkElementEditorMode: InfoNetworkElementDialogMode,
+  elementInfo: TopologyNode | null
+}
+
+const emptyRequireNetworkElement: NetworkElementConnection = { id: "", nodeId: "", host: "", port: 0, status: "Disconnected", isRequired: false };
+
+const NetworkElementTable = MaterialTable as MaterialTableCtorType<NetworkElementConnection>;
+
+export class NetworkElementsListComponent extends React.Component<NetworkElementsListComponentProps, NetworkElementsListComponentState> {
+
+  constructor(props: NetworkElementsListComponentProps) {
+    super(props);
+
+    this.state = {
+      networkElementToEdit: emptyRequireNetworkElement,
+      networkElementEditorMode: EditNetworkElementDialogMode.None,
+      elementInfo: null,
+      infoNetworkElementEditorMode: InfoNetworkElementDialogMode.None
+    };
+  }
+
+  //  private navigationCreator
+
+  render(): JSX.Element {
+    const { classes } = this.props;
+    const { networkElementToEdit } = this.state;
+    const addRequireNetworkElementAction = {
+      icon: AddIcon, tooltip: 'Add', onClick: () => {
+        this.setState({
+          networkElementEditorMode: EditNetworkElementDialogMode.AddNewNetworkElement,
+          networkElementToEdit: emptyRequireNetworkElement,
+        });
+      }
+    };
+    let counter = 0;
+    return (
+      <>
+        <NetworkElementTable tableId="network-element-table" customActionButtons={[addRequireNetworkElementAction]} columns={[
+          { property: "nodeId", title: "Node Name", type: ColumnType.text },
+          { property: "isRequired", title: "Required", type: ColumnType.boolean },
+          { property: "status", title: "Connection Status", type: ColumnType.text },
+          { property: "host", title: "Host", type: ColumnType.text },
+          { property: "port", title: "Port", type: ColumnType.numeric },
+          { property: "coreModelCapability", title: "Core Model", type: ColumnType.text },
+          { property: "deviceType", title: "Type", type: ColumnType.text },
+          {
+            property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => {
+              counter++;
+              return (
+                <>
+                  <div className={classes.spacer}>
+                    {
+                      rowData.webUri && <Tooltip title={"Web Client"} ><IconButton aria-label={"web-client-button-" + counter} className={classes.button} onClick={event => { console.log(rowData); window.open(rowData.webUri, "_blank") }}><ComputerIcon /></IconButton></Tooltip>
+                    }
+                    <Tooltip title={"Mount"} >
+                      <IconButton aria-label={"mount-button-" + counter} className={classes.button} onClick={event => this.onOpenMountdNetworkElementsDialog(event, rowData)} >
+                        <LinkIcon /></IconButton>
+                    </Tooltip>
+                    <Tooltip title={"Unmount"} >
+                      <IconButton aria-label={"unmount-button-" + counter} className={classes.button} onClick={event => this.onOpenUnmountdNetworkElementsDialog(event, rowData)} >
+                        <LinkOffIcon /></IconButton>
+                    </Tooltip>
+                    <Tooltip title={"Info"} ><IconButton aria-label={"info-button-" + counter} className={classes.button} onClick={event => this.onOpenInfoNetworkElementDialog(event, rowData)} disabled={rowData.status === "Connecting" || rowData.status === "Disconnected"} >
+                      <Info /></IconButton>
+                    </Tooltip>
+                    <Tooltip title={"Edit"} ><IconButton aria-label={"edit-button-" + counter} className={classes.button} onClick={event => this.onOpenEditNetworkElementDialog(event, rowData)} ><EditIcon /></IconButton></Tooltip>
+                    <Tooltip title={"Remove"} ><IconButton aria-label={"remove-button-" + counter} className={classes.button} onClick={event => this.onOpenRemoveNetworkElementDialog(event, rowData)} ><RemoveIcon /></IconButton></Tooltip>
+                  </div>
+                  <div className={classes.spacer}>
+                    <Tooltip title={"Inventory"} ><Button aria-label={"inventory-button-" + counter} className={classes.button} onClick={this.navigateToApplicationHandlerCreator("inventory", rowData)} >I</Button></Tooltip>
+                  </div>
+                  <div className={classes.spacer}>
+                    <Tooltip title={"Fault"} ><Button aria-label={"fault-button-" + counter} className={classes.button} onClick={this.navigateToApplicationHandlerCreator("fault", rowData)} >F</Button></Tooltip>
+                    <Tooltip title={"Configure"} ><Button aria-label={"configure-button-" + counter} className={classes.button} onClick={this.navigateToApplicationHandlerCreator("configuration", rowData)} >C</Button></Tooltip>
+                    <Tooltip title={"Accounting "} ><Button className={classes.button} onClick={this.navigateToApplicationHandlerCreator("accounting", rowData)} disabled={true} >A</Button></Tooltip>
+                    <Tooltip title={"Performance"} ><Button aria-label={"performance-button-" + counter} className={classes.button} onClick={this.navigateToApplicationHandlerCreator("performanceHistory", rowData)}>P</Button></Tooltip>
+                    <Tooltip title={"Security"} ><Button className={classes.button} onClick={this.navigateToApplicationHandlerCreator("security", rowData)} disabled={true} >S</Button></Tooltip>
+                  </div>
+                </>
+              )
+            }
+          },
+        ]} idProperty="id" {...this.props.networkElementsActions} {...this.props.networkElementsProperties} asynchronus >
+        </NetworkElementTable>
+        <EditNetworkElementDialog
+          initialNetworkElement={networkElementToEdit}
+          mode={this.state.networkElementEditorMode}
+          onClose={this.onCloseEditNetworkElementDialog}
+        />
+        <InfoNetworkElementDialog
+          initialNetworkElement={networkElementToEdit}
+          mode={this.state.infoNetworkElementEditorMode}
+          onClose={this.onCloseInfoNetworkElementDialog}
+        />
+      </>
+    );
+  };
+
+  public componentDidMount() {
+    this.props.networkElementsActions.onRefresh();
+  }
+
+  private onOpenRemoveNetworkElementDialog = (event: React.MouseEvent<HTMLElement>, element: NetworkElementConnection) => {
+    this.setState({
+      networkElementToEdit: element,
+      networkElementEditorMode: EditNetworkElementDialogMode.RemoveNetworkElement
+    });
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  private onOpenEditNetworkElementDialog = (event: React.MouseEvent<HTMLElement>, element: NetworkElementConnection) => {
+    this.setState({
+      networkElementToEdit: {
+        nodeId: element.nodeId,
+        isRequired: element.isRequired,
+        host: element.host,
+        port: element.port,
+        username: element.username,
+        password: element.password,
+      },
+      networkElementEditorMode: EditNetworkElementDialogMode.EditNetworkElement
+    });
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  private onOpenUnmountdNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: NetworkElementConnection) => {
+    this.setState({
+      networkElementToEdit: element,
+      networkElementEditorMode: EditNetworkElementDialogMode.UnmountNetworkElement
+    });
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  private onOpenMountdNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: NetworkElementConnection) => {
+    this.setState({
+      networkElementToEdit: element,
+      networkElementEditorMode: EditNetworkElementDialogMode.MountNetworkElement
+    });
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  private onOpenInfoNetworkElementDialog = (event: React.MouseEvent<HTMLElement>, element: NetworkElementConnection) => {
+    this.props.networkElementInfo(element.nodeId);
+    this.setState({
+      networkElementToEdit: element,
+      infoNetworkElementEditorMode: InfoNetworkElementDialogMode.InfoNetworkElement,
+    });
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  private onCloseEditNetworkElementDialog = () => {
+    this.setState({
+      networkElementEditorMode: EditNetworkElementDialogMode.None,
+      networkElementToEdit: emptyRequireNetworkElement,
+    });
+  }
+  private onCloseInfoNetworkElementDialog = () => {
+    this.setState({
+      infoNetworkElementEditorMode: InfoNetworkElementDialogMode.None,
+      networkElementToEdit: emptyRequireNetworkElement,
+    });
+  }
+
+  private navigateToApplicationHandlerCreator = (applicationName: string, element: NetworkElementConnection) => (event: React.MouseEvent<HTMLElement>) => {
+    this.props.navigateToApplication(applicationName, element.nodeId);
+    event.preventDefault();
+    event.stopPropagation();
+  }
+}
+
+export const NetworkElementsList = withStyles(styles)(connect(mapProps, mapDispatch)(NetworkElementsListComponent));
+export default NetworkElementsList;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/requiredNetworkElements.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/requiredNetworkElements.tsx
deleted file mode 100644
index 2fb7594aa..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/components/requiredNetworkElements.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';
-import { Theme, createStyles, withStyles, WithStyles } from '@material-ui/core/styles';
-
-import AddIcon from '@material-ui/icons/Add';
-import LinkIcon from '@material-ui/icons/Link';
-import LinkOffIcon from '@material-ui/icons/LinkOff';
-import RemoveIcon from '@material-ui/icons/RemoveCircleOutline';
-
-import Button from '@material-ui/core/Button';
-import IconButton from '@material-ui/core/IconButton';
-
-import { MaterialTable, ColumnType, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
-import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
-import { connect, Connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
-
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-import { createRequiredNetworkElementsActions, createRequiredNetworkElementsProperties } from '../handlers/requiredNetworkElementsHandler';
-
-import EditNetworkElementDialog, { EditNetworkElementDialogMode } from './editNetworkElementDialog';
-import { Tooltip } from '@material-ui/core';
-import { NetworkElementBaseType } from 'models/networkElementBase';
-
-const styles = (theme: Theme) => createStyles({
-  connectionStatusConnected: {
-    color: 'darkgreen',
-  },
-  connectionStatusConnecting: {
-    color: 'blue',
-  },
-  connectionStatusDisconnected: {
-    color: 'red',
-  },
-  button: {
-    margin: 0,
-    padding: "6px 6px",
-    minWidth: 'unset'
-  },
-  spacer: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit,
-    display: "inline"
-  }
-});
-
-const mapProps = (state: IApplicationStoreState) => ({
-  requiredNetworkElementsProperties: createRequiredNetworkElementsProperties(state),
-  mountedNetworkElements: state.connect.mountedNetworkElements
-});
-
-const mapDispatch = (dispatcher: IDispatcher) => ({
-  requiredNetworkElementsActions: createRequiredNetworkElementsActions(dispatcher.dispatch),
-  navigateToApplication: (applicationName: string, path?: string) => dispatcher.dispatch(new NavigateToApplication(applicationName, path)),
-});
-
-type RequiredNetworkElementsListComponentProps = WithStyles<typeof styles> & Connect<typeof mapProps, typeof mapDispatch>;
-type RequiredNetworkElementsListComponentState = {
-  networkElementToEdit: RequiredNetworkElementType,
-  networkElementEditorMode: EditNetworkElementDialogMode
-}
-
-const emptyRequireNetworkElement = { mountId: '', host: '', port: 0 };
-
-const RequiredNetworkElementTable = MaterialTable as MaterialTableCtorType<RequiredNetworkElementType>;
-
-export class RequiredNetworkElementsListComponent extends React.Component<RequiredNetworkElementsListComponentProps, RequiredNetworkElementsListComponentState> {
-
-  constructor(props: RequiredNetworkElementsListComponentProps) {
-    super(props);
-
-    this.state = {
-      networkElementToEdit: emptyRequireNetworkElement,
-      networkElementEditorMode: EditNetworkElementDialogMode.None
-    };
-  }
-
-  //  private navigationCreator
-
-  render(): JSX.Element {
-    const { classes } = this.props;
-    const { networkElementToEdit } = this.state;
-    const addRequireNetworkElementAction = {
-      icon: AddIcon, tooltip: 'Add', onClick: () => {
-        this.setState({
-          networkElementEditorMode: EditNetworkElementDialogMode.MountNetworkElementToRequiredNetworkElements,
-          networkElementToEdit: emptyRequireNetworkElement,
-        });
-      }
-    };
-    return (
-      <>
-        <RequiredNetworkElementTable customActionButtons={ [addRequireNetworkElementAction] } columns={ [
-          { property: "mountId", title: "Name", type: ColumnType.text },
-          {
-            property: "connectionStatus", title: "Connection Status", type: ColumnType.custom, disableFilter: true, disableSorting: true, customControl: ({ rowData }) => {
-              const unknownNetworkElement = this.props.mountedNetworkElements.elements.find(el => el.mountId === rowData.mountId);
-              const connectionStatus = unknownNetworkElement && unknownNetworkElement.connectionStatus || 'disconnected';
-              const cssClasses = connectionStatus === "connected"
-                ? classes.connectionStatusConnected
-                : connectionStatus === "disconnected"
-                  ? classes.connectionStatusDisconnected
-                  : classes.connectionStatusConnecting
-              return <div className={ cssClasses } >{ connectionStatus } </div>
-
-            }
-          },
-          { property: "host", title: "Host", type: ColumnType.text },
-          { property: "port", title: "Port", type: ColumnType.text },
-          // { property: "username", title: "Username", type: ColumnType.text },
-          // { property: "password", title: "Password", type: ColumnType.text },
-          {
-            property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => {
-              const unknownNetworkElement = this.props.mountedNetworkElements.elements.find(el => el.mountId === rowData.mountId);
-              const connectionStatus = unknownNetworkElement && unknownNetworkElement.connectionStatus || 'disconnected';
-              return (
-                <>
-                  <div className={ classes.spacer }>
-                    <Tooltip title={ "Mount" } ><IconButton className={ classes.button } onClick={ event => this.onOpenMountdNetworkElementsDialog(event, rowData) }><LinkIcon /></IconButton></Tooltip>
-                    <Tooltip title={ "Unmount" } ><IconButton className={ classes.button } onClick={ event => this.onOpenUnmountdNetworkElementsDialog(event, rowData) }><LinkOffIcon /></IconButton></Tooltip>
-                    <Tooltip title={ "Remove" } ><IconButton className={ classes.button } onClick={ event => this.onOpenRemoveRequiredNetworkElementDialog(event, rowData) } ><RemoveIcon /></IconButton></Tooltip>
-                  </div>
-                  <div className={ classes.spacer }>
-                    <Tooltip title={ "Info" } ><Button className={ classes.button } >I</Button></Tooltip>
-                  </div>
-                  <div className={ classes.spacer }>
-                    <Tooltip title={ "Fault" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("fault", rowData) } >F</Button></Tooltip>
-                    <Tooltip title={"Configure"} ><Button className={classes.button} onClick={this.navigateToApplicationHandlerCreator("configuration", rowData)} >C</Button></Tooltip>
-                    <Tooltip title={ "Accounting " } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("accounting", rowData) }>A</Button></Tooltip>
-                    <Tooltip title={ "Performance" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("performance", rowData) }>P</Button></Tooltip>
-                    <Tooltip title={ "Security" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("security", rowData) }>S</Button></Tooltip>
-                  </div>
-                </>
-              )
-            }
-          },
-        ] } idProperty="mountId" { ...this.props.requiredNetworkElementsActions } { ...this.props.requiredNetworkElementsProperties } asynchronus >
-        </RequiredNetworkElementTable>
-        <EditNetworkElementDialog
-          initialNetworkElement={ networkElementToEdit }
-          mode={ this.state.networkElementEditorMode }
-          onClose={ this.onCloseEditNetworkElementDialog }
-        />
-      </>
-    );
-  };
-
-  public componentDidMount() {
-    this.props.requiredNetworkElementsActions.onRefresh();
-  }
-
-  private onOpenRemoveRequiredNetworkElementDialog = (event: React.MouseEvent<HTMLElement>, element: RequiredNetworkElementType) => {
-    this.setState({
-      networkElementToEdit: element,
-      networkElementEditorMode: EditNetworkElementDialogMode.RequiredNetworkElementToUnknownNetworkElements
-    });
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private onOpenUnmountdNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: RequiredNetworkElementType) => {
-    this.setState({
-      networkElementToEdit: element,
-      networkElementEditorMode: EditNetworkElementDialogMode.UnmountNetworkElement
-    });
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private onOpenMountdNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: RequiredNetworkElementType) => {
-    this.setState({
-      networkElementToEdit: element,
-      networkElementEditorMode: EditNetworkElementDialogMode.MountNetworkElement
-    });
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private onCloseEditNetworkElementDialog = () => {
-    this.setState({
-      networkElementEditorMode: EditNetworkElementDialogMode.None,
-      networkElementToEdit: emptyRequireNetworkElement,
-    });
-  }
-
-  private navigateToApplicationHandlerCreator = (applicationName: string, element: NetworkElementBaseType) => (event: React.MouseEvent<HTMLElement>) => {
-    this.props.navigateToApplication(applicationName, element.mountId);
-    event.preventDefault();
-    event.stopPropagation();
-  }
-}
-
-export const RequiredNetworkElementsList = withStyles(styles)(connect(mapProps, mapDispatch)(RequiredNetworkElementsListComponent));
-export default RequiredNetworkElementsList;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/unknownNetworkElements.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/unknownNetworkElements.tsx
deleted file mode 100644
index 62b969575..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/components/unknownNetworkElements.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';
-import { Theme, createStyles, WithStyles, withStyles, Tooltip } from '@material-ui/core';
-
-import AddIcon from '@material-ui/icons/Add';
-import LinkOffIcon from '@material-ui/icons/LinkOff';
-import AddCircleIcon from '@material-ui/icons/AddCircleOutline';
-
-import Button from '@material-ui/core/Button';
-import IconButton from '@material-ui/core/IconButton';
-
-import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
-import { MaterialTable, ColumnType, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
-import { Connect, connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
-
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-import { IMountedNetworkElementsState } from '../handlers/mountedNetworkElementsHandler';
-import EditNetworkElementDialog, { EditNetworkElementDialogMode } from './editNetworkElementDialog';
-import { NetworkElementBaseType } from 'models/networkElementBase';
-
-
-const styles = (theme: Theme) => createStyles({
-  button: {
-    margin: 0,
-    padding: "6px 6px",
-    minWidth: 'unset'
-  },
-  spacer: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit,
-    display: "inline"
-  }
-});
-
-const mapProps = ({ connect: state }: IApplicationStoreState) => ({
-  mountedNetworkElements: state.mountedNetworkElements
-});
-
-const mapDispatch = (dispatcher: IDispatcher) => ({
-  navigateToApplication: (applicationName: string, path?: string) => dispatcher.dispatch(new NavigateToApplication(applicationName, path)),
-});
-type UnknownNetworkElementDisplayType = NetworkElementBaseType & {
-  connectionStatus: string,
-  coreModelRev: string,
-  airInterfaceRev: string
-}
-
-type UnknownNetworkElementsListProps = WithStyles<typeof styles> & Connect<typeof mapProps, typeof mapDispatch> & {}
-
-type UnknownNetworkElementsListState = {
-
-  unknownNetworkElements: UnknownNetworkElementDisplayType[];
-
-  networkElementToEdit: RequiredNetworkElementType;
-  networkElementEditorMode: EditNetworkElementDialogMode;
-}
-
-
-const emptyRequireNetworkElement = { mountId: '', host: '', port: 0 };
-const UnknownNetworkElementTable = MaterialTable as MaterialTableCtorType<UnknownNetworkElementDisplayType>;
-export class UnknownNetworkElementsListComponent extends React.Component<UnknownNetworkElementsListProps, UnknownNetworkElementsListState> {
-
-  constructor(props: UnknownNetworkElementsListProps) {
-    super(props);
-
-    this.state = {
-      unknownNetworkElements: [],
-      networkElementToEdit: emptyRequireNetworkElement,
-      networkElementEditorMode: EditNetworkElementDialogMode.None,
-    };
-  }
-
-  static getDerivedStateFromProps(props: UnknownNetworkElementsListProps, state: UnknownNetworkElementsListState & { _mountedNetworkElements: IMountedNetworkElementsState }) {
-    if (props.mountedNetworkElements != state._mountedNetworkElements) {
-      state.unknownNetworkElements = props.mountedNetworkElements.elements.filter(element => !element.required).map(element => {
-
-        // handle onfCoreModelRevision
-        const onfCoreModelRevision = element.capabilities.find((cap) => {
-          return cap.module === 'core-model' || cap.module === 'CoreModel-CoreNetworkModule-ObjectClasses' ;
-        });
-        const onfAirInterfaceRevision = element.capabilities.find((cap) => {
-          return cap.module === 'microwave-model' || cap.module === 'MicrowaveModel-ObjectClasses-AirInterface' ;
-        });
-        return {
-          mountId: element.mountId,
-          host: element.host,
-          port: element.port,
-          connectionStatus: element.connectionStatus,
-          coreModelRev: onfCoreModelRevision && onfCoreModelRevision.revision || 'unknown',
-          airInterfaceRev: onfAirInterfaceRevision && onfAirInterfaceRevision.revision || 'unknown'
-        }
-      }
-      );
-    }
-    return state;
-  }
-
-  render(): JSX.Element {
-    const { classes } = this.props;
-    const { networkElementToEdit, networkElementEditorMode, unknownNetworkElements } = this.state;
-    const addRequireNetworkElementAction = {
-      icon: AddIcon, tooltip: 'Add', onClick: () => {
-        this.setState({
-          networkElementEditorMode: EditNetworkElementDialogMode.MountNetworkElementToUnknonwNetworkElements,
-          networkElementToEdit: emptyRequireNetworkElement,
-        });
-      }
-    };
-    return (
-      <>
-        <UnknownNetworkElementTable customActionButtons={ [addRequireNetworkElementAction] } asynchronus rows={ unknownNetworkElements } columns={ [
-          { property: "mountId", title: "Name", type: ColumnType.text },
-          { property: "connectionStatus", title: "Connection Status", type: ColumnType.text },
-          { property: "host", title: "Host", type: ColumnType.text },
-          { property: "port", title: "Port", type: ColumnType.text },
-          { property: "coreModelRev", title: "Core Model", type: ColumnType.text },
-          { property: "airInterfaceRev", title: "Air interface", type: ColumnType.text },
-          {
-            property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => (
-              <>
-                <div className={ classes.spacer }>
-                  <Tooltip title={ "Unmount" } ><IconButton className={ classes.button } onClick={ event => this.onOpenUnmountdNetworkElementsDialog(event, rowData) } ><LinkOffIcon /></IconButton></Tooltip>
-                  <Tooltip title={ "Add to required" } ><IconButton className={ classes.button } onClick={ event => this.onOpenAddToRequiredNetworkElementsDialog(event, rowData) } ><AddCircleIcon /></IconButton></Tooltip>
-                </div>
-                <div className={ classes.spacer }>
-                  <Tooltip title={ "Info" } ><Button className={ classes.button } >I</Button></Tooltip>
-                </div>
-                  <div className={ classes.spacer }>
-                    <Tooltip title={ "Fault" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("fault", rowData) } >F</Button></Tooltip>
-                    <Tooltip title={ "Configure" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("configuration", rowData) } >C</Button></Tooltip>
-                    <Tooltip title={ "Accounting " } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("accounting", rowData) }>A</Button></Tooltip>
-                    <Tooltip title={ "Performance" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("performance", rowData) }>P</Button></Tooltip>
-                    <Tooltip title={ "Security" } ><Button className={ classes.button } onClick={ this.navigateToApplicationHandlerCreator("security", rowData) }>S</Button></Tooltip>
-                  </div>
-              </>
-            )
-          },
-        ] } idProperty="mountId" >
-        </UnknownNetworkElementTable>
-
-        <EditNetworkElementDialog
-          mode={ networkElementEditorMode }
-          initialNetworkElement={ networkElementToEdit }
-          onClose={ this.onCloseEditNetworkElementDialog }
-        />
-      </>
-    );
-  };
-
-  private onOpenAddToRequiredNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: UnknownNetworkElementDisplayType) => {
-    this.setState({
-      networkElementToEdit: {
-        mountId: element.mountId,
-        host: element.host,
-        port: element.port,
-        username: 'admin',
-        password: 'admin',
-      },
-      networkElementEditorMode: EditNetworkElementDialogMode.UnknownNetworkElementToRequiredNetworkElements
-    });
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private onOpenUnmountdNetworkElementsDialog = (event: React.MouseEvent<HTMLElement>, element: UnknownNetworkElementDisplayType) => {
-    this.setState({
-      networkElementToEdit: {
-        mountId: element.mountId,
-        host: element.host,
-        port: element.port
-      },
-      networkElementEditorMode: EditNetworkElementDialogMode.UnmountNetworkElement
-    });
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private onCloseEditNetworkElementDialog = () => {
-    this.setState({
-      networkElementEditorMode: EditNetworkElementDialogMode.None,
-      networkElementToEdit: emptyRequireNetworkElement,
-    });
-  }
-
-  private navigateToApplicationHandlerCreator = (applicationName: string, element: NetworkElementBaseType) => (event: React.MouseEvent<HTMLElement>) => {
-    this.props.navigateToApplication(applicationName, element.mountId);
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-}
-
-export const UnknownNetworkElementsList = withStyles(styles)(connect(mapProps, mapDispatch)(UnknownNetworkElementsListComponent));
-export default UnknownNetworkElementsList;
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts
new file mode 100644
index 000000000..1440599fd
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts
@@ -0,0 +1,83 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { IActionHandler } from '../../../../framework/src/flux/action';
+import { combineActionHandler } from '../../../../framework/src/flux/middleware';
+import { INetworkElementsState, networkElementsActionHandler } from './networkElementsHandler';
+import { IConnectionStatusLogState, connectionStatusLogActionHandler } from './connectionStatusLogHandler';
+import { IInfoNetworkElementsState, infoNetworkElementsActionHandler } from './infoNetworkElementHandler';
+import { SetPanelAction, AddWebUriList, RemoveWebUri } from '../actions/commonNetworkElementsActions';
+import { PanelId } from '../models/panelId';
+import { guiCutThrough } from '../models/guiCutTrough';
+
+export interface IConnectAppStoreState {
+  networkElements: INetworkElementsState;
+  connectionStatusLog: IConnectionStatusLogState;
+  currentOpenPanel: PanelId;
+  elementInfo: IInfoNetworkElementsState;
+  guiCutThrough: guiCutThroughState;
+}
+
+const currentOpenPanelHandler: IActionHandler<PanelId> = (state = null, action) => {
+  if (action instanceof SetPanelAction) {
+    state = action.panelId;
+  }
+  return state;
+}
+
+interface guiCutThroughState {
+  availableWebUris: guiCutThrough[];
+  knownElements: string[];
+}
+
+const guiCutThroughHandler: IActionHandler<guiCutThroughState> = (state = { availableWebUris: [], knownElements: [] }, action) => {
+  if (action instanceof AddWebUriList) {
+    let knownElements: string[];
+    let availableWebUris: guiCutThrough[];
+
+    knownElements = state.knownElements.concat(action.knownElements);
+
+    availableWebUris = state.availableWebUris.concat(action.element);
+
+    state = { availableWebUris: availableWebUris, knownElements: knownElements }
+
+  } else if (action instanceof RemoveWebUri) {
+    const nodeId = action.element;
+    const webUris = state.availableWebUris.filter(item => item.nodeId !== nodeId);
+    const knownElements = state.knownElements.filter(item => item !== nodeId);
+    state = { knownElements: knownElements, availableWebUris: webUris };
+  }
+  return state;
+}
+
+declare module '../../../../framework/src/store/applicationStore' {
+  interface IApplicationStoreState {
+    connect: IConnectAppStoreState
+  }
+}
+
+const actionHandlers = {
+  networkElements: networkElementsActionHandler,
+  connectionStatusLog: connectionStatusLogActionHandler,
+  currentOpenPanel: currentOpenPanelHandler,
+  elementInfo: infoNetworkElementsActionHandler,
+  guiCutThrough: guiCutThroughHandler
+};
+
+export const connectAppRootHandler = combineActionHandler<IConnectAppStoreState>(actionHandlers);
+export default connectAppRootHandler;
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.tsx b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.tsx
deleted file mode 100644
index 1c27f4b32..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { combineActionHandler } from '../../../../framework/src/flux/middleware';
-import { IRequiredNetworkElementsState, requiredNetworkElementsActionHandler  } from './requiredNetworkElementsHandler';
-import { IMountedNetworkElementsState, mountedNetworkElementsActionHandler } from './mountedNetworkElementsHandler';
-import { IConnectionStatusLogState, connectionStatusLogActionHandler } from './connectionStatusLogHandler';
-
-export interface IConnectAppStoreState {
-  requiredNetworkElements: IRequiredNetworkElementsState;
-  mountedNetworkElements: IMountedNetworkElementsState;
-  connectionStatusLog: IConnectionStatusLogState;
-}
-
-declare module '../../../../framework/src/store/applicationStore' {
-  interface IApplicationStoreState {
-    connect: IConnectAppStoreState
-  }
-}
-
-const actionHandlers = {
-  requiredNetworkElements: requiredNetworkElementsActionHandler,
-  mountedNetworkElements: mountedNetworkElementsActionHandler,
-  connectionStatusLog: connectionStatusLogActionHandler
-};
-
-export const connectAppRootHandler = combineActionHandler <IConnectAppStoreState>(actionHandlers);
-export default connectAppRootHandler;
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/requiredNetworkElementsHandler.tsx b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusLogHandler.ts
index 10b3b1b07..6863ec33b 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/requiredNetworkElementsHandler.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusLogHandler.ts
@@ -18,18 +18,18 @@
 import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-export interface IRequiredNetworkElementsState extends IExternalTableState<RequiredNetworkElementType> { }
+import { NetworkElementConnectionLog } from '../models/networkElementConnectionLog';
+export interface IConnectionStatusLogState extends IExternalTableState<NetworkElementConnectionLog> { }
 
 // create eleactic search material data fetch handler
-const requiredNetworkElementsSearchHandler = createSearchDataHandler<RequiredNetworkElementType>('mwtn/required-networkelement');
+const connectionStatusLogSearchHandler = createSearchDataHandler<NetworkElementConnectionLog>('connectionlog');
 
 export const {
-  actionHandler: requiredNetworkElementsActionHandler,
-  createActions: createRequiredNetworkElementsActions,
-  createProperties: createRequiredNetworkElementsProperties,
-  reloadAction: requiredNetworkElementsReloadAction,
+  actionHandler: connectionStatusLogActionHandler,
+  createActions: createConnectionStatusLogActions,
+  createProperties: createConnectionStatusLogProperties,
+  reloadAction: connectionStatusLogReloadAction,
 
   // set value action, to change a value
-} = createExternal<RequiredNetworkElementType>(requiredNetworkElementsSearchHandler, appState => appState.connect.requiredNetworkElements);
+} = createExternal<NetworkElementConnectionLog>(connectionStatusLogSearchHandler, appState => appState.connect.connectionStatusLog);
 
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusLogHandler.tsx b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusLogHandler.tsx
deleted file mode 100644
index 57e1930ed..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusLogHandler.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
-import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
-
-import { ConnectionStatusLogType } from '../models/connectionStatusLog';
-export interface IConnectionStatusLogState extends IExternalTableState<ConnectionStatusLogType> { }
-
-// create eleactic search material data fetch handler
-const connectionStatusLogSearchHandler = createSearchDataHandler<{ event: ConnectionStatusLogType }, ConnectionStatusLogType>('sdnevents_v1/eventlog', null,
-  (event) => ({
-    _id: event._id,
-    timeStamp: event._source.event.timeStamp,
-    objectId: event._source.event.objectId,
-    type: event._source.event.type,
-    elementStatus: event._source.event.type === 'ObjectCreationNotificationXml'
-      ? 'mounted'
-      : event._source.event.type === 'ObjectDeletionNotificationXml'
-        ? 'unmounted'
-        : event._source.event.type === 'AttributeValueChangedNotificationXml'
-          ? event._source.event.newValue
-          : 'unknown',
-    newValue: ''
-
-  }),
-  (name) => `event.${ name }`);
-
-export const {
-  actionHandler: connectionStatusLogActionHandler,
-  createActions: createConnectionStatusLogActions,
-  createProperties: createConnectionStatusLogProperties,
-  reloadAction: connectionStatusLogReloadAction,
-
-  // set value action, to change a value
-} = createExternal<ConnectionStatusLogType>(connectionStatusLogSearchHandler, appState => appState.connect.connectionStatusLog);
-
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/infoNetworkElementHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/infoNetworkElementHandler.ts
new file mode 100644
index 000000000..d67a81ec4
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/infoNetworkElementHandler.ts
@@ -0,0 +1,60 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { IActionHandler } from '../../../../framework/src/flux/action';
+
+import { AllElementInfoLoadedAction, LoadAllElementInfoAction } from '../actions/infoNetworkElementActions';
+
+import { TopologyNode } from '../models/topologyNetconf';
+
+export interface IInfoNetworkElementsState {
+  elementInfo: TopologyNode;
+  busy: boolean;
+}
+
+const infoNetworkElementsStateInit: IInfoNetworkElementsState = {
+  elementInfo: {
+    "node-id": "",
+    "netconf-node-topology:available-capabilities": {
+      "available-capability": []
+    }
+  },
+  busy: false
+};
+
+export const infoNetworkElementsActionHandler: IActionHandler<IInfoNetworkElementsState> = (state = infoNetworkElementsStateInit, action) => {
+  if (action instanceof LoadAllElementInfoAction) {
+    state = {
+      ...state,
+      busy: true
+    };
+  } else if (action instanceof AllElementInfoLoadedAction) {
+    if (!action.error && action.elementInfo) {
+      state = {
+        ...state,
+        elementInfo: action.elementInfo,
+        busy: false
+      };
+    } else {
+      state = {
+        ...state,
+        busy: false
+      };
+    }
+  }
+  return state;
+};
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/mountedNetworkElementsHandler.tsx b/sdnr/wt/odlux/apps/connectApp/src/handlers/mountedNetworkElementsHandler.tsx
deleted file mode 100644
index 089268946..000000000
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/mountedNetworkElementsHandler.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 { IActionHandler } from '../../../../framework/src/flux/action';
-
-import {
-  AddOrUpdateMountedNetworkElement,
-  AllMountedNetworkElementsLoadedAction,
-  LoadAllMountedNetworkElementsAction,
-  RemoveMountedNetworkElement,
-  UpdateConnectionStateMountedNetworkElement,
-  UpdateRequiredMountedNetworkElement
-} from '../actions/mountedNetworkElementsActions';
-
-import { MountedNetworkElementType } from '../models/mountedNetworkElements';
-
-export interface IMountedNetworkElementsState {
-  elements: MountedNetworkElementType[];
-  busy: boolean;
-}
-
-const mountedNetworkElementsStateInit: IMountedNetworkElementsState = {
-  elements: [],
-  busy: false
-};
-
-export const mountedNetworkElementsActionHandler: IActionHandler<IMountedNetworkElementsState> = (state = mountedNetworkElementsStateInit, action) => {
-  if (action instanceof LoadAllMountedNetworkElementsAction) {
-
-    state = {
-      ...state,
-      busy: true
-    };
-
-  } else if (action instanceof AllMountedNetworkElementsLoadedAction) {
-    if (!action.error && action.mountedNetworkElements) {
-      state = {
-        ...state,
-        elements: action.mountedNetworkElements,
-        busy: false
-      };
-    } else {
-      state = {
-        ...state,
-        busy: false
-      };
-    }
-  } else if (action instanceof AddOrUpdateMountedNetworkElement) {
-    if (!action.mountedNetworkElement) return state; // should handle error here
-    const index = state.elements.findIndex(el => el.mountId === (action.mountedNetworkElement && action.mountedNetworkElement.mountId));
-    if (index > -1) {
-      state = {
-        ...state,
-        elements: [
-          ...state.elements.slice(0, index),
-          action.mountedNetworkElement,
-          ...state.elements.slice(index + 1)
-        ]
-      }
-    } else {
-      state = {
-        ...state,
-        elements: [...state.elements, action.mountedNetworkElement],
-      }
-    };
-  } else if (action instanceof RemoveMountedNetworkElement) {
-    state = {
-      ...state,
-      elements: state.elements.filter(e => e.mountId !== action.mountId),
-    };
-  } else if (action instanceof UpdateConnectionStateMountedNetworkElement) {
-    const index = state.elements.findIndex(el => el.mountId === action.mountId);
-    if (index > -1) {
-      state = {
-        ...state,
-        elements: [
-          ...state.elements.slice(0, index),
-          { ...state.elements[index], connectionStatus: action.mountId },
-          ...state.elements.slice(index + 1)
-        ]
-      }
-    }
-  } else if (action instanceof UpdateRequiredMountedNetworkElement) {
-    const index = state.elements.findIndex(el => el.mountId === action.mountId);
-    if (index > -1 && (state.elements[index].required !== action.required)) {
-      state = {
-        ...state,
-        elements: [
-          ...state.elements.slice(0, index),
-          { ...state.elements[index], required: action.required },
-          ...state.elements.slice(index + 1)
-        ]
-      }
-    }
-  };
-  return state;
-};
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/networkElementsHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/networkElementsHandler.ts
new file mode 100644
index 000000000..78c7000d2
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/networkElementsHandler.ts
@@ -0,0 +1,58 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
+import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
+
+import { NetworkElementConnection } from '../models/networkElementConnection';
+import connectService from '../services/connectService';
+import { requestRest } from '../../../../framework/src/services/restService';
+export interface INetworkElementsState extends IExternalTableState<NetworkElementConnection> { }
+
+// create eleactic search material data fetch handler
+const networkElementsSearchHandler = createSearchDataHandler<NetworkElementConnection>('network-element-connection');
+
+export const {
+  actionHandler: networkElementsActionHandler,
+  createActions: createNetworkElementsActions,
+  createProperties: createNetworkElementsProperties,
+  reloadAction: networkElementsReloadAction,
+
+  // set value action, to change a value
+} = createExternal<NetworkElementConnection>(networkElementsSearchHandler, appState => {
+
+  const webUris = appState.connect.guiCutThrough.availableWebUris;
+  if (appState.connect.networkElements.rows && webUris.length > 0) {
+
+    appState.connect.networkElements.rows.forEach(element => {
+
+      if (element.status === "Connected") {
+        const webUri = webUris.find(item => item.nodeId === element.id as string);
+        if (webUri) {
+          element.webUri = webUri.webUri;
+          element.isWebUriUnreachable = false;
+        }
+        else {
+          element.isWebUriUnreachable = true
+        }
+      }
+    });
+  }
+
+  return appState.connect.networkElements
+});
+
diff --git a/sdnr/wt/odlux/apps/connectApp/src/index.html b/sdnr/wt/odlux/apps/connectApp/src/index.html
index 0f95005de..9c8a2063e 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/index.html
+++ b/sdnr/wt/odlux/apps/connectApp/src/index.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <link rel="stylesheet" href="./vendor.css" >
+  <link rel="stylesheet" href="./vendor.css">
   <title>connectApp</title>
 </head>
 
@@ -15,9 +15,10 @@
   <script type="text/javascript" src="./config.js"></script>
   <script>
     // run the application
-    require(["app","connectApp", "faultApp"], function (app, connectApp, faultApp) {
+    require(["app", "connectApp", "faultApp", "inventoryApp", "configurationApp"], function (app, connectApp, faultApp, inventoryApp, configurationApp) {
       connectApp.register();
       faultApp.register();
+      inventoryApp.register();
       app("./app.tsx").runApplication();
     });
   </script>
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/guiCutTrough.ts b/sdnr/wt/odlux/apps/connectApp/src/models/guiCutTrough.ts
new file mode 100644
index 000000000..4b443bac8
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/guiCutTrough.ts
@@ -0,0 +1 @@
+export type guiCutThrough = { webUri: string, nodeId: string }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/networkElementConnection.ts b/sdnr/wt/odlux/apps/connectApp/src/models/networkElementConnection.ts
new file mode 100644
index 000000000..4c2dc9b09
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/networkElementConnection.ts
@@ -0,0 +1,36 @@
+export type NetworkElementConnection = {
+  id?: string;
+  nodeId: string;
+  isRequired: boolean;
+  host: string;
+  port: number;
+  username?: string;
+  password?: string;
+  webUri?: string;
+  isWebUriUnreachable?: boolean;
+  status?: "Connected" | "mounted" | "unmounted" | "Connecting" | "Disconnected" | "idle";
+  coreModelCapability?: string;
+  deviceType?: string;
+  nodeDetails?: {
+    availableCapabilites: {
+      capabilityOrigin: string;
+      capability: string;
+    }[];
+    unavailableCapabilities: {
+      failureReason: string;
+      capability: string;
+    }[];
+  }
+}
+
+
+export type UpdateNetworkElement = {
+  id: string;
+  isRequired?: boolean;
+  username?: string;
+  password?: string;
+}
+
+export type ConnectionStatus = {
+  status: string
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/mountedNetworkElements.ts b/sdnr/wt/odlux/apps/connectApp/src/models/networkElementConnectionLog.ts
index 0be38a615..a1535cbe5 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/models/mountedNetworkElements.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/networkElementConnectionLog.ts
@@ -15,14 +15,11 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-import { NetworkElementBaseType } from "./networkElementBase";
 
-/**
-* Represents data of an mounted network elements.
-*/
-export type MountedNetworkElementType = NetworkElementBaseType & {
-  connectionStatus: string;
-  required: boolean;
-  capabilities: { module: string, revision: string }[];
-};
+export type NetworkElementConnectionLog = {
+  id: string;
+  nodeId: string;
+  status: "connected" | "mounted" | "unmounted" | "connecting" | "disconnected" | "idle";
+  timestamp: string;
+}
 
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/panelId.ts b/sdnr/wt/odlux/apps/connectApp/src/models/panelId.ts
new file mode 100644
index 000000000..b51412055
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/panelId.ts
@@ -0,0 +1 @@
+export type PanelId = null | "NetworkElements" | "ConnectionStatusLog";
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts b/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
index 357245d46..694009d1b 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
@@ -15,14 +15,6 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-export interface UnavailableCapability {
-  capability: string;
-  "failure-reason": string;
-}
-
-export interface NetconfNodeTopologyUnavailableCapabilities {
-  "unavailable-capability": UnavailableCapability[];
-}
 
 export interface AvailableCapability {
   "capability-origin": string;
@@ -33,18 +25,9 @@ export interface NetconfNodeTopologyAvailableCapabilities {
   "available-capability": AvailableCapability[];
 }
 
-export interface NetconfNodeTopologyClusteredConnectionStatus {
-  "netconf-master-node": string
-}
-
 export interface TopologyNode {
   "node-id": string;
-  "netconf-node-topology:clustered-connection-status": NetconfNodeTopologyClusteredConnectionStatus;
-  "netconf-node-topology:unavailable-capabilities": NetconfNodeTopologyUnavailableCapabilities;
   "netconf-node-topology:available-capabilities": NetconfNodeTopologyAvailableCapabilities;
-  "netconf-node-topology:host": string;
-  "netconf-node-topology:connection-status": string;
-  "netconf-node-topology:port": number;
 }
 
 export interface Topology {
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/yangCapabilitiesType.ts b/sdnr/wt/odlux/apps/connectApp/src/models/yangCapabilitiesType.ts
new file mode 100644
index 000000000..230468287
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/yangCapabilitiesType.ts
@@ -0,0 +1,22 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 type AvailableCapabilities = {
+    module: string,
+    revision: string
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/plugin.tsx b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
index aa08e7b15..f711c440c 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
@@ -22,15 +22,10 @@ import applicationManager from '../../../framework/src/services/applicationManag
 import { subscribe, IFormatedMessage } from '../../../framework/src/services/notificationService';
 
 import connectAppRootHandler from './handlers/connectAppRootHandler';
-import ConnectApplication  from './views/connectView';
-
-import {
-  addMountedNetworkElementAsyncActionCreator,
-  updateMountedNetworkElementAsyncActionCreator,
-  loadAllMountedNetworkElementsAsync
-} from './actions/mountedNetworkElementsActions';
+import ConnectApplication from './views/connectView';
 
 import { AddSnackbarNotification } from '../../../framework/src/actions/snackbarActions';
+import { updateCurrentViewAsyncAction } from './actions/commonNetworkElementsActions';
 
 type ObjectNotification = {
   counter: string;
@@ -48,22 +43,14 @@ export function register() {
     menuEntry: "Connect"
   });
 
-  const updateAllMountedNetworkElements = () => {
-    applicationApi.applicationStoreInitialized.then(applicationStore => { applicationStore.dispatch(loadAllMountedNetworkElementsAsync); })
-  };
-
-  applicationApi.loginEvent.addHandler(updateAllMountedNetworkElements);
-  updateAllMountedNetworkElements();
-
   // subscribe to the websocket notifications
   subscribe<ObjectNotification & IFormatedMessage>(["ObjectCreationNotification", "ObjectDeletionNotification", "AttributeValueChangedNotification"], (msg => {
     const store = applicationApi.applicationStore;
     if (msg && msg.notifType === "ObjectCreationNotification" && store) {
-      store.dispatch(addMountedNetworkElementAsyncActionCreator(msg.objectId));
       store.dispatch(new AddSnackbarNotification({ message: `Adding network element [${msg.objectId}]`, options: { variant: 'info' } }));
     } else if (msg && (msg.notifType === "ObjectDeletionNotification" || msg.notifType === "AttributeValueChangedNotification") && store) {
       store.dispatch(new AddSnackbarNotification({ message: `Updating network element [${msg.objectId}]`, options: { variant: 'info' } }));
-      store.dispatch(updateMountedNetworkElementAsyncActionCreator(msg.objectId));
     }
+    store && store.dispatch(updateCurrentViewAsyncAction());
   }));
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts b/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
index b50a06ee1..7a410f4ae 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
@@ -15,150 +15,66 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
-import { MountedNetworkElementType } from '../models/mountedNetworkElements';
-import { Topology, TopologyNode } from '../models/topologyNetconf';
 
 import { requestRest } from '../../../../framework/src/services/restService';
-import { Result, HitEntry } from '../../../../framework/src/models/elasticSearch';
+import { NetworkElementConnection, ConnectionStatus, UpdateNetworkElement } from '../models/networkElementConnection';
+import { convertPropertyNames, replaceUpperCase } from '../../../../framework/src/utilities/yangHelper';
+import { Result } from '../../../../framework/src/models/elasticSearch';
 
+import { Topology, TopologyNode } from '../models/topologyNetconf';
+import { guiCutThrough } from '../models/guiCutTrough';
 
 /**
- * Represents a web api accessor service for all Network Elements actions.
- */
+* Represents a web api accessor service for all Network Elements actions.
+*/
 class ConnectService {
-  /**
-    * Gets all known required network elements from the backend.
-    */
-  public async getAllRequiredNetworkElements(): Promise<(RequiredNetworkElementType & { _id: string })[] | null> {
-    const path = 'database/mwtn/required-networkelement/_search';
-    const query = { "query": { "match_all": {} } };
-
-    const result = await requestRest<Result<RequiredNetworkElementType>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.hits && result.hits.hits && result.hits.hits.map(ne => ({
-      _id: ne._id,
-      mountId: ne._source && ne._source.mountId,
-      host: ne._source && ne._source.host,
-      port: ne._source && ne._source.port,
-      username: ne._source && ne._source.username,
-      password: ne._source && ne._source.password,
-    })) || null;
-  }
 
-  public async getRequiredNetworkElementByMountId(mountId:string): Promise<(RequiredNetworkElementType & { _id: string }) | null> {
-    const path = `database/mwtn/required-networkelement/${mountId}`;
-
-    const result = await requestRest<HitEntry<RequiredNetworkElementType> & { found: boolean }>(path, { method: "GET" });
-    return result && result.found && result._source  && {
-      _id: result._id,
-      mountId:  result._source.mountId,
-      host: result._source.host,
-      port: result._source.port,
-      username: result._source.username,
-      password: result._source.password,
-    } || null;
+  /**
+   * Inserts a network elements.
+   */
+  public async createNetworkElement(element: NetworkElementConnection): Promise<NetworkElementConnection | null> {
+    const path = `/restconf/operations/data-provider:create-network-element-connection`;
+    const result = await requestRest<NetworkElementConnection>(path, {
+      method: "POST", body: JSON.stringify(convertPropertyNames({ input: element }, replaceUpperCase))
+    });
+    return result || null;
   }
 
   /**
-    * Inserts data into the required network elements table.
-    */
-  public async insertRequiredNetworkElement(element: RequiredNetworkElementType): Promise<RequiredNetworkElementType | null> {
-    const path = `database/mwtn/required-networkelement/${ element.mountId }`;
-    const result = await requestRest<RequiredNetworkElementType>(path, { method: "POST", body: JSON.stringify(element) });
+  * Updates a network element.
+  */
+  public async updateNetworkElement(element: UpdateNetworkElement): Promise<NetworkElementConnection | null> {
+    const path = `/restconf/operations/data-provider:update-network-element-connection`;
+    const result = await requestRest<NetworkElementConnection>(path, {
+      method: "POST", body: JSON.stringify(convertPropertyNames({ input: element }, replaceUpperCase))
+    });
     return result || null;
   }
 
   /**
-    * Deletes data from the Required Network Elements backend.
+    * Deletes a network element.
     */
-  public async deleteRequiredNetworkElement(element: RequiredNetworkElementType): Promise<RequiredNetworkElementType | null> {
-    const path = `database/mwtn/required-networkelement/${ element.mountId }`;
-    const result = await requestRest<RequiredNetworkElementType>(path, { method: "DELETE", body: JSON.stringify(element) });
+  public async deleteNetworkElement(element: UpdateNetworkElement): Promise<NetworkElementConnection | null> {
+    const query = {
+      "id": element.id
+    };
+    const path = `/restconf/operations/data-provider:delete-network-element-connection`;
+    const result = await requestRest<NetworkElementConnection>(path, {
+      method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase))
+    });
     return result || null;
   }
 
-  private static mapTopologyNode = (mountPoint: TopologyNode, required: boolean ) => {
-    // handle onfCapabilities
-    let onfCapabilities: { module: string, revision: string }[] | undefined = undefined;
-
-    const capId = 'netconf-node-topology:available-capabilities';
-    if (mountPoint[capId] && mountPoint[capId]['available-capability']) {
-      onfCapabilities = mountPoint[capId]['available-capability'].filter((cap) => {
-        return cap.capability.includes('?revision=');
-      }).map((cap) => {
-        return {
-          module: cap.capability.split(')')[1],
-          revision: cap.capability.split('?revision=')[1].substring(0, 10)
-        };
-      }).sort((a, b) => {
-        if (a.module < b.module) return -1;
-        if (a.module > b.module) return 1;
-        return 0;
-      });
-    }
-
-    // handle clustered-connection-status
-    const statusId = 'netconf-node-topology:clustered-connection-status';
-    let client = 'localhost';
-
-    if (mountPoint[statusId] && mountPoint[statusId]['netconf-master-node']) {
-      let node = mountPoint[statusId]['netconf-master-node'];
-      node = node.substring(node.indexOf('@'));
-      client = node.substring(1, node.indexOf(':'));
-    }
-    const mountId = mountPoint["node-id"];
-    return {
-      mountId: mountId,
-      host: mountPoint["netconf-node-topology:host"],
-      port: mountPoint["netconf-node-topology:port"],
-      connectionStatus: mountPoint['netconf-node-topology:connection-status'],
-      capabilities: onfCapabilities || [],
-      required: required,
-      client
-    }
-  }
-
-  /** Get all mounted network elements and fills the property required according to the database contents. */
-  public async getMountedNetworkElementsList(): Promise<MountedNetworkElementType[] | null> {
-    const path = 'restconf/operational/network-topology:network-topology/topology/topology-netconf';
-
-    const topologyRequestPomise = requestRest<{ topology: Topology[] | null }>(path, { method: "GET" });
-    const requiredNetworkElementsPromise = this.getAllRequiredNetworkElements();
-
-    const [netconfResponse, requiredNetworkElements] = await Promise.all([topologyRequestPomise, requiredNetworkElementsPromise]);
-
-    // process topologyNetconf (get all known network elements)
-    const topologyNetconf = netconfResponse && netconfResponse.topology && netconfResponse.topology.find(topology => topology["topology-id"] === 'topology-netconf');
-    let mountPoints = topologyNetconf && topologyNetconf.node && topologyNetconf.node.filter(
-      mountPoint => mountPoint['node-id'] !== 'controller-config').map(mountedElement => {
-        const required = requiredNetworkElements && requiredNetworkElements.some(
-          requiredElement => requiredElement.mountId === mountedElement["node-id"]);
-        return ConnectService.mapTopologyNode(mountedElement, !!required);
-      });
-
-    return mountPoints || [];
-  }
-
-  /** Get one mounted network element. */
-  public async getMountedNetworkElementByMountId(mountId: string): Promise<MountedNetworkElementType | null> {
-    const path = 'restconf/operational/network-topology:network-topology/topology/topology-netconf/node/' + mountId;
-    const getMountedNetworkElementByMountIdPromise = requestRest<{ node: TopologyNode[] | null }>(path, { method: "GET" });
-    const getRequiredNetworkElementByMountIdPromise = this.getRequiredNetworkElementByMountId(mountId);
-
-    const [mountedNetworkElement, requiredNetworkElement] = await Promise.all([getMountedNetworkElementByMountIdPromise, getRequiredNetworkElementByMountIdPromise]);
-    return mountedNetworkElement && mountedNetworkElement.node && ConnectService.mapTopologyNode(mountedNetworkElement.node[0], requiredNetworkElement && requiredNetworkElement.mountId === mountedNetworkElement.node[0]["node-id"] || false) || null;
-  }
-
-  /** Mounts an required network element. */
-  public async mountNetworkElement(networkElement: RequiredNetworkElementType): Promise<boolean> {
-    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + networkElement.mountId;
+  /** Mounts network element. */
+  public async mountNetworkElement(networkElement: NetworkElementConnection): Promise<boolean> {
+    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + networkElement.nodeId;
     const mountXml = [
       '<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">',
-      `<node-id>${ networkElement.mountId }</node-id>`,
-      `<host xmlns="urn:opendaylight:netconf-node-topology">${ networkElement.host }</host>`,
-      `<port xmlns="urn:opendaylight:netconf-node-topology">${ networkElement.port }</port>`,
-      `<username xmlns="urn:opendaylight:netconf-node-topology">${ networkElement.username }</username>`,
-      `<password xmlns="urn:opendaylight:netconf-node-topology">${ networkElement.password }</password>`,
+      `<node-id>${networkElement.nodeId}</node-id>`,
+      `<host xmlns="urn:opendaylight:netconf-node-topology">${networkElement.host}</host>`,
+      `<port xmlns="urn:opendaylight:netconf-node-topology">${networkElement.port}</port>`,
+      `<username xmlns="urn:opendaylight:netconf-node-topology">${networkElement.username}</username>`,
+      `<password xmlns="urn:opendaylight:netconf-node-topology">${networkElement.password}</password>`,
       '  <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>',
 
       '  <!-- non-mandatory fields with default values, you can safely remove these if you do not wish to override any of these values-->',
@@ -189,8 +105,8 @@ class ConnectService {
   };
 
   /** Unmounts a network element by its id. */
-  public async unmountNetworkElement(mountId: string): Promise<boolean> {
-    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + mountId;
+  public async unmountNetworkElement(nodeId: string): Promise<boolean> {
+    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + nodeId;
 
     try {
       const result = await requestRest<string>(path, {
@@ -208,6 +124,84 @@ class ConnectService {
     }
   };
 
+  /** Yang capabilities of the selected network elements. */
+  public async infoNetworkElement(nodeId: string): Promise<TopologyNode | null> {
+    const path = 'restconf/operational/network-topology:network-topology/topology/topology-netconf/node/' + nodeId;
+    const topologyRequestPomise = requestRest<Topology>(path, { method: "GET" });
+
+    return topologyRequestPomise && topologyRequestPomise.then(result => {
+      return result && result.node && result.node[0] || null;
+    });
+  }
+
+  /**
+   * Get the connection state of the network element.
+   */
+  public async getNetworkElementConnectionStatus(element: string): Promise<(ConnectionStatus)[] | null> {
+    const path = `/restconf/operations/data-provider:read-network-element-connection-list`;
+    const query = {
+      "input": {
+        "filter": [{
+          "property": "node-id",
+          "filtervalue": element
+        }],
+        "pagination": {
+          "size": 20,
+          "page": 1
+        }
+      }
+    }
+    const result = await requestRest<Result<ConnectionStatus>>(path, { method: "POST", body: JSON.stringify(query) });
+    return result && result.output && result.output.data && result.output.data.map(ne => ({
+      status: ne.status
+    })) || null;
+  }
+
+  public async getWebUriExtensionForNetworkElementAsync(ne: string) {
+    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + ne + '/yang-ext:mount/core-model:network-element';
+    try {
+      const result = await requestRest<any>(path, { method: "GET" });
+
+      if (result['network-element'].extension) {
+        const webUri = result['network-element'].extension.find((item: any) => item['value-name'] === "webUri")
+        if (webUri) {
+          return webUri.value as string;
+        }
+      }
+    } catch (error) {
+      console.log(ne + ' unrechable: ' + error)
+    }
+
+    return undefined;
+
+  }
+
+  public getAllWebUriExtensionsForNetworkElementListAsync(ne: string[]) {
+
+    let promises: any[] = [];
+    let webUris: guiCutThrough[] = []
+
+    ne.forEach(nodeId => {
+      const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + nodeId + '/yang-ext:mount/core-model:network-element';
+
+      // add search request to array
+      promises.push(requestRest<any>(path, { method: "GET" })
+        .then(result => {
+
+          if (result['network-element'] && result['network-element'].extension) {
+            const webUri = result['network-element'].extension.find((item: any) => item['value-name'] === "webUri")
+            if (webUri) {
+              webUris.push({ webUri: webUri.value, nodeId: nodeId });
+            }
+          }
+        })
+        .catch(error => console.log("network element is unreachable: " + error)))
+
+    })
+
+    // wait until all promises are done and return weburis
+    return Promise.all(promises).then(result => { return webUris });
+  }
 
 }
 export const connectService = new ConnectService();
diff --git a/sdnr/wt/odlux/apps/connectApp/src/views/connectView.tsx b/sdnr/wt/odlux/apps/connectApp/src/views/connectView.tsx
index c86b384e1..aa3391c47 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/views/connectView.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/views/connectView.tsx
@@ -18,99 +18,94 @@
 import * as React from 'react';
 
 import connect, { IDispatcher, Connect } from '../../../../framework/src/flux/connect';
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import { Panel } from '../../../../framework/src/components/material-ui';
-
-import { requiredNetworkElementsReloadAction, createRequiredNetworkElementsActions } from '../handlers/requiredNetworkElementsHandler';
-import { loadAllMountedNetworkElementsAsync } from '../actions/mountedNetworkElementsActions';
+import { networkElementsReloadAction, createNetworkElementsActions } from '../handlers/networkElementsHandler';
 import { connectionStatusLogReloadAction, createConnectionStatusLogActions } from '../handlers/connectionStatusLogHandler';
 
-import { RequiredNetworkElementsList } from '../components/requiredNetworkElements';
+import { NetworkElementsList } from '../components/networkElements';
 import { ConnectionStatusLog } from '../components/connectionStatusLog';
-import { UnknownNetworkElementsList } from '../components/unknownNetworkElements';
+import { setPanelAction, findWebUrisForGuiCutThroughAsyncAction } from '../actions/commonNetworkElementsActions';
+import { PanelId } from '../models/panelId';
+import { NetworkElementConnection } from 'models/networkElementConnection';
+
+const mapProps = (state: IApplicationStoreState) => ({
+  panelId: state.connect.currentOpenPanel,
+  user: state.framework.authenticationState.user,
+  netWorkElements: state.connect.networkElements,
+  availableGuiCutroughs: state.connect.guiCutThrough
+});
 
 const mapDispatcher = (dispatcher: IDispatcher) => ({
-  requiredNetworkElementsActions: createRequiredNetworkElementsActions(dispatcher.dispatch),
+  networkElementsActions: createNetworkElementsActions(dispatcher.dispatch),
   connectionStatusLogActions: createConnectionStatusLogActions(dispatcher.dispatch),
-  onLoadUnknownNetworkElements: () => {
-    dispatcher.dispatch(loadAllMountedNetworkElementsAsync);
-  },
-  onLoadRequiredNetworkElements: () => {
-    dispatcher.dispatch(requiredNetworkElementsReloadAction);
+  onLoadNetworkElements: () => {
+    dispatcher.dispatch(networkElementsReloadAction);
   },
+  loadWebUris: findWebUrisForGuiCutThroughAsyncAction(dispatcher.dispatch),
   onLoadConnectionStatusLog: () => {
     dispatcher.dispatch(connectionStatusLogReloadAction);
+  },
+  switchActivePanel: (panelId: PanelId) => {
+    dispatcher.dispatch(setPanelAction(panelId));
   }
 });
 
-type PanelId = null | "RequiredNetworkElements" | "UnknownNetworkElements" | "ConnectionStatusLog";
+type ConnectApplicationComponentProps = Connect<typeof mapProps, typeof mapDispatcher>;
 
-type ConnectApplicationComponentProps = Connect<undefined, typeof mapDispatcher> ;
+class ConnectApplicationComponent extends React.Component<ConnectApplicationComponentProps>{
 
-type ConnectApplicationComponentState = {
-  activePanel: PanelId;
-};
+  componentDidUpdate = () => {
+    // search for guicutthroughs after networkelements were found
+    const networkElements = this.props.netWorkElements;
+    const guiCuttrough = this.props.availableGuiCutroughs;
 
-class ConnectApplicationComponent extends React.Component<ConnectApplicationComponentProps, ConnectApplicationComponentState>{
-  /**
-   * Initialises this instance
-   */
-  constructor(props: ConnectApplicationComponentProps) {
-    super(props);
-
-    this.state = {
-      activePanel: null
-    };
+    if (networkElements.rows.length > 0 && networkElements.total !== guiCuttrough.knownElements.length) {
+      this.props.loadWebUris(networkElements.rows, guiCuttrough.knownElements);
+    }
   }
 
   private onTogglePanel = (panelId: PanelId) => {
-    const nextActivePanel = panelId === this.state.activePanel ? null : panelId;
-    this.setState({
-      activePanel: nextActivePanel
-    }, () => {
-      switch (nextActivePanel) {
-        case 'RequiredNetworkElements':
-          this.props.onLoadRequiredNetworkElements();
-          break;
-        case 'UnknownNetworkElements':
-          // todo: should we update the application state ?
-          break;
-        case 'ConnectionStatusLog':
-          this.props.onLoadConnectionStatusLog();
-          break;
-        case null:
-          // do nothing if all panels are closed
-          break;
-        default:
-          console.warn("Unknown nextActivePanel [" + nextActivePanel + "] in connectView");
-          break;
-      }
-    });
+    const nextActivePanel = panelId === this.props.panelId ? null : panelId;
+    this.props.switchActivePanel(nextActivePanel);
+
+    switch (nextActivePanel) {
+      case 'NetworkElements':
+        this.props.onLoadNetworkElements();
+        break;
+      case 'ConnectionStatusLog':
+        this.props.onLoadConnectionStatusLog();
+        break;
+      case null:
+        // do nothing if all panels are closed
+        break;
+      default:
+        console.warn("Unknown nextActivePanel [" + nextActivePanel + "] in connectView");
+        break;
+    }
+
   };
 
   render(): JSX.Element {
-    const { activePanel } = this.state;
+    const { panelId } = this.props;
 
     return (
       <>
-        <Panel activePanel={ activePanel } panelId={ 'RequiredNetworkElements' } onToggle={ this.onTogglePanel } title={ "Required Network Elements" }>
-          <RequiredNetworkElementsList />
-        </Panel>
-        <Panel activePanel={ activePanel } panelId={ 'UnknownNetworkElements' } onToggle={ this.onTogglePanel } title={ "Unknown Network Elements" }>
-          <UnknownNetworkElementsList />
+        <Panel activePanel={panelId} panelId={'NetworkElements'} onToggle={this.onTogglePanel} title={"Network Elements"}>
+          <NetworkElementsList />
         </Panel>
-        <Panel activePanel={ activePanel } panelId={ 'ConnectionStatusLog' } onToggle={ this.onTogglePanel } title={ "Connection Status Log" }>
+        <Panel activePanel={panelId} panelId={'ConnectionStatusLog'} onToggle={this.onTogglePanel} title={"Connection Status Log"}>
           <ConnectionStatusLog />
         </Panel>
       </>
     );
   };
   public componentDidMount() {
-    this.onTogglePanel("RequiredNetworkElements");
-    this.props.onLoadUnknownNetworkElements();
-    this.props.requiredNetworkElementsActions.onToggleFilter();
+    this.onTogglePanel("NetworkElements");
+    this.props.networkElementsActions.onToggleFilter();
     this.props.connectionStatusLogActions.onToggleFilter();
   }
 }
 
-export const ConnectApplication = (connect(undefined, mapDispatcher)(ConnectApplicationComponent));
+export const ConnectApplication = (connect(mapProps, mapDispatcher)(ConnectApplicationComponent));
 export default ConnectApplication;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/webpack.config.js b/sdnr/wt/odlux/apps/connectApp/webpack.config.js
index a70e62976..6d70b04b0 100644
--- a/sdnr/wt/odlux/apps/connectApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/connectApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      connectApp: ["./plugin.tsx"]
+      connectApp: ["./pluginConnect.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -125,12 +125,26 @@ module.exports = (env) => {
         colors: true
       },
       proxy: {
-        "/restconf": {
-          target: "http://localhost:8181",
+        "/oauth2/": {
+          target: "http://10.20.6.29:28181",
           secure: false
         },
-        "/database": {
-          target: "http://localhost:8181",
+        "/database/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/restconf/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/help/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/websocket": {
+          target: "http://10.20.6.29:28181",
+          ws: true,
+          changeOrigin: true,
           secure: false
         }
       }
diff --git a/sdnr/wt/odlux/apps/demoApp/package.json b/sdnr/wt/odlux/apps/demoApp/package.json
index 4cf46b9e1..f692d69ed 100644
--- a/sdnr/wt/odlux/apps/demoApp/package.json
+++ b/sdnr/wt/odlux/apps/demoApp/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml
index 60016b7a1..535549ae3 100644
--- a/sdnr/wt/odlux/apps/demoApp/pom.xml
+++ b/sdnr/wt/odlux/apps/demoApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-demoApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-demoApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/demoApp/src/models/author.ts b/sdnr/wt/odlux/apps/demoApp/src/models/author.ts
index 7e28ae8aa..0aaa308a2 100644
--- a/sdnr/wt/odlux/apps/demoApp/src/models/author.ts
+++ b/sdnr/wt/odlux/apps/demoApp/src/models/author.ts
@@ -1,4 +1,22 @@
 /**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+
+/**
  * Represents an author.
  */
 export interface IAuthor {
diff --git a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx b/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
index b461aa7bd..3d0651b49 100644
--- a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
+++ b/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
@@ -45,19 +45,19 @@ class AuthorsListComponent extends React.Component<RouteComponentProps & IAuthor
         <Table >
           <TableHead>
             <TableRow>
-              <TableCell numeric>Id</TableCell>
+              <TableCell align="right">Id</TableCell>
               <TableCell >First Name</TableCell>
               <TableCell >Last Name</TableCell>
             </TableRow>
           </TableHead>
           <TableBody>
-            { authors.map(author => (
-              <TableRow key={ author.id } onClick={ (e) => this.editAuthor(author) }>
-                <TableCell>{ author.id }</TableCell>
-                <TableCell>{ author.firstName }</TableCell>
-                <TableCell>{ author.lastName }</TableCell>
+            {authors.map(author => (
+              <TableRow key={author.id} onClick={(e) => this.editAuthor(author)}>
+                <TableCell>{author.id}</TableCell>
+                <TableCell>{author.firstName}</TableCell>
+                <TableCell>{author.lastName}</TableCell>
               </TableRow>
-            )) }
+            ))}
           </TableBody>
         </Table>
       </Paper>
diff --git a/sdnr/wt/odlux/apps/eventLogApp/.babelrc b/sdnr/wt/odlux/apps/eventLogApp/.babelrc
new file mode 100644
index 000000000..3d8cd1260
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/.babelrc
@@ -0,0 +1,17 @@
+{
+  "presets": [
+    ["@babel/preset-react"],
+    ["@babel/preset-env", {
+      "targets": {
+        "chrome": "66"
+      },
+      "spec": true,
+      "loose": false,
+      "modules": false,
+      "debug": false,
+      "useBuiltIns": "usage",
+      "forceAllTransforms": true
+    }]
+  ],
+  "plugins": []
+}
diff --git a/sdnr/wt/odlux/apps/eventLogApp/package.json b/sdnr/wt/odlux/apps/eventLogApp/package.json
new file mode 100644
index 000000000..2594debc1
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@odlux/eventlog-app",
+  "version": "0.1.0",
+  "description": "A react based modular UI to display event log from a database.",
+  "main": "index.js",
+  "scripts": {
+    "start": "webpack-dev-server --env debug",
+    "build": "webpack --env release --config webpack.config.js",
+    "build:dev": "webpack --env debug --config webpack.config.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.mfico.de/highstreet-technologies/odlux.git"
+  },
+  "keywords": [
+    "reactjs",
+    "redux",
+    "ui",
+    "framework"
+  ],
+  "author": "Sai Neetha Phulmali",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
+  "peerDependencies": {
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
+    "@types/react-router-dom": "4.3.1",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
+    "@types/classnames": "2.2.6",
+    "@types/flux": "3.1.8",
+    "@types/jquery": "3.3.10",
+    "jquery": "3.3.1",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
+    "react-router-dom": "4.3.1"
+  }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/eventLogApp/pom.xml b/sdnr/wt/odlux/apps/eventLogApp/pom.xml
new file mode 100644
index 000000000..ed67399ec
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/pom.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-core-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-core-provider</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>dist</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>node</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>node_modules</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>../node_modules</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <!-- eclipse bug build bin folder in basedir -->
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src2/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>de.jacks-it-lab</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.7.1</version>
+                <executions>
+                    <execution>
+                        <id>install node and yarn</id>
+                        <goals>
+                            <goal>install-node-and-yarn</goal>
+                        </goals>
+                        <!-- optional: default phase is "generate-resources" -->
+                        <phase>initialize</phase>
+                        <configuration>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn build</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
+                        <Private-Package/>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogAppRootHandler.ts b/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogAppRootHandler.ts
new file mode 100644
index 000000000..6e2d40efd
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogAppRootHandler.ts
@@ -0,0 +1,45 @@
+/**
+* ============LICENSE_START========================================================================
+* ONAP : ccsdk feature sdnr wt odlux
+* =================================================================================================
+* Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+*/
+// main state handler
+
+import { combineActionHandler } from '../../../../framework/src/flux/middleware';
+
+// ** do not remove **
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
+import { IActionHandler } from '../../../../framework/src/flux/action';
+import { IEventLogState, eventLogActionHandler } from './eventLogHandler';
+
+
+export interface IEventLogAppStateState {
+  logEntries: IEventLogState
+}
+
+
+declare module '../../../../framework/src/store/applicationStore' {
+  interface IApplicationStoreState {
+    eventLog: IEventLogAppStateState;
+  }
+}
+
+const actionHandlers = {
+  logEntries: eventLogActionHandler
+};
+
+export const EventLogAppRootHandler = combineActionHandler<IEventLogAppStateState>(actionHandlers);
+export default EventLogAppRootHandler;
+
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogHandler.tsx b/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogHandler.tsx
new file mode 100644
index 000000000..300a8f7b3
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/handlers/eventLogHandler.tsx
@@ -0,0 +1,36 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
+import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
+
+import { EventLogType } from '../models/eventLogType';
+
+export interface IEventLogState extends IExternalTableState<EventLogType> { }
+
+// create eleactic search material data fetch handler
+const eventLogSearchHandler = createSearchDataHandler<EventLogType>("eventlog");
+
+export const {
+  actionHandler: eventLogActionHandler,
+  createActions: createEventLogActions,
+  createProperties: createEventLogProperties,
+  reloadAction: eventLogReloadAction,
+
+  // set value action, to change a value
+} = createExternal<EventLogType>(eventLogSearchHandler, appState => appState.eventLog.logEntries);
+
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/index.html b/sdnr/wt/odlux/apps/eventLogApp/src/index.html
new file mode 100644
index 000000000..8027509e6
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <!-- <link rel="stylesheet" href="./vendor.css" > -->
+  <title>EventLog App</title>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="text/javascript" src="./require.js"></script>
+  <script type="text/javascript" src="./config.js"></script>
+  <script>
+    // run the application
+    require(["app","connectApp", "eventLogApp"], function (app, connectApp, eventLogApp) {
+      connectApp.register();
+      eventLogApp.register();
+      app("./app.tsx").runApplication();
+    });
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/models/eventLogType.ts b/sdnr/wt/odlux/apps/eventLogApp/src/models/eventLogType.ts
new file mode 100644
index 000000000..7c68e6497
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/models/eventLogType.ts
@@ -0,0 +1,27 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { HitEntry, Result } from '../../../../framework/src/models';
+export type EventLogType = {
+  nodeId: string;
+  counter: number;
+  timestamp: string;
+  objectId: string;
+  attributeName: string;
+  newValue: string;
+  sourceType: string;
+}
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/pluginEventLog.tsx b/sdnr/wt/odlux/apps/eventLogApp/src/pluginEventLog.tsx
new file mode 100644
index 000000000..a2edb436f
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/pluginEventLog.tsx
@@ -0,0 +1,40 @@
+/**
+* ============LICENSE_START========================================================================
+* ONAP : ccsdk feature sdnr wt odlux
+* =================================================================================================
+* Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+*/
+// app configuration and main entry point for the app
+
+import * as React from "react";
+import { faBookOpen } from '@fortawesome/free-solid-svg-icons'; // select app icon
+import applicationManager from '../../../framework/src/services/applicationManager';
+
+import { EventLog } from './views/eventLog';
+import eventLogAppRootHandler from './handlers/eventLogAppRootHandler';
+
+const App : React.SFC = (props) => {
+  return <EventLog />
+};
+
+export function register() {
+  applicationManager.registerApplication({
+    name: "eventLog",
+    icon: faBookOpen,
+    rootActionHandler: eventLogAppRootHandler,
+    rootComponent: App,
+    menuEntry: "EventLog"
+  });
+}
+
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src/views/eventLog.tsx b/sdnr/wt/odlux/apps/eventLogApp/src/views/eventLog.tsx
new file mode 100644
index 000000000..535de1f1d
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src/views/eventLog.tsx
@@ -0,0 +1,59 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from "react";
+
+import { Connect, connect, IDispatcher } from '../../../../framework/src/flux/connect';
+import { MaterialTable, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
+
+import { EventLogType } from '../models/eventLogType';
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import { createEventLogProperties, createEventLogActions } from "../handlers/eventLogHandler";
+
+const EventLogTable = MaterialTable as MaterialTableCtorType<EventLogType & {_id: string}>;
+
+const mapProps = (state: IApplicationStoreState) => ({
+  eventLogProperties: createEventLogProperties(state),
+  eventLog: state.eventLog.logEntries
+});
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+  eventLogActions: createEventLogActions(dispatcher.dispatch)
+});
+
+class EventLogComponent extends React.Component<Connect<typeof mapProps, typeof mapDispatch>> {
+  render() {
+    return <EventLogTable title="Event Log" idProperty="_id" columns={[
+      { property: "nodeId", title: "Node Name" },
+      { property: "counter", title: "Counter" },
+      { property: "timestamp", title: "Timestamp" },
+      { property: "objectId", title: "Object ID" },
+      { property: "attributeName", title: "Attribute Name" },
+      { property: "newValue", title: "Message" },
+      { property: "sourceType", title: "Source" }
+    ]}  {...this.props.eventLogActions} {...this.props.eventLogProperties} >
+    </EventLogTable>
+  }
+
+  componentDidMount() {
+    this.props.eventLogActions.onToggleFilter();
+    this.props.eventLogActions.onHandleRequestSort("node-id");
+  }
+}
+
+export const EventLog = connect(mapProps, mapDispatch)(EventLogComponent);
+export default EventLog;
\ No newline at end of file
diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/ExtendedEquipment.java b/sdnr/wt/odlux/apps/eventLogApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java
index 680a663ad..1e882fc69 100644
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/database/types/equipment/ExtendedEquipment.java
+++ b/sdnr/wt/odlux/apps/eventLogApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java
@@ -6,55 +6,63 @@
  * =================================================================================================
  * 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==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.database.types.equipment;
+package org.onap.ccsdk.features.sdnr.wt.odlux.bundles;
 
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.Equipment;
+import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
+import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
 
-public class ExtendedEquipment {
+public class MyOdluxBundle extends OdluxBundle {
 
-    private final String parentUuid;
-    private final int treeLevel;
-    private final Equipment equipment;
+    @Override
+    public void initialize() {
+        super.initialize();
+    }
 
-    /**
-     * Equipment with additional information beside NETCONF equipment
-     *
-     * @param parentUuid of parent equipment
-     * @param equipment NETCONF Equipment
-     * @param treeLevel level of tree starting with root at 0
-     */
-    public ExtendedEquipment(String parentUuid, Equipment equipment, int treeLevel) {
-        super();
-        this.parentUuid = parentUuid;
-        this.equipment = equipment;
-        this.treeLevel = treeLevel;
+    @Override
+    public void clean() {
+        super.clean();
     }
 
-    public String getParentUuid() {
-        return parentUuid;
+    @Override
+    public String getResourceFileContent(String filename) {
+        return super.getResourceFileContent(filename);
     }
 
-    public Equipment getEquipment() {
-        return equipment;
+    @Override
+    public boolean hasResource(String filename) {
+        return super.hasResource(filename);
     }
 
-    public int getTreeLevel() {
-        return treeLevel;
+    @Override
+    public void setBundleName(String bundleName) {
+        super.setBundleName(bundleName);
     }
 
     @Override
-    public String toString() {
-        return "ExtendedEquipment [parentUuid=" + parentUuid + ", treeLevel=" + treeLevel + ", equipment=" + equipment
-                + "]";
+    public void setLoader(OdluxBundleLoader loader) {
+        super.setLoader(loader);
     }
 
+    @Override
+    public String getBundleName() {
+        return super.getBundleName();
+    }
+
+    @Override
+    public OdluxBundleLoader getLoader() {
+        return super.getLoader();
+    }
+
+    public MyOdluxBundle() {
+        super();
+    }
 }
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 000000000..cb2d0626a
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,9 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <reference id="loadersvc" availability="mandatory" activation="eager" interface="org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader"/>
+
+    <bean id="bundle" init-method="initialize" destroy-method="clean" class="org.onap.ccsdk.features.sdnr.wt.odlux.bundles.MyOdluxBundle">
+        <property name="loader" ref="loadersvc"/>
+        <property name="bundleName" value="eventLogApp"/>
+        <property name="index" value="75"/>
+    </bean>
+</blueprint>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java b/sdnr/wt/odlux/apps/eventLogApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java
new file mode 100644
index 000000000..e2ffb596b
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ ******************************************************************************/
+package org.onap.ccsdk.features.sdnr.wt.odlux.bundles.test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl;
+import org.onap.ccsdk.features.sdnr.wt.odlux.bundles.MyOdluxBundle;
+import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
+
+public class TestBundleRes {
+
+    @Test
+    public void test() {
+        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
+        MyOdluxBundle b = new MyOdluxBundle();
+        b.setLoader(loader);
+        b.setIndex(0);
+        b.setBundleName("abc");
+        b.initialize();
+        assertTrue(loader.getNumberOfBundles() == 1);
+        assertNotNull(b.getLoader());
+        assertEquals("abc",b.getBundleName());
+        assertTrue(b.hasResource("test.js"));
+        assertNotNull(b.getResourceFileContent("test.js"));
+        b.clean();
+        assertTrue(loader.getNumberOfBundles() == 0);
+    }
+
+}
diff --git a/sdnr/wt/odlux/apps/eventLogApp/src2/test/resources/test.js b/sdnr/wt/odlux/apps/eventLogApp/src2/test/resources/test.js
new file mode 100644
index 000000000..b47fdc39f
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/src2/test/resources/test.js
@@ -0,0 +1,5 @@
+asdac sad 
+as
+d 
+sad
+ sadfa
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/eventLogApp/tsconfig.json b/sdnr/wt/odlux/apps/eventLogApp/tsconfig.json
new file mode 100644
index 000000000..a66b5d828
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/tsconfig.json
@@ -0,0 +1,37 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "outDir": "./dist",
+    "sourceMap": true,
+    "forceConsistentCasingInFileNames": true,
+    "allowSyntheticDefaultImports": false,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "pretty": true,
+    "newLine": "LF",
+    "module": "es2015",
+    "target": "es2016",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "jsx": "preserve",
+    "lib": [
+      "dom",
+      "es2015",
+      "es2016"
+    ],
+    "types": [
+      "prop-types",
+      "react",
+      "react-dom"
+    ]
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}
diff --git a/sdnr/wt/odlux/apps/eventLogApp/webpack.config.js b/sdnr/wt/odlux/apps/eventLogApp/webpack.config.js
new file mode 100644
index 000000000..a67a34074
--- /dev/null
+++ b/sdnr/wt/odlux/apps/eventLogApp/webpack.config.js
@@ -0,0 +1,155 @@
+/**
+ * Webpack 4 configuration file
+ * see https://webpack.js.org/configuration/
+ * see https://webpack.js.org/configuration/dev-server/
+ */
+
+"use strict";
+
+const path = require("path");
+const webpack = require("webpack");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const TerserPlugin = require('terser-webpack-plugin');
+
+// const __dirname = (path => path.replace(/^([a-z]\:)/, c => c.toUpperCase()))(process.__dirname());
+
+module.exports = (env) => {
+  const distPath = path.resolve(__dirname, env === "release" ? "." : "../..", "dist");
+  const frameworkPath = path.resolve(__dirname, env === "release" ? "../../framework" : "../..", "dist");
+  return [{
+    name: "App",
+
+    mode: "none", //disable default behavior
+
+    target: "web",
+
+    context: path.resolve(__dirname, "src"),
+
+    entry: {
+      eventLogApp: ["./pluginEventLog.tsx"]
+    },
+
+    devtool: env === "release" ? false : "source-map",
+
+    resolve: {
+      extensions: [".ts", ".tsx", ".js", ".jsx"]
+    },
+
+    output: {
+      path: distPath,
+      filename: "[name].js",
+      library: "[name]",
+      libraryTarget: "umd2",
+      chunkFilename: "[name].js"
+    },
+    module: {
+      rules: [{
+        test: /\.tsx?$/,
+        exclude: /node_modules/,
+        use: [{
+          loader: "babel-loader"
+        }, {
+          loader: "ts-loader"
+        }]
+      }, {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: [{
+          loader: "babel-loader"
+        }]
+      }]
+    },
+
+    optimization: {
+      noEmitOnErrors: true,
+      namedModules: env !== "release",
+      minimize: env === "release",
+      minimizer: env !== "release" ? [] : [new TerserPlugin({
+        terserOptions: {
+          warnings: false, // false, true, "verbose"
+          compress: {
+            drop_console: true,
+            drop_debugger: true,
+          }
+        }
+      })],
+    },
+
+    plugins: [
+      new webpack.DllReferencePlugin({
+        context: path.resolve(__dirname, "../../framework/src"),
+        manifest: require(path.resolve(frameworkPath, "vendor-manifest.json")),
+        sourceType: "umd2"
+      }),
+      new webpack.DllReferencePlugin({
+        context: path.resolve(__dirname, "../../framework/src"),
+        manifest: require(path.resolve(frameworkPath, "app-manifest.json")),
+        sourceType: "umd2"
+      }),
+      ...(env === "release") ? [
+        new webpack.DefinePlugin({
+          "process.env": {
+            NODE_ENV: "'production'",
+            VERSION: JSON.stringify(require("./package.json").version)
+          }
+        }),
+      ] : [
+          new webpack.DefinePlugin({
+            "process.env": {
+              NODE_ENV: "'development'",
+              VERSION: JSON.stringify(require("./package.json").version)
+            }
+          }),
+          new CopyWebpackPlugin([{
+            from: 'index.html',
+            to: distPath
+          }]),
+        ]
+    ],
+
+    devServer: {
+      public: "http://localhost:3100",
+      contentBase: frameworkPath,
+
+      compress: true,
+      headers: {
+        "Access-Control-Allow-Origin": "*"
+      },
+      host: "0.0.0.0",
+      port: 3100,
+      disableHostCheck: true,
+      historyApiFallback: true,
+      inline: true,
+      hot: false,
+      quiet: false,
+      stats: {
+        colors: true
+      },
+      proxy: {
+        "/oauth2/": {
+          target: "http://localhost:28181",
+          secure: false
+        },
+        "/database/": {
+          target: "http://localhost:28181",
+          secure: false
+        },
+        "/restconf/": {
+          target: "http://localhost:28181",
+          secure: false
+        },
+        "/help/": {
+          target: "http://localhost:28181",
+          secure: false
+        },
+        "/websocket/": {
+          target: "http://localhost:28181",
+          ws: true,
+          changeOrigin: true,
+          secure: false
+        }
+      }
+
+    }
+  }];
+}
diff --git a/sdnr/wt/odlux/apps/faultApp/package.json b/sdnr/wt/odlux/apps/faultApp/package.json
index be7bf6d02..909626303 100644
--- a/sdnr/wt/odlux/apps/faultApp/package.json
+++ b/sdnr/wt/odlux/apps/faultApp/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml
index b748b7d19..1c616a40b 100644
--- a/sdnr/wt/odlux/apps/faultApp/pom.xml
+++ b/sdnr/wt/odlux/apps/faultApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -8,18 +9,19 @@
         <relativePath/>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-faultApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-faultApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -38,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -62,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -88,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -100,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts b/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
new file mode 100644
index 000000000..ba1a24822
--- /dev/null
+++ b/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
@@ -0,0 +1,36 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { clearStuckAlarms } from "../services/faultStatusService"
+import { Dispatch } from "../../../../framework/src/flux/store";
+import { FaultApplicationBaseAction } from "./notificationActions";
+
+export class AreStuckAlarmsCleared extends FaultApplicationBaseAction {
+    constructor(public isBusy: boolean) {
+        super();
+    }
+}
+
+
+export const clearStuckAlarmAsyncAction = (dispatcher: Dispatch) => async (nodeNames: string[]) => {
+    dispatcher(new AreStuckAlarmsCleared(true))
+    const result = await clearStuckAlarms(nodeNames).catch(error => { console.error(error); return undefined });
+    dispatcher(new AreStuckAlarmsCleared(false))
+    return result;
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/src/actions/notificationActions.ts b/sdnr/wt/odlux/apps/faultApp/src/actions/notificationActions.ts
index b990536e4..584e7cd8b 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/actions/notificationActions.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/actions/notificationActions.ts
@@ -17,13 +17,13 @@
  */
 import { Action } from '../../../../framework/src/flux/action';
 
-import { Fault } from '../models/fault';
+import { FaultAlarmNotification } from '../models/fault';
 
 export class FaultApplicationBaseAction extends Action { }
 
 
 export class AddFaultNotificationAction extends FaultApplicationBaseAction {
-  constructor(public fault:Fault) {
+  constructor(public fault:FaultAlarmNotification) {
     super();
   }
 }
diff --git a/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx b/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
new file mode 100644
index 000000000..3b8b9b684
--- /dev/null
+++ b/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
@@ -0,0 +1,136 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react'
+import { DialogContent, DialogActions, Button, Dialog, DialogTitle, DialogContentText } from '@material-ui/core';
+import { currentProblemsReloadAction } from '../handlers/currentProblemsHandler';
+import { clearStuckAlarmAsyncAction } from '../actions/clearStuckAlarmsAction';
+import connect, { IDispatcher, Connect } from '../../../../framework/src/flux/connect';
+
+export enum ClearStuckAlarmsDialogMode {
+    None = "none",
+    Show = "show"
+}
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+    clearStuckAlarmsAsync: clearStuckAlarmAsyncAction(dispatcher.dispatch),
+    reloadCurrentProblemsAction: () => dispatcher.dispatch(currentProblemsReloadAction)
+})
+
+type clearStuckAlarmsProps = Connect<typeof undefined, typeof mapDispatch> & {
+    numberDevices: Number,
+    mode: ClearStuckAlarmsDialogMode,
+    stuckAlarms: string[]
+    onClose: () => void
+}
+
+type ClearStuckAlarmsState = {
+    clearAlarmsSuccessful: boolean,
+    errormessage: string,
+    unclearedAlarms: string[]
+}
+
+class ClearStuckAlarmsDialogComponent extends React.Component<clearStuckAlarmsProps, ClearStuckAlarmsState>{
+    constructor(props: clearStuckAlarmsProps) {
+        super(props);
+        this.state = { clearAlarmsSuccessful: true, errormessage: '', unclearedAlarms: [] }
+    }
+
+    onClose = (event: React.MouseEvent) => {
+        event.stopPropagation();
+        event.preventDefault();
+        this.props.onClose();
+    }
+
+    onRefresh = async (event: React.MouseEvent) => {
+        event.stopPropagation();
+        event.preventDefault();
+        const result = await this.props.clearStuckAlarmsAsync(this.props.stuckAlarms);
+
+        if (result) {
+            if (result.output.nodenames) {
+                if (result.output.nodenames.length !== this.props.stuckAlarms.length) { //show errormessage if not all devices were cleared
+                    const undeletedAlarm = this.props.stuckAlarms.filter(item => !result.output.nodenames.includes(item))
+                    const error = "The alarms of the following devices couldn't be refreshed: ";
+                    this.setState({ clearAlarmsSuccessful: false, errormessage: error, unclearedAlarms: undeletedAlarm })
+                    return;
+                }
+            }
+        }
+        else { //show errormessage if no devices were cleared
+            this.setState({ clearAlarmsSuccessful: false, errormessage: "Alarms couldn't be refreshed.", unclearedAlarms: [] })
+            return;
+        }
+
+        this.props.reloadCurrentProblemsAction();
+        this.props.onClose();
+    }
+
+    onOk = (event: React.MouseEvent) => {
+
+        event.stopPropagation();
+        event.preventDefault();
+        if (this.state.unclearedAlarms.length > 0)
+            this.props.reloadCurrentProblemsAction();
+        this.props.onClose();
+    }
+
+    render() {
+        console.log(this.props.stuckAlarms);
+        const device = this.props.numberDevices > 1 ? 'devices' : 'device'
+        const defaultMessage = "Are you sure you want to refresh all alarms for " + this.props.numberDevices + " " + device + "?"
+        const message = this.state.clearAlarmsSuccessful ? defaultMessage : this.state.errormessage;
+
+        const defaultTitle = "Refresh Confirmation"
+        const title = this.state.clearAlarmsSuccessful ? defaultTitle : 'Refresh Result';
+
+        return (
+            <Dialog open={this.props.mode !== ClearStuckAlarmsDialogMode.None}>
+                <DialogTitle>{title}</DialogTitle>
+                <DialogContent>
+                    <DialogContentText>
+                        {message}
+                    </DialogContentText>
+                    {
+                        this.state.unclearedAlarms.map(item =>
+                            <DialogContentText>
+                                {item}
+                            </DialogContentText>
+                        )
+                    }
+                </DialogContent>
+                <DialogActions>
+                    {
+                        this.state.clearAlarmsSuccessful &&
+                        <>
+                            <Button onClick={this.onRefresh}>Yes</Button>
+                            <Button onClick={this.onClose}>No</Button>
+                        </>
+                    }
+
+                    {
+                        !this.state.clearAlarmsSuccessful && <Button onClick={this.onOk}>Ok</Button>
+                    }
+                </DialogActions>
+            </Dialog>
+        )
+    }
+}
+
+const ClearStuckAlarmsDialog = connect(undefined, mapDispatch)(ClearStuckAlarmsDialogComponent)
+export default ClearStuckAlarmsDialog;
diff --git a/sdnr/wt/odlux/apps/faultApp/src/components/faultStatus.tsx b/sdnr/wt/odlux/apps/faultApp/src/components/faultStatus.tsx
index 780e61d7a..1ec463f47 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/components/faultStatus.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/components/faultStatus.tsx
@@ -58,7 +58,7 @@ class FaultStatusComponent extends React.Component<FaultStatusComponentProps> {
 
     return (
       <Typography variant="body1" color="inherit" >
-        Alarm status: <FontAwesomeIcon className={`${classes.icon} ${classes.critical}`} icon={faExclamationTriangle} /> { faultStatus.critical  } |
+        Alarm Status: <FontAwesomeIcon className={`${classes.icon} ${classes.critical}`} icon={faExclamationTriangle} /> { faultStatus.critical  } |
         <FontAwesomeIcon className={`${classes.icon} ${classes.major}`} icon={faExclamationTriangle} /> { faultStatus.major } |
         <FontAwesomeIcon className={`${classes.icon} ${classes.minor}`} icon={faExclamationTriangle} /> { faultStatus.minor } |
         <FontAwesomeIcon className={`${classes.icon} ${classes.warning}`} icon={faExclamationTriangle} /> { faultStatus.warning } |
diff --git a/sdnr/wt/odlux/apps/faultApp/src/handlers/alarmLogEntriesHandler.ts b/sdnr/wt/odlux/apps/faultApp/src/handlers/alarmLogEntriesHandler.ts
index be41a51b2..31b8259b2 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/handlers/alarmLogEntriesHandler.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/handlers/alarmLogEntriesHandler.ts
@@ -18,17 +18,12 @@
 import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { Fault, FaultLog } from '../models/fault';
+import { Fault } from '../models/fault';
 
 export interface IAlarmLogEntriesState extends IExternalTableState<Fault> { }
 
-// create eleactic search material data fetch handler
-const alarmLogEntriesSearchHandler = createSearchDataHandler<FaultLog, Fault>(
-  'sdnevents/faultlog',
-  null,
-  (hit) => ({ _id: hit._id, ...hit._source.fault }),
-  (name) => `fault.${ name }`
-);
+// create eleactic search data fetch handler
+const alarmLogEntriesSearchHandler = createSearchDataHandler< Fault>('faultlog');
 
 export const {
   actionHandler: alarmLogEntriesActionHandler,
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx b/sdnr/wt/odlux/apps/faultApp/src/handlers/clearStuckAlarmsHandler.ts
index 2a53203c8..14634b4c4 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/handlers/clearStuckAlarmsHandler.ts
@@ -15,22 +15,22 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-// app configuration and main entry point for the app
 
+import { IActionHandler } from "../../../../framework/src/flux/action"
+import { AreStuckAlarmsCleared } from "../actions/clearStuckAlarmsAction";
 
-import { faShoppingBag } from '@fortawesome/free-solid-svg-icons';  // select app icon
+export interface IStuckAlarms {
+    areAlarmsCleared: boolean
+}
 
-import applicationManager from '../../../framework/src/services/applicationManager';
+const initialState: IStuckAlarms = {
+    areAlarmsCleared: false
+}
 
-import { Dashboard } from  './views/dashboard';
-import faultAppRootHandler from './handlers/inventoryAppRootHandler';
+export const stuckAlarmHandler: IActionHandler<IStuckAlarms> = (state = initialState, action) => {
+    if (action instanceof AreStuckAlarmsCleared) {
+        state = { ...state, areAlarmsCleared: action.isBusy }
+    }
 
-export function register() {
-  applicationManager.registerApplication({
-    name: "inventory",
-    icon: faShoppingBag,
-    rootActionHandler: faultAppRootHandler,
-    rootComponent: Dashboard,
-    menuEntry: "Inventory"
-  });
-}
+    return state;
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/src/handlers/currentProblemsHandler.ts b/sdnr/wt/odlux/apps/faultApp/src/handlers/currentProblemsHandler.ts
index 760dbeadc..3698a2798 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/handlers/currentProblemsHandler.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/handlers/currentProblemsHandler.ts
@@ -18,17 +18,12 @@
 import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { FaultResult, Fault } from '../models/fault';
+import { Fault } from '../models/fault';
 
 export interface ICurrentProblemsState extends IExternalTableState<Fault> { }
 
-// create eleactic search material data fetch handler
-const currentProblemsSearchHandler = createSearchDataHandler<FaultResult, Fault>(
-    'sdnevents/faultcurrent',
-    null,
-    (hit) => ({ _id: hit._id, ...hit._source.faultCurrent }),
-    (name) => `faultCurrent.${name}`
-  );
+// create eleactic search data fetch handler
+const currentProblemsSearchHandler = createSearchDataHandler<Fault>('faultcurrent');
 
 export const {
   actionHandler: currentProblemsActionHandler,
diff --git a/sdnr/wt/odlux/apps/faultApp/src/handlers/faultAppRootHandler.ts b/sdnr/wt/odlux/apps/faultApp/src/handlers/faultAppRootHandler.ts
index 22a9a58a2..dddb4a247 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/handlers/faultAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/handlers/faultAppRootHandler.ts
@@ -28,12 +28,13 @@ import { ICurrentProblemsState, currentProblemsActionHandler } from './currentPr
 import { IAlarmLogEntriesState, alarmLogEntriesActionHandler } from './alarmLogEntriesHandler';
 import { SetPanelAction } from '../actions/panelChangeActions';
 import { IFaultStatus, faultStatusHandler } from './faultStatusHandler';
+import { stuckAlarmHandler } from './clearStuckAlarmsHandler';
 
 export interface IFaultAppStoreState {
   currentProblems: ICurrentProblemsState;
   faultNotifications: IFaultNotifications;
   alarmLogEntries: IAlarmLogEntriesState;
-  currentOpenPanel: string|null;
+  currentOpenPanel: string | null;
   faultStatus: IFaultStatus;
 }
 
@@ -55,7 +56,8 @@ const actionHandlers = {
   faultNotifications: faultNotificationsHandler,
   alarmLogEntries: alarmLogEntriesActionHandler,
   currentOpenPanel: currentOpenPanelHandler,
-  faultStatus: faultStatusHandler
+  faultStatus: faultStatusHandler,
+  stuckAlarms: stuckAlarmHandler
 };
 
 export const faultAppRootHandler = combineActionHandler<IFaultAppStoreState>(actionHandlers);
diff --git a/sdnr/wt/odlux/apps/faultApp/src/handlers/notificationsHandler.ts b/sdnr/wt/odlux/apps/faultApp/src/handlers/notificationsHandler.ts
index 4377a1b0a..aa92d2a1c 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/handlers/notificationsHandler.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/handlers/notificationsHandler.ts
@@ -17,10 +17,10 @@
  */
 import { IActionHandler } from '../../../../framework/src/flux/action';
 import { AddFaultNotificationAction, ResetFaultNotificationsAction } from '../actions/notificationActions';
-import { Fault } from '../models/fault';
+import { FaultAlarmNotification } from '../models/fault';
 
 export interface IFaultNotifications {
-  faults: Fault[];
+  faults: FaultAlarmNotification[];
   since: Date;
 }
 
diff --git a/sdnr/wt/odlux/apps/faultApp/src/index.html b/sdnr/wt/odlux/apps/faultApp/src/index.html
index a2a0830b3..cd315f0b7 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/index.html
+++ b/sdnr/wt/odlux/apps/faultApp/src/index.html
@@ -15,12 +15,8 @@
   <script type="text/javascript" src="./config.js"></script>
   <script>
     // run the application
-    require(["app", "connectApp", "faultApp", "maintenanceApp", "configurationApp", "helpApp"], function (app, connectApp, faultApp, maintenanceApp, configurationApp, helpApp) {
-        connectApp.register();
+    require(["app", "faultApp" ], function (app, faultApp) {
         faultApp.register();
-        configurationApp.register();
-        maintenanceApp.register();
-        helpApp.register();
         app("./app.tsx").runApplication();
       });
   </script>
diff --git a/sdnr/wt/odlux/apps/faultApp/src/models/fault.ts b/sdnr/wt/odlux/apps/faultApp/src/models/fault.ts
index 153e8def3..c65734437 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/models/fault.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/models/fault.ts
@@ -15,17 +15,53 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-export type FaultType = {
+export type Fault = {
+  id: string;
+  nodeId: string;
+  counter: number;
+  timestamp: string;
+  objectId: string;
+  problem: string;
+  severity: null | 'Warning' | 'Minor' | 'Major' | 'Critical';
+  type: string;
+  sourceType: string;
+}
+
+export type FaultAlarmNotification = {
+  id: string;
   nodeName: string;
-  counter: string;
+  counter: number;
   timeStamp: string;
   objectId: string;
   problem: string;
-  severity: null | 'Warning' | 'Minor' | 'Major' | 'Critical' ;
+  severity: null | 'Warning' | 'Minor' | 'Major' | 'Critical';
   type: string;
+  sourceType: string;
 }
-export type FaultResult = { faultCurrent: FaultType };
 
-export type FaultLog = { fault: FaultType };
+/**
+ * Fault status return type
+ */
+export type FaultsReturnType = {
+  criticals: number,
+  majors: number,
+  minors: number,
+  warnings: number
+};
+
+export type FaultType = {
+  Critical: number,
+  Major: number,
+  Minor: number,
+  Warning: number
+};
+
+export type Faults = {
+  faults: FaultsReturnType
+};
 
-export type Fault = FaultType & { _id: string };
+export type DeletedStuckAlarms = {
+  output: {
+    nodenames: string[]
+  }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/src/plugin.tsx b/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx
index eec8c0821..02dde90f7 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx
@@ -31,7 +31,7 @@ import { IApplicationStoreState } from "../../../framework/src/store/application
 import { faultAppRootHandler } from './handlers/faultAppRootHandler';
 import { FaultApplication } from "./views/faultApplication";
 
-import { Fault } from "./models/fault";
+import { FaultAlarmNotification } from "./models/fault";
 import { PanelId } from "./models/panelId";
 
 import { SetPanelAction } from "./actions/panelChangeActions";
@@ -60,8 +60,8 @@ const FaultApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteCom
     window.setTimeout(() => {
       if (currentMountId) {
         props.setCurrentPanel("CurrentProblem");
-        props.currentProblemsActions.onFilterChanged("objectId", currentMountId);
-        props.currentProblemsProperties.showFilter || (props.currentProblemsActions.onToggleFilter());
+        props.currentProblemsActions.onFilterChanged("nodeId", currentMountId);
+        props.currentProblemsProperties.showFilter; // || (props.currentProblemsActions.onToggleFilter());
         props.currentProblemsActions.onRefresh();
       }
     });
@@ -89,7 +89,7 @@ export function register() {
   });
 
   // subscribe to the websocket notifications
-  subscribe<Fault & IFormatedMessage>("ProblemNotification", (fault => {
+  subscribe<FaultAlarmNotification & IFormatedMessage>("ProblemNotification", (fault => {
     const store = applicationApi && applicationApi.applicationStore;
     if (fault && store) {
       store.dispatch(new AddFaultNotificationAction(fault));
diff --git a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
index ed1f3f919..d3409e095 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
@@ -16,24 +16,38 @@
  * ============LICENSE_END==========================================================================
  */
 import { requestRest } from "../../../../framework/src/services/restService";
-import { Result } from "../../../../framework/src/models/elasticSearch";
+import { Result, PostResponse } from "../../../../framework/src/models/elasticSearch";
+import { FaultType, Faults, DeletedStuckAlarms } from "../models/fault";
 
-export const getFaultStateFromDatabase = async (): Promise < { [key: string]: number } | null > => {
-  const path = 'database/sdnevents/faultcurrent/_search';
-  const query = {
-    "size": 0,
-    "aggregations": {
-      "severity": {
-        "terms": {
-          "field": "faultCurrent.severity"
-        }
-      }
+
+export const getFaultStateFromDatabase = async (): Promise<FaultType | null> => {
+  const path = 'restconf/operations/data-provider:read-status';
+  const result = await requestRest<Result<Faults>>(path, { method: "POST" });
+
+  let faultType: FaultType = {
+    Critical: 0,
+    Major: 0,
+    Minor: 0,
+    Warning: 0
+  }
+  let faults: Faults[] | null = null;
+
+  if (result && result.output && result.output.data) {
+    faults = result.output.data;
+    faultType = {
+      Critical: faults[0].faults.criticals,
+      Major: faults[0].faults.majors,
+      Minor: faults[0].faults.minors,
+      Warning: faults[0].faults.warnings
     }
-  };
+  }
+
+  return faultType;
+}
+
+export const clearStuckAlarms = async (nodeNames: string[]) => {
+  const path = 'restconf/operations/devicemanager:clear-current-fault-by-nodename'
+  const result = await requestRest<DeletedStuckAlarms>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) })
+  return result;
 
-  const result = await requestRest<Result<{ severity: { buckets: { key: string, doc_count: number }[] } }>>(path, { method: "POST", body: JSON.stringify(query) });
-  return result && result.aggregations && result.aggregations["severity"].buckets.reduce<{ [key: string]: number }>((acc, cur) => {
-    acc[cur.key] = cur.doc_count;
-    return acc;
-  }, {}) || null;
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx b/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
index 9faa3566b..fd1c48ac5 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
@@ -28,12 +28,15 @@ import { Panel } from '../../../../framework/src/components/material-ui';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { Fault } from '../models/fault';
+import { Fault, FaultAlarmNotification } from '../models/fault';
 import { PanelId } from '../models/panelId';
 
 import { createCurrentProblemsProperties, createCurrentProblemsActions, currentProblemsReloadAction } from '../handlers/currentProblemsHandler';
 import { createAlarmLogEntriesProperties, createAlarmLogEntriesActions, alarmLogEntriesReloadAction } from '../handlers/alarmLogEntriesHandler';
 import { SetPanelAction } from '../actions/panelChangeActions';
+import { Tooltip, IconButton } from '@material-ui/core';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import ClearStuckAlarmsDialog, { ClearStuckAlarmsDialogMode } from '../components/clearStuckAlarmsDialog';
 
 const mapProps = (state: IApplicationStoreState) => ({
   activePanel: state.fault.currentOpenPanel,
@@ -47,18 +50,50 @@ const mapDisp = (dispatcher: IDispatcher) => ({
   alarmLogEntriesActions: createAlarmLogEntriesActions(dispatcher.dispatch),
   reloadCurrentProblems: () => dispatcher.dispatch(currentProblemsReloadAction),
   reloadAlarmLogEntries: () => dispatcher.dispatch(alarmLogEntriesReloadAction),
-  setCurrentPanel: (panelId: PanelId) => dispatcher.dispatch(new SetPanelAction(panelId))
+  setCurrentPanel: (panelId: PanelId) => dispatcher.dispatch(new SetPanelAction(panelId)),
 });
 
 type FaultApplicationComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp>;
 
+type FaultApplicationState = {
+  clearAlarmDialogMode: ClearStuckAlarmsDialogMode,
+  stuckAlarms: string[]
+}
+
 
 const FaultTable = MaterialTable as MaterialTableCtorType<Fault>;
+const FaultAlarmNotificationTable = MaterialTable as MaterialTableCtorType<FaultAlarmNotification>;
+
+
+class FaultApplicationComponent extends React.Component<FaultApplicationComponentProps, FaultApplicationState>{
+
+  /**
+   *
+   */
+  constructor(props: FaultApplicationComponentProps) {
+    super(props);
+    this.state = { clearAlarmDialogMode: ClearStuckAlarmsDialogMode.None, stuckAlarms: [] }
+  }
+
+  onDialogClose = () => {
+    this.setState({ clearAlarmDialogMode: ClearStuckAlarmsDialogMode.None, stuckAlarms: [] })
+  }
+
+  onDialogOpen = () => {
+    const stuckAlarms = [...new Set(this.props.currentProblemsProperties.rows.map(item => item.nodeId))];
+    this.setState({ clearAlarmDialogMode: ClearStuckAlarmsDialogMode.Show, stuckAlarms: stuckAlarms })
+  }
+
 
-class FaultApplicationComponent extends React.Component<FaultApplicationComponentProps>{
 
   render(): JSX.Element {
 
+    const refreshButton = {
+      icon: RefreshIcon, tooltip: 'Clear stuck alarms', onClick: this.onDialogOpen
+    };
+    const areFaultsAvailable = this.props.currentProblemsProperties.rows && this.props.currentProblemsProperties.rows.length > 0
+    const customAction = areFaultsAvailable ? [refreshButton] : [];
+
     const { activePanel } = this.props;
 
     const onTogglePanel = (panelId: PanelId) => {
@@ -82,19 +117,19 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
 
     return (
       <>
-        <Panel activePanel={ activePanel } panelId={ 'CurrentProblem' } onToggle={ onTogglePanel } title={ 'Current Problem List' }>
-          <FaultTable idProperty={ '_id' }  columns={ [
-              { property: "icon", title: "", type: ColumnType.custom, customControl: this.renderIcon },
-              { property: "timeStamp", type: ColumnType.text, title: "Time Stamp" },
-              { property: "nodeName", title: "Node Name", type: ColumnType.text },
-              { property: "counter", title: "Count", type: ColumnType.numeric, width: "100px" },
-              { property: "objectId", title: "Object Id", type: ColumnType.text } ,
-              { property: "problem", title: "Alarm Type", type: ColumnType.text },
-              { property: "severity", title: "Severity", type: ColumnType.text, width: "140px" },
-              ] } { ...this.props.currentProblemsProperties } { ...this.props.currentProblemsActions }  />
+        <Panel activePanel={activePanel} panelId={'CurrentProblem'} onToggle={onTogglePanel} title={'Current Problem List'}>
+          <FaultTable idProperty={'id'} customActionButtons={customAction} columns={[
+            { property: "icon", title: "", type: ColumnType.custom, customControl: this.renderIcon },
+            { property: "timestamp", type: ColumnType.text, title: "Time Stamp" },
+            { property: "nodeId", title: "Node Name", type: ColumnType.text },
+            { property: "counter", title: "Count", type: ColumnType.numeric, width: "100px" },
+            { property: "objectId", title: "Object Id", type: ColumnType.text },
+            { property: "problem", title: "Alarm Type", type: ColumnType.text },
+            { property: "severity", title: "Severity", type: ColumnType.text, width: "140px" },
+          ]} {...this.props.currentProblemsProperties} {...this.props.currentProblemsActions} />
         </Panel>
-        <Panel activePanel={ activePanel } panelId={ 'AlarmNotifications' } onToggle={ onTogglePanel } title={ `Alarm Notifications ${this.props.faultNotifications.faults.length} since ${this.props.faultNotifications.since}` }>
-          <FaultTable rows={ this.props.faultNotifications.faults } asynchronus columns={ [
+        <Panel activePanel={activePanel} panelId={'AlarmNotifications'} onToggle={onTogglePanel} title={`Alarm Notifications ${this.props.faultNotifications.faults.length} since ${this.props.faultNotifications.since}`}>
+          <FaultAlarmNotificationTable rows={this.props.faultNotifications.faults} asynchronus columns={[
             { property: "icon", title: "", type: ColumnType.custom, customControl: this.renderIcon },
             { property: "timeStamp", title: "Time Stamp" },
             { property: "nodeName", title: "Node Name" },
@@ -102,19 +137,25 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
             { property: "objectId", title: "Object Id" },
             { property: "problem", title: "Alarm Type" },
             { property: "severity", title: "Severity", width: "140px" },
-            ] } idProperty={ '_id' } />
+          ]} idProperty={'id'} />
         </Panel>
-        <Panel activePanel={ activePanel } panelId={ 'AlarmLog' } onToggle={ onTogglePanel } title={ 'Alarm Log' }>
-          <FaultTable idProperty={ '_id' } columns={ [
+        <Panel activePanel={activePanel} panelId={'AlarmLog'} onToggle={onTogglePanel} title={'Alarm Log'}>
+          <FaultTable idProperty={'id'} columns={[
             { property: "icon", title: "", type: ColumnType.custom, customControl: this.renderIcon },
-            { property: "timeStamp", title: "Time Stamp" },
-            { property: "nodeName", title: "Node Name" },
+            { property: "timestamp", title: "Time Stamp" },
+            { property: "nodeId", title: "Node Name" },
             { property: "counter", title: "Count", type: ColumnType.numeric, width: "100px" },
             { property: "objectId", title: "Object Id" },
             { property: "problem", title: "Alarm Type" },
             { property: "severity", title: "Severity", width: "140px" },
-          ] } { ...this.props.alarmLogEntriesProperties } { ...this.props.alarmLogEntriesActions }/>
-         </Panel>
+            { property: "sourceType", title: "Source", width: "140px" },
+          ]} {...this.props.alarmLogEntriesProperties} {...this.props.alarmLogEntriesActions} />
+        </Panel>
+        {
+          this.state.clearAlarmDialogMode !== ClearStuckAlarmsDialogMode.None && <ClearStuckAlarmsDialog mode={this.state.clearAlarmDialogMode} numberDevices={this.state.stuckAlarms.length} stuckAlarms={this.state.stuckAlarms} onClose={this.onDialogClose} />
+
+        }
+
       </>
     );
   };
@@ -123,9 +164,9 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
     this.props.alarmLogEntriesActions.onToggleFilter();
     this.props.currentProblemsActions.onToggleFilter();
   }
-  private renderIcon = (props: { rowData: Fault }) => {
+  private renderIcon = (props: { rowData: Fault | FaultAlarmNotification }) => {
     return (
-      <FontAwesomeIcon icon={ faExclamationTriangle } />
+      <FontAwesomeIcon icon={faExclamationTriangle} />
     );
   };
 
diff --git a/sdnr/wt/odlux/apps/faultApp/webpack.config.js b/sdnr/wt/odlux/apps/faultApp/webpack.config.js
index bbf33ea2f..66926edfb 100644
--- a/sdnr/wt/odlux/apps/faultApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/faultApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      faultApp: ["./plugin.tsx"]
+      faultApp: ["./pluginFault.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -125,23 +125,23 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181/",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181/",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181/",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181/",
           secure: false
         },
         "/websocket/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181/",
           ws: true,
           changeOrigin: true,
           secure: false
diff --git a/sdnr/wt/odlux/apps/helpApp/package.json b/sdnr/wt/odlux/apps/helpApp/package.json
index 0445046a8..1f106ab65 100644
--- a/sdnr/wt/odlux/apps/helpApp/package.json
+++ b/sdnr/wt/odlux/apps/helpApp/package.json
@@ -20,26 +20,26 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*",
-     "marked" : "0.6.0",
-     "@types/marked": "0.6.0",
-     "highlight.js" : "9.13.1",
-     "@types/highlight.js": "9.12.3",
-     "github-markdown-css": "2.10.0"
-   },
+  "dependencies": {
+    "@odlux/framework": "*",
+    "marked": "0.6.0",
+    "@types/marked": "0.6.0",
+    "highlight.js": "9.13.1",
+    "@types/highlight.js": "9.12.3",
+    "github-markdown-css": "2.10.0"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml
index b88c233c3..8f8b59a9a 100644
--- a/sdnr/wt/odlux/apps/helpApp/pom.xml
+++ b/sdnr/wt/odlux/apps/helpApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-helpApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-helpApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/helpApp/src/components/helpStatus.tsx b/sdnr/wt/odlux/apps/helpApp/src/components/helpStatus.tsx
index c4a531837..140935715 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/components/helpStatus.tsx
+++ b/sdnr/wt/odlux/apps/helpApp/src/components/helpStatus.tsx
@@ -57,7 +57,7 @@ class HelpStatusComponent extends React.Component<HelpStatusComponentProps> {
     const { classes, history, toc, appId } = this.props;
     const rootNode = toc && toc.find(t => t.id === "sdnr");
     const helpNode = appId
-      ? rootNode && rootNode.nodes && rootNode.nodes.find(n => n.id === appId || n.id === appId+"App")
+      ? rootNode && rootNode.nodes && rootNode.nodes.find(n => n.id === appId || n.id === appId + "App")
       : rootNode;
     return helpNode
       ? (
@@ -76,5 +76,5 @@ class HelpStatusComponent extends React.Component<HelpStatusComponentProps> {
 
 }
 
-export const HelpStatus = withRouter(withStyles(styles)(connect(mapProps)(HelpStatusComponent)));
+export const HelpStatus = withRouter(withStyles(styles)(connect(mapProps)(HelpStatusComponent) as any) as any);
 export default HelpStatus;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/helpApp/src/components/subMenuEntry.tsx b/sdnr/wt/odlux/apps/helpApp/src/components/subMenuEntry.tsx
deleted file mode 100644
index e4e37290c..000000000
--- a/sdnr/wt/odlux/apps/helpApp/src/components/subMenuEntry.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';
-
-import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
-import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { TreeView, TreeViewCtorType } from '../../../../framework/src/components/material-ui/treeView';
-
-import { ListItemText } from '@material-ui/core';
-
-import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
-
-import { TocTreeNode } from '../models/tocNode';
-
-const TocTree = TreeView as any as TreeViewCtorType<TocTreeNode>;
-
-const mapProps = (state: IApplicationStoreState) => ({
-  helpToc: state.help.toc,
-  helpBusy: state.help.busy
-});
-
-const mapDisp = (dispatcher: IDispatcher) => ({
-  requestDocument: (node: TocTreeNode) => dispatcher.dispatch(new NavigateToApplication("help", node.uri))
-});
-
-const SubMenuEntryComponent: React.SFC<Connect<typeof mapProps, typeof mapDisp>> = (props) => {
-  return props.helpToc
-  ? (
-    <TocTree items={ props.helpToc } contentProperty={ "label" } childrenProperty={ "nodes" } depthOffset={ 1 }
-        useFolderIcons={ false } enableSearchBar={ false } onItemClick={ props.requestDocument } />
-    )
-  : (
-    <ListItemText >Loading ...</ListItemText>
-  )
-};
-
-export const SubMenuEntry = connect(mapProps, mapDisp)(SubMenuEntryComponent);
-export default SubMenuEntry;
-
diff --git a/sdnr/wt/odlux/apps/helpApp/src/components/tocEntry.tsx b/sdnr/wt/odlux/apps/helpApp/src/components/tocEntry.tsx
new file mode 100644
index 000000000..fc7b8dff5
--- /dev/null
+++ b/sdnr/wt/odlux/apps/helpApp/src/components/tocEntry.tsx
@@ -0,0 +1,82 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from "react"
+import { TocTreeNode } from "../models/tocNode"
+import { Typography, Link, makeStyles, Theme, createStyles } from "@material-ui/core"
+
+const useStyles = makeStyles((theme: Theme) =>
+    createStyles({
+        link: {
+            color: "blue",
+        },
+        sublink: {
+            margin: theme.spacing(1),
+            color: "blue",
+        },
+        container: {
+            display: "flex",
+            flexDirection: "row",
+            flexWrap: "wrap",
+        }
+    }),
+);
+
+type tocEntryProps = {
+    label: string,
+    overviewUri: string,
+    nodes?: TocTreeNode[],
+    loadDocument(uri: string): any
+}
+
+const TocEntry: React.FunctionComponent<tocEntryProps> = (props) => {
+    const classes = useStyles();
+    const areNodesEmpty = !props.nodes || props.nodes.length === 0
+
+    const navigate = (event: React.SyntheticEvent, uri: string) => {
+        event.preventDefault();
+        event.stopPropagation();
+        props.loadDocument(uri);
+    }
+
+    return (<div>
+        {
+            areNodesEmpty ? <Typography variant="h6">
+                <Link onClick={(event: any) => navigate(event, props.overviewUri)} className={classes.link}> {props.label}</Link>
+            </Typography> :
+                <>
+                    <Typography variant="h6">
+                        {props.label}
+                    </Typography>
+                    <div className={classes.container}>
+                        <Typography variant="body1">
+                            <Link onClick={(event: any) => navigate(event, props.overviewUri)} className={classes.sublink}>Overview</Link>
+                        </Typography>
+                        {props.nodes !== undefined && props.nodes.map((item, index) =>
+                            <Typography variant="body1" key={index + 'x' + item.id}>
+                                <Link onClick={(event: any) => navigate(event, item.uri)} className={classes.sublink}>{item.label}</Link>
+                            </Typography>
+                        )}
+                    </div>
+                </>
+        }
+    </div >)
+}
+
+
+export default TocEntry;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/helpApp/src/handlers/helpAppRootHandler.ts b/sdnr/wt/odlux/apps/helpApp/src/handlers/helpAppRootHandler.ts
index 9c58238f8..cc6a98488 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/handlers/helpAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/helpApp/src/handlers/helpAppRootHandler.ts
@@ -35,14 +35,14 @@ declare module '../../../../framework/src/store/applicationStore' {
   }
 }
 
-const helpAppStoreStateInit: IHelpAppStoreState = {
+const helpAppStoreStatcurrentPatheInit: IHelpAppStoreState = {
   busy: false,
   toc: undefined,
   content: undefined,
   currentPath: undefined
 };
 
-export const helpAppRootHandler: IActionHandler<IHelpAppStoreState> = (state = helpAppStoreStateInit, action) => {
+export const helpAppRootHandler: IActionHandler<IHelpAppStoreState> = (state = helpAppStoreStatcurrentPatheInit, action) => {
   if (action instanceof LoadTocAction) {
     state = {
       ...state,
diff --git a/sdnr/wt/odlux/apps/helpApp/src/index.html b/sdnr/wt/odlux/apps/helpApp/src/index.html
index e76109fd8..2344708c8 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/index.html
+++ b/sdnr/wt/odlux/apps/helpApp/src/index.html
@@ -14,15 +14,15 @@
   <script type="text/javascript" src="./require.js"></script>
   <script type="text/javascript" src="./config.js"></script>
   <script>
-     // run the application
-      require(["app", "connectApp", "faultApp", "maintenanceApp", "configurationApp", "helpApp"], function (app, connectApp, faultApp, maintenanceApp, configurationApp, helpApp) {
-        connectApp.register();
-        faultApp.register();
-        configurationApp.register();
-        maintenanceApp.register();
-        helpApp.register();
-        app("./app.tsx").runApplication();
-      });
+    // run the application
+    require(["app", "helpApp"], function (app, helpApp) {
+      //connectApp.register();
+      //faultApp.register();
+      //configurationApp.register();
+      //maintenanceApp.register();
+      helpApp.register();
+      app("./app.tsx").runApplication();
+    });
   </script>
 </body>
 
diff --git a/sdnr/wt/odlux/apps/helpApp/src/plugin.tsx b/sdnr/wt/odlux/apps/helpApp/src/plugin.tsx
index 77c2992c4..50a264b15 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/helpApp/src/plugin.tsx
@@ -30,10 +30,10 @@ import { requestTocAsyncAction, requestDocumentAsyncActionCreator } from "./acti
 import { helpAppRootHandler } from './handlers/helpAppRootHandler';
 
 import { HelpApplication } from './views/helpApplication';
-import { SubMenuEntry } from "./components/subMenuEntry";
 import { HelpStatus } from "./components/helpStatus";
 
 import '!style-loader!css-loader!highlight.js/styles/default.css';
+import HelpTocApp from "./views/helpTocApp";
 
 const mapProps = (state: IApplicationStoreState) => ({
 
@@ -48,6 +48,7 @@ const mapDisp = (dispatcher: IDispatcher) => ({
 let currentHelpPath: string | undefined = undefined;
 
 const HelpApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ '0'?: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
+
   if (currentHelpPath !== props.match.params["0"]) {
     // route parameter has changed
     currentHelpPath = props.match.params["0"] || undefined;
@@ -58,6 +59,7 @@ const HelpApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComp
       }
     });
   }
+
   return (
     <HelpApplication />
   )
@@ -65,8 +67,9 @@ const HelpApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComp
 
 const App = withRouter((props: RouteComponentProps) => (
   <Switch>
-    <Route path={ `${ props.match.path }/*` } component={ HelpApplicationRouteAdapter } />
-    <Redirect to={ `${ props.match.path }` } />
+    <Route exact path={`${props.match.path}/`} component={HelpTocApp} />
+    <Route path={`${props.match.path}/*`} component={HelpApplicationRouteAdapter} />
+    <Route path={`${props.match.path}`} component={HelpTocApp} />
   </Switch>
 ));
 
@@ -78,7 +81,7 @@ export async function register() {
     rootActionHandler: helpAppRootHandler,
     statusBarElement: HelpStatus,
     menuEntry: "Help",
-    subMenuEntry: SubMenuEntry
+    //subMenuEntry: SubMenuEntry 
   });
 
   // start the initial toc request after the application store is initalized
diff --git a/sdnr/wt/odlux/apps/helpApp/src/services/helpService.ts b/sdnr/wt/odlux/apps/helpApp/src/services/helpService.ts
index 43c483fe8..c8b247832 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/services/helpService.ts
+++ b/sdnr/wt/odlux/apps/helpApp/src/services/helpService.ts
@@ -28,7 +28,7 @@ class HelpService {
     if (this.documents[path]) return Promise.resolve(this.documents[path]);
 
     // request the document
-    const result = await requestRest<string>(`/help/${ path }`.replace(/\/{2,}/i, '/'));
+    const result = await requestRest<string>(`/help/${path}`.replace(/\/{2,}/i, '/'));
     if (result) {
       this.documents[path] = result;
     }
@@ -41,9 +41,9 @@ class HelpService {
 
     // request the table of contents
     const result = await requestRest<TocNodeCollection>('/help/?meta', undefined, false);
-    if (result !== false) {
+    if (result !== null) {
       const mapNodesCollection = (col: TocNodeCollection): TocTreeNode[] => {
-        return Object.keys(col).reduce <TocTreeNode[]>((acc, key) => {
+        return Object.keys(col).reduce<TocTreeNode[]>((acc, key) => {
           const current = col[key];
           acc.push({
             id: key,
@@ -57,7 +57,7 @@ class HelpService {
 
       this.tocNodeCollection = result && mapNodesCollection(result);
     }
-    return this.tocNodeCollection  || null;
+    return this.tocNodeCollection || null;
   }
 }
 
diff --git a/sdnr/wt/odlux/apps/helpApp/src/views/helpApplication.tsx b/sdnr/wt/odlux/apps/helpApp/src/views/helpApplication.tsx
index 6cc89fb85..b4de26d50 100644
--- a/sdnr/wt/odlux/apps/helpApp/src/views/helpApplication.tsx
+++ b/sdnr/wt/odlux/apps/helpApp/src/views/helpApplication.tsx
@@ -39,7 +39,7 @@ class HelpApplicationComponent extends React.Component<HelpApplicationComponentP
   /**
    * Initializes a new instance.
    */
-  constructor (props: HelpApplicationComponentProps) {
+  constructor(props: HelpApplicationComponentProps) {
     super(props);
 
     this.renderer = new marked.Renderer();
diff --git a/sdnr/wt/odlux/apps/helpApp/src/views/helpTocApp.tsx b/sdnr/wt/odlux/apps/helpApp/src/views/helpTocApp.tsx
new file mode 100644
index 000000000..65d4609e2
--- /dev/null
+++ b/sdnr/wt/odlux/apps/helpApp/src/views/helpTocApp.tsx
@@ -0,0 +1,55 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 connect, { Connect, IDispatcher } from "../../../../framework/src/flux/connect";
+
+import { NavigateToApplication } from "../../../../framework/src/actions/navigationActions";
+import * as React from 'react'
+import { FunctionComponent } from "react";
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import TocEntry from "../components/tocEntry";
+import { Typography } from "@material-ui/core";
+
+const mapProps = (state: IApplicationStoreState) => ({
+    helpToc: state.help.toc,
+})
+
+const mapDisp = (dispatcher: IDispatcher) => ({
+    requestDocument: (uri: string) => dispatcher.dispatch(new NavigateToApplication("help", uri))
+});
+
+const HelpTocComponent: FunctionComponent<Connect<typeof mapProps, typeof mapDisp>> = (props) => {
+
+    return (
+        <div>
+            <Typography style={{ marginBottom: '30px' }} variant="h5">
+                Help &amp; FAQ
+            </Typography>
+            <Typography style={{ marginBottom: '30px' }} variant="body1">
+                On our Help site, you can find general information about SDN-R, detailed information about our applications, frequently asked questions and a list of used abbreviations.
+            </Typography>
+            {
+                props.helpToc && props.helpToc.map((item, index) => <TocEntry key={index} overviewUri={item.uri} nodes={item.nodes} label={item.label} loadDocument={props.requestDocument} />)
+            }
+        </div>
+    )
+}
+
+export const HelpTocApp = connect(mapProps, mapDisp)(HelpTocComponent)
+
+export default HelpTocApp;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/helpApp/webpack.config.js b/sdnr/wt/odlux/apps/helpApp/webpack.config.js
index 3a56d8bea..14ab528a7 100644
--- a/sdnr/wt/odlux/apps/helpApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/helpApp/webpack.config.js
@@ -143,23 +143,23 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/websocket/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:48181",
           ws: true,
           changeOrigin: true,
           secure: false
diff --git a/sdnr/wt/odlux/apps/inventoryApp/package.json b/sdnr/wt/odlux/apps/inventoryApp/package.json
index 79308234e..9e004c112 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/package.json
+++ b/sdnr/wt/odlux/apps/inventoryApp/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml
index a958542e3..86c5e8381 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml
+++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-inventoryApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts
index 2ab0cebe4..786f6d0c5 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts
@@ -1,20 +1,20 @@
 /**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+* ============LICENSE_START========================================================================
+* ONAP : ccsdk feature sdnr wt odlux
+* =================================================================================================
+* Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+*/
 // main state handler
 
 import { combineActionHandler } from '../../../../framework/src/flux/middleware';
@@ -40,5 +40,6 @@ const actionHandlers = {
   inventoryElements: inventoryElementsActionHandler
 };
 
-export const faultAppRootHandler = combineActionHandler<IInventoryAppStateState>(actionHandlers);
-export default faultAppRootHandler;
+export const inventoryAppRootHandler = combineActionHandler<IInventoryAppStateState>(actionHandlers);
+export default inventoryAppRootHandler;
+
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx
index 7766634fb..a65319efa 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx
@@ -23,7 +23,7 @@ import { InventoryType } from '../models/inventory';
 export interface IInventoryElementsState extends IExternalTableState<InventoryType> { }
 
 // create eleactic search material data fetch handler
-const inventoryElementsSearchHandler = createSearchDataHandler<InventoryType>("sdnevents/inventoryequipment");
+const inventoryElementsSearchHandler = createSearchDataHandler<InventoryType>("inventory");
 
 export const {
   actionHandler: inventoryElementsActionHandler,
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/models/inventory.ts b/sdnr/wt/odlux/apps/inventoryApp/src/models/inventory.ts
index 8c70acbf3..9d747415f 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/models/inventory.ts
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/models/inventory.ts
@@ -19,7 +19,7 @@ export { HitEntry, Result } from '../../../../framework/src/models';
 export type InventoryType = {
   treeLevel: number;
   parentUuid: string;
-  mountpoint: string;
+  nodeId: string;
   uuid: string;
   containedHolder?: (string)[] | null;
   manufacturerName?: string ;
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/pluginInventory.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/pluginInventory.tsx
new file mode 100644
index 000000000..ad53285cb
--- /dev/null
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/pluginInventory.tsx
@@ -0,0 +1,75 @@
+/**
+* ============LICENSE_START========================================================================
+* ONAP : ccsdk feature sdnr wt odlux
+* =================================================================================================
+* Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+*/
+// app configuration and main entry point for the app
+
+import * as React from "react";
+import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom';
+import { faShoppingBag } from '@fortawesome/free-solid-svg-icons'; // select app icon
+import applicationManager from '../../../framework/src/services/applicationManager';
+
+import connect, { Connect, IDispatcher } from '../../../framework/src/flux/connect';
+import { IApplicationStoreState } from "../../../framework/src/store/applicationStore";
+
+import { Dashboard } from './views/dashboard';
+import inventoryAppRootHandler from './handlers/inventoryAppRootHandler';
+
+import { createInventoryElementsProperties, createInventoryElementsActions, inventoryElementsReloadAction } from "./handlers/inventoryElementsHandler";
+
+let currentMountId: string | undefined = undefined;
+
+const mapProps = (state: IApplicationStoreState) => ({
+  inventoryProperties: createInventoryElementsProperties(state),
+});
+
+const mapDisp = (dispatcher: IDispatcher) => ({
+  inventoryActions: createInventoryElementsActions(dispatcher.dispatch, true)
+});
+
+const InventoryApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ mountId?: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
+  if (currentMountId !== props.match.params.mountId) {
+    currentMountId = props.match.params.mountId || undefined;
+    window.setTimeout(() => {
+      if (currentMountId) {
+        props.inventoryActions.onFilterChanged("nodeId", currentMountId);
+        props.inventoryProperties.showFilter;
+        props.inventoryActions.onRefresh();
+      }
+    });
+  }
+  return (
+    <Dashboard />
+  )
+});
+
+const App = withRouter((props: RouteComponentProps) => (
+  <Switch>
+    <Route path={`${props.match.path}/:mountId?`} component={InventoryApplicationRouteAdapter} />
+    <Redirect to={`${props.match.path}`} />
+  </Switch>
+));
+
+export function register() {
+  applicationManager.registerApplication({
+    name: "inventory",
+    icon: faShoppingBag,
+    rootActionHandler: inventoryAppRootHandler,
+    rootComponent: App,
+    menuEntry: "Inventory"
+  });
+}
+
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
index 0d7244e4d..bd182ed5d 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
@@ -38,7 +38,7 @@ const mapDispatch = (dispatcher: IDispatcher) => ({
 class DashboardComponent extends React.Component<Connect<typeof mapProps, typeof mapDispatch>> {
   render() {
     return <InventoryTable title="Inventory" idProperty="_id" columns={[
-      { property: "mountpoint", title: "Mountpoint" },
+      { property: "nodeId", title: "Node Name" },
       { property: "manufacturerIdentifier", title: "Manufacturer" },
       { property: "parentUuid", title: "Parent" },
       { property: "uuid", title: "Name" },
@@ -56,7 +56,7 @@ class DashboardComponent extends React.Component<Connect<typeof mapProps, typeof
 
   componentDidMount() {
     this.props.inventoryElementsActions.onToggleFilter();
-    this.props.inventoryElementsActions.onHandleRequestSort("mountpoint");
+    this.props.inventoryElementsActions.onHandleRequestSort("node-id");
   }
 }
 
diff --git a/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js b/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
index 2af2bdb95..426763803 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      inventoryApp: ["./plugin.tsx"]
+      inventoryApp: ["./pluginInventory.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -128,23 +128,23 @@ module.exports = (env) => {
       proxy: {
 
         "/oauth2/": {
-          target: "http://localhost:3000",
+          target: "http://localhost:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:3000",
+          target: "http://localhost:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:3000",
+          target: "http://localhost:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:3000",
+          target: "http://localhost:48181",
           secure: false
         },
         "/websocket/": {
-          target: "http://localhost:3000",
+          target: "http://localhost:48181",
           ws: true,
           changeOrigin: true,
           secure: false
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/package.json b/sdnr/wt/odlux/apps/maintenanceApp/package.json
index 175fce4d5..96f9f7d2b 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/package.json
+++ b/sdnr/wt/odlux/apps/maintenanceApp/package.json
@@ -20,22 +20,22 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*",
-     "@odlux/connect-app": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*",
+    "@odlux/connect-app": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
-}
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
index aa574cf91..ccd0dbf09 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
+++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-maintenanceApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
index 15ac64721..162d94367 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
@@ -22,7 +22,9 @@ import { MaintenenceEntry, spoofSymbol } from '../models/maintenenceEntryType';
 import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 
+
 import { maintenenceService } from '../services/maintenenceService';
+import { maintenanceEntriesReloadAction } from '../handlers/maintenenceEntriesHandler';
 
 export class BaseAction extends Action { }
 
@@ -37,42 +39,6 @@ export class AllMainteneceEntriesLoadedAction extends BaseAction {
 }
 
 
-export const loadAllMainteneceEntriesAsyncAction = (dispatch: Dispatch , getState: () => IApplicationStoreState) => {
-  dispatch(new LoadAllMainteneceEntriesAction());
-  // frist get all entries from the maintenance index
-  maintenenceService.getAllMaintenenceEntries().then(entries => {
-    if (!entries) {
-      dispatch(new AddSnackbarNotification({ message: `Error reading maintenece sessings.`, options: { variant: 'error' } }));
-      return;
-    }
-
-    // combine ell entries from the maintenance index with all networkelements
-    const networkElements = getState().connect.mountedNetworkElements;
-    const maintenenceEntries = networkElements.elements.reduce((acc, cur) => {
-      const entry = entries.find(e => e.mountId === cur.mountId);
-      acc.push(entry || {
-        [spoofSymbol]: true,
-        _id: cur.mountId,
-        mountId: cur.mountId,
-        description : "",
-        start: "",
-        end: "",
-        active: false
-      });
-      return acc;
-    }, [] as MaintenenceEntry[]);
-
-    // all all entries from the maintenance index which are not in all networkelements
-    entries.forEach(entry => {
-      if (maintenenceEntries.findIndex(e => e.mountId === entry.mountId) < 0) {
-        maintenenceEntries.push(entry);
-      };
-    });
-
-    dispatch(new AllMainteneceEntriesLoadedAction(maintenenceEntries));
-  }).catch(error => dispatch(new AllMainteneceEntriesLoadedAction(null, error)));
-}
-
 export class UpdateMaintenanceEntry extends BaseAction {
   constructor(public maintenenceEntry: MaintenenceEntry) {
     super();
@@ -85,8 +51,9 @@ export const addOrUpdateMaintenenceEntryAsyncActionCreator = (entry: Maintenence
     result && window.setTimeout(() => {
       // dispatch(loadAllMountedNetworkElementsAsync);
       dispatch(new UpdateMaintenanceEntry(entry));
-      dispatch(new AddSnackbarNotification({ message: `Successfully ${result && result.created ? "created" : "updated"} maintenece sessings for [${entry.mountId}]`, options: { variant: 'success' } }));
+      dispatch(new AddSnackbarNotification({ message: `Successfully ${result && result.created ? "created" : "updated"} maintenance settings for [${entry.nodeId}]`, options: { variant: 'success' } }));
     }, 900);
+    dispatch(maintenanceEntriesReloadAction)
   });
 };
 
@@ -94,18 +61,18 @@ export const addOrUpdateMaintenenceEntryAsyncActionCreator = (entry: Maintenence
 export const removeFromMaintenenceEntrysAsyncActionCreator = (entry: MaintenenceEntry) => (dispatch: Dispatch) => {
   maintenenceService.deleteMaintenenceEntry(entry).then(result => {
     result && window.setTimeout(() => {
-      //dispatch(loadAllMountedNetworkElementsAsync);
       dispatch(new UpdateMaintenanceEntry({
         [spoofSymbol]: true,
         _id: entry._id,
-        mountId: entry.mountId,
-        description : "",
+        nodeId: entry.nodeId,
+        description: "",
         start: "",
         end: "",
         active: false
       }));
-      dispatch(new AddSnackbarNotification({ message: `Successfully removed [${entry.mountId}]`, options: { variant: 'success' } }));
+      dispatch(new AddSnackbarNotification({ message: `Successfully removed [${entry.nodeId}]`, options: { variant: 'success' } }));
     }, 900);
+    dispatch(maintenanceEntriesReloadAction)
   });
 };
 
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/components/editMaintenenceEntryDialog.tsx b/sdnr/wt/odlux/apps/maintenanceApp/src/components/editMaintenenceEntryDialog.tsx
index 55953f497..e0cd51493 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/components/editMaintenenceEntryDialog.tsx
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/components/editMaintenenceEntryDialog.tsx
@@ -121,9 +121,9 @@ class EditMaintenenceEntryDIalogComponent extends React.Component<EditMaintenenc
           <DialogContentText>
             {setting.dialogDescription}
           </DialogContentText>
-          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.mountId} onChange={(event) => { this.setState({ mountId: event.target.value }); }} />
-          <TextField disabled={!setting.enableTimeEditor} spellCheck={false} autoFocus margin="dense" id="start" label="Start" type="datetime-local" fullWidth value={this.state.start} onChange={(event) => { this.setState({ start: event.target.value }); }} />
-          <TextField disabled={!setting.enableTimeEditor} spellCheck={false} autoFocus margin="dense" id="end" label="End" type="datetime-local" fullWidth value={this.state.end} onChange={(event) => { this.setState({ end: event.target.value }); }} />
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.nodeId} onChange={(event) => { this.setState({ nodeId: event.target.value }); }} />
+          <TextField disabled={!setting.enableTimeEditor} spellCheck={false} autoFocus margin="dense" id="start" label="Start (Local DateTime)" type="datetime-local" fullWidth value={this.state.start} onChange={(event) => { this.setState({ start: event.target.value }); }} />
+          <TextField disabled={!setting.enableTimeEditor} spellCheck={false} autoFocus margin="dense" id="end" label="End (Local DateTime)" type="datetime-local" fullWidth value={this.state.end} onChange={(event) => { this.setState({ end: event.target.value }); }} />
           <FormControl fullWidth disabled={!setting.enableTimeEditor}>
             <InputLabel htmlFor="active">Active</InputLabel>
             <Select value={ this.state.active || false } onChange={(event) => {
@@ -137,8 +137,8 @@ class EditMaintenenceEntryDIalogComponent extends React.Component<EditMaintenenc
         <DialogActions>
           <Button onClick={(event) => {
             this.onApply({
-              _id: this.state._id || this.state.mountId,
-              mountId: this.state.mountId,
+              _id: this.state._id || this.state.nodeId,
+              nodeId: this.state.nodeId,
               description: this.state.description,
               start: this.state.start,
               end: this.state.end,
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
index aa0fb758b..71b4bf70d 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
@@ -21,23 +21,20 @@ import { combineActionHandler } from '../../../../framework/src/flux/middleware'
 
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 
-import { IConnectAppStoreState } from '../../../connectApp/src/handlers/connectAppRootHandler';
-
-import { IMaintenenceEntriesState, maintenenceEntriesActionHandler } from './maintenenceEntriesHandler';
+import { IMaintenanceEntriesState, maintenanceEntriesActionHandler } from './maintenenceEntriesHandler';
 
 export interface IMaintenanceAppStoreState {
-  maintenenceEntries : IMaintenenceEntriesState
+  maintenenceEntries : IMaintenanceEntriesState
 }
 
 declare module '../../../../framework/src/store/applicationStore' {
   interface IApplicationStoreState {
-    maintenance: IMaintenanceAppStoreState,
-    connect: IConnectAppStoreState
+    maintenance: IMaintenanceAppStoreState
   }
 }
 
 const actionHandlers = {
-  maintenenceEntries: maintenenceEntriesActionHandler
+  maintenenceEntries: maintenanceEntriesActionHandler
 };
 
 export const maintenanceAppRootHandler = combineActionHandler<IMaintenanceAppStoreState>(actionHandlers);
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenenceEntriesHandler.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenenceEntriesHandler.ts
index 4ae8baa38..445541889 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenenceEntriesHandler.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenenceEntriesHandler.ts
@@ -15,43 +15,21 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-import { IActionHandler } from '../../../../framework/src/flux/action';
+import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
+import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
 import { MaintenenceEntry } from '../models/maintenenceEntryType';
-import { LoadAllMainteneceEntriesAction, AllMainteneceEntriesLoadedAction, UpdateMaintenanceEntry } from '../actions/maintenenceActions';
+export interface IMaintenanceEntriesState extends IExternalTableState<MaintenenceEntry> { }
 
-export interface IMaintenenceEntriesState {
-  entries: MaintenenceEntry[];
-  busy: boolean;
-}
+// create eleactic search material data fetch handler
+const maintenanceEntriesSearchHandler = createSearchDataHandler<MaintenenceEntry>('maintenance');
 
-const maintenanceEntriesStateInit: IMaintenenceEntriesState = {
-  entries: [],
-  busy: false
-};
+export const {
+  actionHandler: maintenanceEntriesActionHandler,
+  createActions: createmaintenanceEntriesActions,
+  createProperties: createmaintenanceEntriesProperties,
+  reloadAction: maintenanceEntriesReloadAction,
+
+  // set value action, to change a value
+} = createExternal<MaintenenceEntry>(maintenanceEntriesSearchHandler, appState => appState.maintenance.maintenenceEntries);
 
-export const maintenenceEntriesActionHandler: IActionHandler<IMaintenenceEntriesState> = (state = maintenanceEntriesStateInit, action) => {
-  if (action instanceof LoadAllMainteneceEntriesAction){
-    state = {
-      ...state,
-      busy: true,
-    }
-  } else if (action instanceof AllMainteneceEntriesLoadedAction){
-    state = {
-      ...state,
-      entries: action.maintenenceEntries || [],
-      busy: false,
-    }
-  } else if (action instanceof UpdateMaintenanceEntry) {
-    const index = state.entries.findIndex(e => action.maintenenceEntry.mountId === e.mountId);
-    state = {
-      ...state,
-      entries: index > -1 ? [
-        ...state.entries.slice(0, index),
-        action.maintenenceEntry,
-        ...state.entries.slice(index+1),
-      ] : [...state.entries, action.maintenenceEntry]
-    }
-  }
-  return state;
-}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/models/maintenenceEntryType.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/models/maintenenceEntryType.ts
index f90d300be..989bfbdc3 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/models/maintenenceEntryType.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/models/maintenenceEntryType.ts
@@ -16,30 +16,18 @@
  * ============LICENSE_END==========================================================================
  */
 /** Represents the elestic search db type for maintenence enrties */
-export type MaintenenceEntryType = {
-    node: string;
-    // According to the arrangement from 2019.02.15 there will be currently only one element in the filters array.
-    filter: [{
-      definition: { "object-id-ref": string ,problem: string},
-      description: string,
-      /** The end date for the maintenence mode formated as ISO date string in UTC.  */
-      end: string,
-      /** The start date for the maintenence mode formated as ISO date string in UTC.  */
-      start: string
-    }],
-    /** Determines if the filter set is activated or not. */
-    active: boolean;
-}
+
 
 export const spoofSymbol = Symbol("Spoof");
 
 /** Represents the type for an maintenence entry. */
 export type MaintenenceEntry = {
-  [spoofSymbol]?: boolean;
   _id: string;
-  mountId: string;
-  description: string;
-  start: string;
-  end: string;
-  active: boolean;
-}
\ No newline at end of file
+  nodeId: string;
+  description?: string,
+  end: string,
+  start: string
+  active: boolean
+  [spoofSymbol]?: boolean;
+}
+
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx b/sdnr/wt/odlux/apps/maintenanceApp/src/pluginMaintenance.tsx
index e6ab977b3..e6ab977b3 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/pluginMaintenance.tsx
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/services/maintenenceService.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/services/maintenenceService.ts
index 7da5e912b..daa6082d7 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/services/maintenenceService.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/services/maintenenceService.ts
@@ -18,8 +18,10 @@
 import { requestRest } from '../../../../framework/src/services/restService';
 import { Result, HitEntry, PostResponse, DeleteResponse } from '../../../../framework/src/models/elasticSearch';
 
-import { MaintenenceEntryType, MaintenenceEntry } from '../models/maintenenceEntryType';
-import { convertToLocaleString, convertToGMTString } from '../utils/timeUtils';
+import { MaintenenceEntry } from '../models/maintenenceEntryType';
+import { convertToLocaleString, convertToGMTString, convertToISODateString } from '../utils/timeUtils';
+import { convertPropertyNames, replaceUpperCase } from '../../../../framework/src/utilities/yangHelper';
+
 
 export const maintenenceEntryDatabasePath = "mwtn/maintenancemode";
 
@@ -27,60 +29,23 @@ export const maintenenceEntryDatabasePath = "mwtn/maintenancemode";
  * Represents a web api accessor service for all maintenence entries related actions.
  */
 class MaintenenceService {
-  /**
-    * Gets all maintenence entries from the backend.
-    */
-  public async getAllMaintenenceEntries(): Promise<(MaintenenceEntry[]) | null> {
-    const path = `database/${maintenenceEntryDatabasePath}/_search`;
-    const query = { "query": { "match_all": {} } };
-
-    const result = await requestRest<Result<MaintenenceEntryType>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.hits && result.hits.hits && result.hits.hits.map(me => me._source && me._source.filter[0] && ({
-      _id: me._id,
-      mountId: me._source.node,
-      description: me._source.filter[0].description,
-      start: me._source.filter[0].start && convertToLocaleString(me._source.filter[0].start),
-      end: me._source.filter[0].end && convertToLocaleString(me._source.filter[0].end),
-      active: me._source.active
-    })) || null;
-  }
-
-  /**
-    * Gets one maintenence entry by its mountId from the backend.
-    */
-  public async getMaintenenceEntryByMountId(mountId: string): Promise<(MaintenenceEntry) | null> {
-    const path = `database/${maintenenceEntryDatabasePath}/${mountId}`;
-
-    const result = await requestRest<HitEntry<MaintenenceEntryType> & { found: boolean }>(path, { method: "GET" });
-    return result && result.found && result._source && result._source.filter[0] && {
-      _id: result._id,
-      mountId: result._source.node,
-      description: result._source.filter[0].description,
-      start: result._source.filter[0].start && convertToLocaleString(result._source.filter[0].start),
-      end: result._source.filter[0].end && convertToLocaleString(result._source.filter[0].end),
-      active: result._source.active
-    } || null;
-  }
 
   /**
   * Adds or updates one maintenence entry to the backend.
   */
   public async writeMaintenenceEntry(maintenenceEntry: MaintenenceEntry): Promise<PostResponse | null> {
-    const path = `database/${maintenenceEntryDatabasePath}/${maintenenceEntry._id}`;
-    const data: MaintenenceEntryType = {
-      node: maintenenceEntry.mountId,
-      filter: [
-        {
-          definition: { "object-id-ref": "", problem: "" },
-          description: "",
-          start: convertToGMTString(maintenenceEntry.start),
-          end: convertToGMTString(maintenenceEntry.end)
-        }
-      ],
-      active: maintenenceEntry.active
+    const path = `/restconf/operations/data-provider:create-maintenance`;
+
+    const query = {
+      "id": maintenenceEntry._id,
+      "node-id": maintenenceEntry.nodeId,
+      "active": maintenenceEntry.active,
+      "description": maintenenceEntry.description,
+      "end": convertToISODateString(maintenenceEntry.end),
+      "start": convertToISODateString(maintenenceEntry.start)
     };
 
-    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify(data) });
+    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
     return result || null;
   }
 
@@ -88,9 +53,17 @@ class MaintenenceService {
   * Deletes one maintenence entry by its mountId from the backend.
   */
   public async deleteMaintenenceEntry(maintenenceEntry: MaintenenceEntry): Promise<(DeleteResponse) | null> {
-    const path = `database/${maintenenceEntryDatabasePath}/${maintenenceEntry._id}`;
+    const path = `/restconf/operations/data-provider:delete-maintenance`;
 
-    const result = await requestRest<DeleteResponse>(path, { method: "DELETE" });
+    const query = {
+      "id": maintenenceEntry._id,
+      "node-id": maintenenceEntry.nodeId,
+      "active": maintenenceEntry.active,
+      "description": maintenenceEntry.description,
+      "end": convertToISODateString(maintenenceEntry.end),
+      "start": convertToISODateString(maintenenceEntry.start)
+    };
+    const result = await requestRest<DeleteResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
     return result || null;
   }
 }
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/utils/timeUtils.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/utils/timeUtils.ts
index cdb31e698..676be1a38 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/utils/timeUtils.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/utils/timeUtils.ts
@@ -36,4 +36,10 @@ export function convertToLocaleString(rawDate: string| number): string {
     '-' + pad(date.getDate()) +
     'T' + pad(date.getHours()) +
     ':' + pad(date.getMinutes());
+}
+
+export function convertToISODateString(rawDate: string| number): string {
+  const date = new Date(rawDate);
+  const displayDate = date.toISOString();
+  return displayDate.replace(/\.[0-9]{2}/, '.');
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx b/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
index d68205cd8..3b7879351 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
@@ -33,13 +33,11 @@ import connect, { IDispatcher, Connect } from '../../../../framework/src/flux/co
 import MaterialTable, { MaterialTableCtorType, ColumnType } from '../../../../framework/src/components/material-table';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 
-import { loadAllMountedNetworkElementsAsync } from '../../../connectApp/src/actions/mountedNetworkElementsActions';
-
-import { loadAllMainteneceEntriesAsyncAction } from '../actions/maintenenceActions';
 import { MaintenenceEntry, spoofSymbol } from '../models/maintenenceEntryType';
 
 import EditMaintenenceEntryDialog, { EditMaintenenceEntryDialogMode } from '../components/editMaintenenceEntryDialog';
 import { convertToLocaleString } from '../utils/timeUtils';
+import { createmaintenanceEntriesActions, createmaintenanceEntriesProperties, maintenanceEntriesReloadAction } from '../handlers/maintenenceEntriesHandler';
 
 const styles = (theme: Theme) => createStyles({
   button: {
@@ -48,8 +46,8 @@ const styles = (theme: Theme) => createStyles({
     minWidth: 'unset'
   },
   spacer: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit,
+    marginLeft: theme.spacing(1),
+    marginRight: theme.spacing(1),
     display: "inline"
   }
 });
@@ -57,20 +55,19 @@ const styles = (theme: Theme) => createStyles({
 const MaintenenceEntriesTable = MaterialTable as MaterialTableCtorType<MaintenenceEntry>;
 
 const mapProps = (state: IApplicationStoreState) => ({
-   maintenenceEntries: state.maintenance.maintenenceEntries.entries,
-   busy: state.maintenance.maintenenceEntries.busy
+  maintenanceEntriesProperties: createmaintenanceEntriesProperties(state)
 });
 
 const mapDispatcher = (dispatcher: IDispatcher) => ({
-  onLoadMenteneceEntries: async () => {
-    await dispatcher.dispatch(loadAllMountedNetworkElementsAsync)
-    dispatcher.dispatch(loadAllMainteneceEntriesAsyncAction);
+  maintenanceEntriesActions: createmaintenanceEntriesActions(dispatcher.dispatch),
+  onLoadMaintenanceEntries: async () => {
+    await dispatcher.dispatch(maintenanceEntriesReloadAction)
   }
 });
 
 const emptyMaintenenceEntry: MaintenenceEntry = {
   _id: '',
-  mountId: '',
+  nodeId: '',
   description: '',
   start: convertToLocaleString(new Date().valueOf()),
   end: convertToLocaleString(new Date().valueOf()),
@@ -88,7 +85,7 @@ type MaintenenceViewComponentState = {
 
 class MaintenenceViewComponent extends React.Component<MaintenenceViewComponentProps, MaintenenceViewComponentState> {
 
-  constructor (props: MaintenenceViewComponentProps) {
+  constructor(props: MaintenenceViewComponentProps) {
     super(props);
 
     this.state = {
@@ -117,39 +114,42 @@ class MaintenenceViewComponent extends React.Component<MaintenenceViewComponentP
     const now = new Date().valueOf();
     return (
       <>
-        <MaintenenceEntriesTable asynchronus rows={this.props.maintenenceEntries} customActionButtons={[ addMaintenenceEntryAction ]} columns={
-        [
-            { property: "mountId", title: "Mount Id", type: ColumnType.text },
+        <MaintenenceEntriesTable title={"Maintenance"} customActionButtons={[addMaintenenceEntryAction]} columns={
+          [
+            { property: "nodeId", title: "Node Name", type: ColumnType.text },
             {
               property: "notifications", title: "Notification", width: 50, align: "center", type: ColumnType.custom, customControl: ({ rowData }) => (
                 rowData.active && (Date.parse(rowData.start).valueOf() <= now) && (Date.parse(rowData.end).valueOf() >= now) && <FontAwesomeIcon icon={faBan} /> || null
               )
             },
-          { property: "active", title: "Activation State", type: ColumnType.boolean, labels: { "true": "active", "false": "not active" }, },
-          { property: "start", title: "Start Date", type: ColumnType.text },
-          { property: "end", title: "End Date", type: ColumnType.text },
-          { property: "actions", title: "Actions", type: ColumnType.custom, customControl : ({ rowData })=>(
-            <>
-              <div className={classes.spacer}>
-                <Tooltip title={"1h from now"} ><Button className={classes.button} onClick={ (event) => this.onOpenPlus1hEditMaintenenceEntryDialog(event, rowData)} >+1h</Button></Tooltip>
-                <Tooltip title={"8h from now"} ><Button className={classes.button} onClick={(event) => this.onOpenPlus8hEditMaintenenceEntryDialog(event, rowData)} >+8h</Button></Tooltip>
-              </div>
-              <div className={classes.spacer}>
-                <Tooltip title={"Edit"} ><IconButton className={classes.button} onClick={(event) => this.onOpenEditMaintenenceEntryDialog(event, rowData)} ><EditIcon /></IconButton></Tooltip>
-                <Tooltip title={"Remove"} ><IconButton disabled={ !!rowData[spoofSymbol] } className={classes.button} onClick={(event) => this.onOpenRemoveMaintenenceEntryDialog(event, rowData)} ><RemoveIcon /></IconButton></Tooltip>
-              </div>
-            </>
-          ) },
-        ]
-        } idProperty={'_id'}> </MaintenenceEntriesTable>
+            { property: "active", title: "Activation State", type: ColumnType.boolean, labels: { "true": "active", "false": "not active" }, },
+            { property: "start", title: "Start Date (UTC)", type: ColumnType.text },
+            { property: "end", title: "End Date (UTC)", type: ColumnType.text },
+            {
+              property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => (
+                <>
+                  <div className={classes.spacer}>
+                    <Tooltip title={"1h from now"} ><Button className={classes.button} onClick={(event) => this.onOpenPlus1hEditMaintenenceEntryDialog(event, rowData)} >+1h</Button></Tooltip>
+                    <Tooltip title={"8h from now"} ><Button className={classes.button} onClick={(event) => this.onOpenPlus8hEditMaintenenceEntryDialog(event, rowData)} >+8h</Button></Tooltip>
+                  </div>
+                  <div className={classes.spacer}>
+                    <Tooltip title={"Edit"} ><IconButton className={classes.button} onClick={(event) => this.onOpenEditMaintenenceEntryDialog(event, rowData)} ><EditIcon /></IconButton></Tooltip>
+                    <Tooltip title={"Remove"} ><IconButton disabled={!!rowData[spoofSymbol]} className={classes.button} onClick={(event) => this.onOpenRemoveMaintenenceEntryDialog(event, rowData)} ><RemoveIcon /></IconButton></Tooltip>
+                  </div>
+                </>
+              )
+            },
+          ]
+        } idProperty={'_id'}{...this.props.maintenanceEntriesActions} {...this.props.maintenanceEntriesProperties} asynchronus > </MaintenenceEntriesTable>
         <EditMaintenenceEntryDialog initialMaintenenceEntry={this.state.maintenenceEntryToEdit} mode={this.state.maintenenceEntryEditorMode}
-          onClose={ this.onCloseEditMaintenenceEntryDialog } />
-       </>
+          onClose={this.onCloseEditMaintenenceEntryDialog} />
+      </>
     );
   }
 
-  componentDidMount(){
-    this.props.onLoadMenteneceEntries();
+  public componentDidMount() {
+    this.props.maintenanceEntriesActions.onRefresh();
+    this.props.onLoadMaintenanceEntries();
   }
 
   private onOpenPlus1hEditMaintenenceEntryDialog = (event: React.MouseEvent<HTMLElement>, entry: MaintenenceEntry) => {
@@ -186,13 +186,13 @@ class MaintenenceViewComponent extends React.Component<MaintenenceViewComponentP
     event.preventDefault();
     event.stopPropagation();
     const startTime = (new Date().valueOf());
-    const endTime = startTime ;
+    const endTime = startTime;
     this.setState({
       maintenenceEntryToEdit: {
         ...entry,
         ...(entry.start && endTime)
-          ? { start: entry.start, end: entry.end }
-          : { start: convertToLocaleString(startTime), end: convertToLocaleString(endTime)}
+          ? { start: convertToLocaleString(entry.start), end: convertToLocaleString(entry.end) }
+          : { start: convertToLocaleString(startTime), end: convertToLocaleString(endTime) }
       },
       maintenenceEntryEditorMode: EditMaintenenceEntryDialogMode.EditMaintenenceEntry
     });
@@ -207,7 +207,7 @@ class MaintenenceViewComponent extends React.Component<MaintenenceViewComponentP
       maintenenceEntryToEdit: {
         ...entry,
         ...(entry.start && endTime)
-          ? { start: entry.start, end: entry.end }
+          ? { start: convertToLocaleString(entry.start), end: convertToLocaleString(entry.end) }
           : { start: convertToLocaleString(startTime), end: convertToLocaleString(endTime) }
       },
       maintenenceEntryEditorMode: EditMaintenenceEntryDialogMode.RemoveMaintenenceEntry
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js b/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
index 325e70380..e6d968564 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      maintenanceApp: ["./plugin.tsx"]
+      maintenanceApp: ["./pluginMaintenance.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -126,12 +126,26 @@ module.exports = (env) => {
         colors: true
       },
       proxy: {
-        "/restconf": {
-          target: "http://localhost:3000",
+        "/oauth2/": {
+          target: "http://10.20.6.29:28181",
           secure: false
         },
-        "/database": {
-          target: "http://localhost:3000",
+        "/database/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/restconf/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/help/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/websocket/": {
+          target: "http://10.20.6.29:28181",
+          ws: true,
+          changeOrigin: true,
           secure: false
         }
       }
diff --git a/sdnr/wt/odlux/apps/mediatorApp/package.json b/sdnr/wt/odlux/apps/mediatorApp/package.json
index cf9cb040d..718d2fd03 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/package.json
+++ b/sdnr/wt/odlux/apps/mediatorApp/package.json
@@ -20,22 +20,22 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
     "@fortawesome/free-solid-svg-icons": "5.6.3",
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml
index e1ff2d5fc..80fdbf569 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml
+++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -8,18 +9,19 @@
         <relativePath/>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-mediatorApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -38,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -62,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -88,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -100,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
index 143dd7d4a..79e46df0e 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
@@ -73,6 +73,12 @@ export class SetMediatorServerSupportedDevices extends BaseAction {
   }
 }
 
+export class SetMediatorServerReachable extends BaseAction {
+  constructor(public isReachable: boolean) {
+    super();
+  }
+}
+
 export const initializeMediatorServerAsyncActionCreator = (serverId: string) => (dispatch: Dispatch) => {
   dispatch(new SetMediatorServerBusy(true));
   mediatorService.getMediatorServerById(serverId).then(mediatorServer => {
@@ -82,18 +88,25 @@ export const initializeMediatorServerAsyncActionCreator = (serverId: string) =>
       dispatch(new NavigateToApplication("mediator"));
       return;
     }
-    dispatch(new SetMediatorServerInfo(mediatorServer._id, mediatorServer.name, mediatorServer.url));
 
-    mediatorService.getMediatorServerVersion(mediatorServer._id).then(versionInfo => {
-      dispatch(new SetMediatorServerVersion(versionInfo));
-    });
+    dispatch(new SetMediatorServerInfo(mediatorServer.id, mediatorServer.name, mediatorServer.url));
 
     Promise.all([
-      mediatorService.getMediatorServerAllConfigs(mediatorServer._id),
-      mediatorService.getMediatorServerSupportedDevices(mediatorServer._id)
-    ]).then(([configurations, supportedDevices]) => {
+      mediatorService.getMediatorServerAllConfigs(mediatorServer.id),
+      mediatorService.getMediatorServerSupportedDevices(mediatorServer.id),
+      mediatorService.getMediatorServerVersion(mediatorServer.id)
+    ]).then(([configurations, supportedDevices, versionInfo]) => {
+      if (configurations === null && supportedDevices === null && versionInfo === null) {
+        dispatch(new SetMediatorServerReachable(false));
+      } else {
+        dispatch(new SetMediatorServerReachable(true));
+      }
       dispatch(new SetAllMediatorServerConfigurations(configurations));
       dispatch(new SetMediatorServerSupportedDevices(supportedDevices));
+      dispatch(new SetMediatorServerVersion(versionInfo));
+      dispatch(new SetMediatorServerBusy(false));
+    }).catch(error => {
+      dispatch(new SetMediatorServerReachable(false));
       dispatch(new SetMediatorServerBusy(false));
     });
   });
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
index 20ece4c22..bcbccccd7 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
@@ -55,8 +55,8 @@ const styles = (theme: Theme) => createStyles({
   },
   fab: {
     position: 'absolute',
-    bottom: theme.spacing.unit,
-    right: theme.spacing.unit,
+    bottom: theme.spacing(1),
+    right: theme.spacing(1),
   },
   title: {
     fontSize: 14,
@@ -72,7 +72,7 @@ const styles = (theme: Theme) => createStyles({
     flexDirection: 'row'
   },
   left: {
-    marginRight: theme.spacing.unit,
+    marginRight: theme.spacing(1),
   },
   right: {
     marginLeft: 0,
@@ -160,16 +160,18 @@ type EditMediatorConfigDialogComponentProps = WithStyles<typeof styles> & Connec
   onClose: () => void;
 };
 
-type EditMediatorConfigDialogComponentState = MediatorConfig & { activeTab: number; activeOdlConfig: string };
+type EditMediatorConfigDialogComponentState = MediatorConfig & { activeTab: number; activeOdlConfig: string, forceAddOdlConfig: boolean, isOdlConfigHostnameEmpty: boolean };
 
 class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConfigDialogComponentProps, EditMediatorConfigDialogComponentState> {
-  constructor (props: EditMediatorConfigDialogComponentProps) {
+  constructor(props: EditMediatorConfigDialogComponentProps) {
     super(props);
 
     this.state = {
       ...this.props.mediatorConfig,
       activeTab: 0,
-      activeOdlConfig: ""
+      activeOdlConfig: "",
+      forceAddOdlConfig: false,
+      isOdlConfigHostnameEmpty: false
     };
   }
 
@@ -195,7 +197,7 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
           <DialogContentText>
             {setting.dialogDescription}
           </DialogContentText>
-          <Tabs value={this.state.activeTab} indicatorColor="primary" textColor="primary" onChange={(event, value) => this.setState({ activeTab: value })} >
+          <Tabs value={this.state.activeTab} indicatorColor="secondary" textColor="secondary" onChange={(event, value) => this.setState({ activeTab: value })} >
             <Tab label="Config" />
             <Tab label="ODL AutoConnect" />
           </Tabs>
@@ -203,8 +205,8 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
             <TextField disabled={setting.readonly || setting.readonlyName} spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.Name} onChange={(event) => { this.setState({ Name: event.target.value }); }} />
             <FormControl fullWidth disabled={setting.readonly}>
               <InputLabel htmlFor="deviceType">Device</InputLabel>
-              <Select value={this.state.DeviceType} onChange={(event) => {
-                const device = this.props.supportedDevices.find(device => device.id === +event.target.value);
+              <Select value={this.state.DeviceType} onChange={(event, value) => {
+                const device = this.props.supportedDevices.find(device => device.id === event.target.value);
                 if (device) {
                   this.setState({
                     DeviceType: device.id,
@@ -242,11 +244,11 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
                 }} ><DeleteIcon /></IconButton>)
                 return (
                   <Panel title={cfg.Server && `${cfg.User ? `${cfg.User}@` : ''}${cfg.Protocol}://${cfg.Server}:${cfg.Port}` || "new odl config"} key={panelId} panelId={panelId} activePanel={this.state.activeOdlConfig} customActionButtons={[deleteButton]}
-                    onToggle={(id) => this.setState({ activeOdlConfig: (this.state.activeOdlConfig === id) ? "" : (id || "") })} >
+                    onToggle={(id) => { this.setState({ activeOdlConfig: (this.state.activeOdlConfig === id) ? "" : (id || "") }); console.log("activeOdlConfig " + id); this.hideHostnameErrormessage(id) }} >
                     <div className={classes.alignInOneLine}>
                       <FormControl className={classes.left} margin={"dense"} >
                         <InputLabel htmlFor={`protocol-${ind}`}>Protocoll</InputLabel>
-                        <Select value={cfg.Protocol} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Protocol", e => (e.target.value))} inputProps={{ name: `protocol-${ind}`, id: `protocol-${ind}` }} fullWidth >
+                        <Select value={cfg.Protocol} onChange={(e, v) => this.odlConfigValueChangeHandlerCreator(ind, "Protocol", e => v)} inputProps={{ name: `protocol-${ind}`, id: `protocol-${ind}` }} fullWidth >
                           <MenuItem value={"http"}>http</MenuItem>
                           <MenuItem value={"https"}>https</MenuItem>
                         </Select>
@@ -254,6 +256,10 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
                       <TextField className={classes.left} spellCheck={false} margin="dense" id="hostname" label="Hostname" type="text" value={cfg.Server} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Server", e => e.target.value)} />
                       <TextField className={classes.right} style={{ maxWidth: "65px" }} spellCheck={false} margin="dense" id="port" label="Port" type="number" value={cfg.Port || ""} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Port", e => +e.target.value)} />
                     </div>
+                    {
+                      this.state.isOdlConfigHostnameEmpty &&
+                      <Typography component={"div"} className={classes.left} color="error" gutterBottom>Please add a hostname.</Typography>
+                    }
                     <div className={classes.alignInOneLine}>
                       <TextField className={classes.left} spellCheck={false} margin="dense" id="username" label="Username" type="text" value={cfg.User} onChange={this.odlConfigValueChangeHandlerCreator(ind, "User", e => e.target.value)} />
                       <TextField className={classes.right} spellCheck={false} margin="dense" id="password" label="Password" type="password" value={cfg.Password} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Password", e => e.target.value)} />
@@ -264,9 +270,15 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
                   </Panel>
                 );
               })
-              : <div className={classes.center} >
-                <Typography component={"div"} className={classes.title} color="textSecondary" gutterBottom>Please add an ODL auto connect configuration.</Typography>
-              </div>
+              : (this.state.forceAddOdlConfig ?
+                <div className={classes.center} >
+                  <Typography component={"div"} className={classes.title} color="error" gutterBottom>Please add at least one ODL auto connect configuration.</Typography>
+                </div>
+                :
+                <div className={classes.center} >
+                  <Typography component={"div"} className={classes.title} color="textSecondary" gutterBottom>Please add an ODL auto connect configuration.</Typography>
+                </div>
+              )
             }
             <Fab className={classes.fab} color="primary" aria-label="Add" onClick={() => this.setState({
               ODLConfig: [...this.state.ODLConfig, { Server: '', Port: 8181, Protocol: 'https', User: 'admin', Password: 'admin', Trustall: false }]
@@ -276,25 +288,76 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
 
         </DialogContent>
         <DialogActions>
-          <Button onClick={(event) => {
-            this.onApply(Object.keys(this.state).reduce<MediatorConfig & { [kex: string]: any }>((acc, key) => {
-              // do not copy activeTab and activeOdlConfig
-              if (key !== "activeTab" && key !== "activeOdlConfig" && key !== "_initialMediatorConfig") acc[key] = (this.state as any)[key];
-              return acc;
-            }, {} as MediatorConfig));
-            event.preventDefault();
-            event.stopPropagation();
-          }} > {setting.applyButtonText} </Button>
+          <Button onClick={(event) => { this.addConfig(event) }} > {setting.applyButtonText} </Button>
           <Button onClick={(event) => {
             this.onCancel();
             event.preventDefault();
             event.stopPropagation();
+            this.resetPanel();
           }} color="secondary"> {setting.cancelButtonText} </Button>
         </DialogActions>
       </Dialog>
     )
   }
 
+  private addConfig = (event: any) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    if (this.state.ODLConfig.length === 0) {
+      this.setState({ activeTab: 1, forceAddOdlConfig: true });
+    }
+    else
+      if (this.state.ODLConfig.length > 0) {
+        for (let i = 0; i <= this.state.ODLConfig.length; i++) {
+          if (this.isHostnameEmpty(i)) {
+            this.setState({ activeOdlConfig: 'panel-' + i })
+            this.setState({ isOdlConfigHostnameEmpty: true })
+            return;
+          }
+        }
+
+        this.onApply(Object.keys(this.state).reduce<MediatorConfig & { [kex: string]: any }>((acc, key) => {
+          // do not copy additional state properties
+          if (key !== "activeTab" && key !== "activeOdlConfig" && key !== "isOdlConfigHostnameEmpty"
+            && key !== "forceAddOdlConfig" && key !== "_initialMediatorConfig") acc[key] = (this.state as any)[key];
+          return acc;
+        }, {} as MediatorConfig));
+        this.resetPanel();
+      }
+  }
+
+  private resetPanel = () => {
+    this.setState({ forceAddOdlConfig: false, isOdlConfigHostnameEmpty: false, activeTab: 0 });
+  }
+
+
+  private hideHostnameErrormessage = (panelId: string | null) => {
+
+    if (panelId) {
+      let id = Number(panelId.split('-')[1]);
+      if (!this.isHostnameEmpty(id)) {
+        this.setState({ isOdlConfigHostnameEmpty: false })
+      }
+    }
+  }
+
+  private isHostnameEmpty = (id: number) => {
+
+    const element = this.state.ODLConfig[id];
+    if (element) {
+      if (!element.Server) {
+        return true;
+      }
+      else {
+        return false
+      }
+
+    } else {
+      return null;
+    }
+  }
+
   private onApply = (config: MediatorConfig) => {
     this.props.onClose && this.props.onClose();
     switch (this.props.mode) {
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
index d38fb0b6e..882a6b37e 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
@@ -29,6 +29,7 @@ import { IDispatcher, connect, Connect } from '../../../../framework/src/flux/co
 
 import { addAvaliableMediatorServerAsyncActionCreator, removeAvaliableMediatorServerAsyncActionCreator, updateAvaliableMediatorServerAsyncActionCreator } from '../actions/avaliableMediatorServersActions';
 import { MediatorServer } from '../models/mediatorServer';
+import { Typography } from '@material-ui/core';
 
 export enum EditMediatorServerDialogMode {
   None = "none",
@@ -94,19 +95,54 @@ type EditMediatorServerDialogComponentProps = Connect<undefined, typeof mapDispa
   onClose: () => void;
 };
 
-type EditMediatorServerDialogComponentState = MediatorServer;
+const urlRegex = RegExp("^https?://");
+
+type EditMediatorServerDialogComponentState = MediatorServer & { errorMessage: string[] };
 
 class EditMediatorServerDialogComponent extends React.Component<EditMediatorServerDialogComponentProps, EditMediatorServerDialogComponentState> {
-  constructor (props: EditMediatorServerDialogComponentProps) {
+  constructor(props: EditMediatorServerDialogComponentProps) {
     super(props);
 
     this.state = {
-      ...this.props.mediatorServer
+      ...this.props.mediatorServer,
+      errorMessage: []
     };
   }
 
+  areFieldsValid = () => {
+    return this.state.name.trim().length > 0 && this.state.url.trim().length > 0 && urlRegex.test(this.state.url);
+  }
+
+  createErrorMessages = () => {
+
+    let messages = [];
+    if (this.state.name.trim().length === 0 && this.state.url.trim().length === 0) {
+      messages.push("The server name and the url must not be empty.")
+    }
+    else
+      if (this.state.url.trim().length === 0) {
+        messages.push("The server url must not be empty.")
+
+      } else if (this.state.name.trim().length === 0) {
+        messages.push("The server name must not be empty.")
+      }
+
+    if (!urlRegex.test(this.state.url)) {
+      if (messages.length > 0) {
+        return messages.concat(["The server url must start with 'http(s)://'."])
+      } else {
+        return ["The server url must start with 'http(s)://'."]
+      }
+    }
+
+    return messages;
+  }
+
+
+
   render(): JSX.Element {
     const setting = settings[this.props.mode];
+
     return (
       <Dialog open={this.props.mode !== EditMediatorServerDialogMode.None}>
         <DialogTitle id="form-dialog-title">{setting.dialogTitle}</DialogTitle>
@@ -117,14 +153,25 @@ class EditMediatorServerDialogComponent extends React.Component<EditMediatorServ
           {/* <TextField disabled spellCheck={false} autoFocus margin="dense" id="id" label="Id" type="text" fullWidth value={ this.state._id } onChange={(event)=>{ this.setState({_id: event.target.value}); } } /> */}
           <TextField disabled={setting.readonly} spellCheck={false} margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.name} onChange={(event) => { this.setState({ name: event.target.value }); }} />
           <TextField disabled={setting.readonly} spellCheck={false} margin="dense" id="url" label="Url" type="text" fullWidth value={this.state.url} onChange={(event) => { this.setState({ url: event.target.value }); }} />
+
+          <Typography id="errorMessage" component={"div"} color="error">{this.state.errorMessage.map((error, index) => <div key={index}>{error}</div>)}</Typography>
+
         </DialogContent>
         <DialogActions>
           <Button onClick={(event) => {
-            this.onApply({
-              _id: this.state._id,
-              name: this.state.name,
-              url: this.state.url,
-            });
+
+            if (this.areFieldsValid()) {
+              this.setState({ errorMessage: [] })
+              this.onApply({
+                id: this.state.id,
+                name: this.state.name,
+                url: this.state.url
+              });
+            } else {
+              const errorMessage = this.createErrorMessages()
+              this.setState({ errorMessage: errorMessage })
+            }
+
             event.preventDefault();
             event.stopPropagation();
           }} > {setting.applyButtonText} </Button>
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/showMeditaorInfoDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/showMeditaorInfoDialog.tsx
new file mode 100644
index 000000000..fd8a2496a
--- /dev/null
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/showMeditaorInfoDialog.tsx
@@ -0,0 +1,107 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react'
+import { Dialog, DialogTitle, DialogContent, DialogActions, TextField, DialogContentText, Checkbox, Button, FormControlLabel, FormGroup } from '@material-ui/core';
+import { IApplicationState } from '../../../../framework/src/handlers/applicationStateHandler';
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
+import connect, { Connect } from '../../../../framework/src/flux/connect';
+import { MediatorConfigResponse } from 'models/mediatorServer';
+import { Panel } from '../../../../framework/src/components/material-ui/panel';
+
+export enum MediatorInfoDialogMode {
+    None = "none",
+    ShowDetails = "showDetails"
+}
+
+const mapProps = (state: IApplicationStoreState) => ({ supportedDevices: state.mediator.mediatorServerState.supportedDevices })
+
+type ShowMediatorInfoDialogComponentProps = Connect<typeof mapProps, undefined> &
+{
+    config: MediatorConfigResponse,
+    mode: MediatorInfoDialogMode,
+    onClose: () => void
+}
+
+type ShowMediatorInfoDialogComponentState = {
+    status: string,
+    devicetype: string,
+    activeOdlConfig: string
+}
+
+/*
+Displays all values of a mediator server 
+*/
+class ShowMediatorInfoDialogComponent extends React.Component<ShowMediatorInfoDialogComponentProps, ShowMediatorInfoDialogComponentState> {
+
+    constructor(props: ShowMediatorInfoDialogComponentProps) {
+        super(props);
+        if (this.props.config) {
+            let deviceType = props.supportedDevices.find(element => element.id === this.props.config.DeviceType)
+
+            this.state = {
+                status: props.config.pid > 0 ? "Running" : "Stopped",
+                devicetype: deviceType != undefined ? deviceType.device : 'none',
+                activeOdlConfig: ''
+            }
+        }
+    }
+
+    onClose = (event: React.MouseEvent) => {
+        event.preventDefault();
+        event.stopPropagation();
+        this.props.onClose();
+    }
+
+    render() {
+        return (
+            <Dialog open={this.props.mode !== MediatorInfoDialogMode.None} onBackdropClick={this.props.onClose} >
+                <DialogTitle>{this.props.config.Name}</DialogTitle>
+                <DialogContent>
+                    <TextField disabled margin="dense" id="deviceIp" label="Device IP" fullWidth defaultValue={this.props.config.DeviceIp} />
+                    <TextField disabled margin="dense" id="deviceport" label="Device Port" fullWidth defaultValue={this.props.config.DevicePort} />
+                    <TextField disabled margin="dense" id="status" label="Status" fullWidth defaultValue={this.state.status} />
+                    <TextField disabled margin="dense" id="deviceType" label="Device Type" fullWidth defaultValue={this.state.devicetype} />
+                    <TextField disabled margin="dense" id="ncPort" label="Netconf Port" fullWidth defaultValue={this.props.config.NcPort} />
+                    <FormGroup>
+                        <FormControlLabel control={<Checkbox disabled defaultChecked={this.props.config.IsNCConnected}></Checkbox>} label="Netconf Connection" />
+                        <FormControlLabel control={<Checkbox disabled defaultChecked={this.props.config.IsNeConnected}></Checkbox>} label="Network Element Connection" />
+                        <FormControlLabel control={<Checkbox disabled defaultChecked={this.props.config.fwactive}></Checkbox>} label="Firewall active" />
+                    </FormGroup>
+                    {
+                        this.props.config.ODLConfig.map((element, index) =>
+                            <Panel title={"ODL config " + (this.props.config.ODLConfig.length > 1 ? index + 1 : '')} key={index} panelId={'panel-' + index} activePanel={this.state.activeOdlConfig} onToggle={(id: string) => { this.setState({ activeOdlConfig: (this.state.activeOdlConfig === id) ? "" : (id || "") }); }}>
+                                <TextField disabled margin="dense" defaultValue={element.Protocol + '://' + element.Server} label="Server" />
+                                <TextField disabled margin="dense" defaultValue={element.Port} label="Port" />
+                                <FormControlLabel control={<Checkbox disabled checked={element.Trustall} />} label="Trustall" />
+                            </Panel>
+                        )
+                    }
+
+                </DialogContent>
+                <DialogActions>
+                    <Button onClick={this.onClose}>Close</Button>
+                </DialogActions>
+            </Dialog>
+        )
+    }
+
+}
+
+export const ShowMediatorInfoDialog = connect(mapProps)(ShowMediatorInfoDialogComponent)
+export default ShowMediatorInfoDialog;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts
index 0d137b396..246634cbe 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorServerHandler.ts
@@ -17,7 +17,7 @@
  */
 import { XmlFileInfo, MediatorConfig, BusySymbol, MediatorConfigResponse, MediatorServerDevice } from "../models/mediatorServer";
 import { IActionHandler } from "../../../../framework/src/flux/action";
-import { SetMediatorServerVersion, SetMediatorServerInfo, SetAllMediatorServerConfigurations, SetMediatorServerBusy, SetMediatorServerSupportedDevices } from "../actions/mediatorServerActions";
+import { SetMediatorServerVersion, SetMediatorServerInfo, SetAllMediatorServerConfigurations, SetMediatorServerBusy, SetMediatorServerSupportedDevices, SetMediatorServerReachable } from "../actions/mediatorServerActions";
 import { SetMediatorBusyByName, UpdateMediatorConfig, AddMediatorConfig, RemoveMediatorConfig } from "../actions/mediatorConfigActions";
 
 export type MediatorServerState = {
@@ -30,6 +30,7 @@ export type MediatorServerState = {
   nexmls: XmlFileInfo[];
   configurations: MediatorConfigResponse[];
   supportedDevices: MediatorServerDevice[];
+  isReachable: boolean;
 }
 
 const mediatorServerInit: MediatorServerState = {
@@ -41,7 +42,8 @@ const mediatorServerInit: MediatorServerState = {
   mediatorVersion: null,
   nexmls: [],
   configurations: [],
-  supportedDevices: []
+  supportedDevices: [],
+  isReachable: true
 }
 
 export const mediatorServerHandler: IActionHandler<MediatorServerState> = (state = mediatorServerInit, action) => {
@@ -111,6 +113,8 @@ export const mediatorServerHandler: IActionHandler<MediatorServerState> = (state
         ...state.configurations.slice(index + 1)
       ]
     };
+  } else if( action instanceof SetMediatorServerReachable){
+    state = {...state, isReachable: action.isReachable}
   }
   return state;
 } 
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts b/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts
index a2b54599c..6ab6db8b3 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/models/mediatorServer.ts
@@ -16,7 +16,7 @@
  * ============LICENSE_END==========================================================================
  */
 export type MediatorServer = {
-   _id: string;
+   id: string;
    name: string;
    url: string;
 } 
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts b/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts
index b257fa92c..aee086689 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts
@@ -19,9 +19,9 @@ import * as $ from 'jquery';
 
 import { requestRest, formEncode } from '../../../../framework/src/services/restService';
 import { MediatorServer, MediatorServerVersionInfo, MediatorConfig, MediatorServerDevice, MediatorConfigResponse } from '../models/mediatorServer';
-import { HitEntry } from '../../../../framework/src/models';
+import { PostResponse, DeleteResponse, Result } from '../../../../framework/src/models';
 
-export const mediatorServerResourcePath = "mwtn/mediator-server";
+export const mediatorServerResourcePath = "mediator-server";
 
 type MediatorServerResponse<TData> = { code: number, data: TData };
 type IndexableMediatorServer = MediatorServer & { [key: string]: any; };
@@ -33,46 +33,68 @@ class MediatorService {
   /**
     * Inserts data into the mediator servers table.
     */
-  public async insertMediatorServer(server: IndexableMediatorServer): Promise<MediatorServer | null> {
-    const path = `database/${mediatorServerResourcePath}`;
-    const data = Object.keys(server).reduce((acc, cur) => {
-      if (cur !== "_id") acc[cur] = server[cur];
-      return acc;
-    }, {} as IndexableMediatorServer);
-    const result = await requestRest<MediatorServer>(path, { method: "POST", body: JSON.stringify(data) });
+  public async insertMediatorServer(server: IndexableMediatorServer): Promise<PostResponse | null> {
+    const path = `/restconf/operations/data-provider:create-mediator-server`;
+
+    const data = {
+      "url": server.url,
+      "name": server.name
+    }
+
+    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify({ input: data }) });
     return result || null;
   }
 
   /**
     * Updates data into the mediator servers table.
     */
-  public async updateMediatorServer(server: IndexableMediatorServer): Promise<MediatorServer | null> {
-    const path = `database/${mediatorServerResourcePath}/${server._id}`;
-    const data = Object.keys(server).reduce((acc, cur) => {
-      if (cur !== "_id") { acc[cur] = server[cur] } else { acc["id"] = 0 };
-      return acc;
-    }, {} as IndexableMediatorServer);
-    const result = await requestRest<MediatorServer>(path, { method: "PUT", body: JSON.stringify(data) });
+  public async updateMediatorServer(server: IndexableMediatorServer): Promise<PostResponse | null> {
+    const path = `/restconf/operations/data-provider:update-mediator-server`;
+
+    const data = {
+      "id": server.id,
+      "url": server.url,
+      "name": server.name
+    }
+
+    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify({ input: data }) });
     return result || null;
   }
 
   /**
     * Deletes data from the mediator servers table.
     */
-  public async deleteMediatorServer(server: MediatorServer): Promise<MediatorServer | null> {
-    const path = `database/${mediatorServerResourcePath}/${server._id}`;
-    const result = await requestRest<MediatorServer>(path, { method: "DELETE" });
+  public async deleteMediatorServer(server: MediatorServer): Promise<DeleteResponse | null> {
+    const path = `/restconf/operations/data-provider:delete-mediator-server`;
+
+    const data = {
+      "id": server.id,
+    }
+
+    const result = await requestRest<DeleteResponse>(path, { method: "POST", body: JSON.stringify({ input: data }) });
     return result || null;
   }
 
   public async getMediatorServerById(serverId: string): Promise<MediatorServer | null> {
-    const path = `database/${mediatorServerResourcePath}/${serverId}`;
-    const result = await requestRest<HitEntry<MediatorServer> & { found: boolean }>(path, { method: "GET" });
-    return result && result.found && result._source && {
-      _id: result._id,
-      name: result._source.name,
-      url: result._source.url,
-    } || null;
+    const path = `/restconf/operations/data-provider:read-mediator-server-list`;
+
+    const data = { "filter": [{ "property": "id", "filtervalue": serverId }] }
+
+
+    const result = await requestRest<Result<MediatorServer>>(path, { method: "POST", body: JSON.stringify({ input: data }) });
+
+    if (result && result.output.data[0]) {
+      const firstResult = result.output.data[0];
+
+      return {
+        id: firstResult.id,
+        name: firstResult.name,
+        url: firstResult.url
+      }
+    }
+    else {
+      return null;
+    }
   }
 
   // https://cloud-highstreet-technologies.com/wiki/doku.php?id=att:ms:api
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
index fcb3fe46f..945e13507 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
@@ -36,6 +36,7 @@ import { MediatorConfig, BusySymbol, MediatorConfigResponse } from '../models/me
 import EditMediatorConfigDialog, { EditMediatorConfigDialogMode } from '../components/editMediatorConfigDialog';
 import { startMediatorByNameAsyncActionCreator, stopMediatorByNameAsyncActionCreator } from '../actions/mediatorConfigActions';
 import mediatorService from '../services/mediatorService';
+import { ShowMediatorInfoDialog, MediatorInfoDialogMode } from '../components/showMeditaorInfoDialog'
 
 const styles = (theme: Theme) => createStyles({
   root: {
@@ -44,7 +45,7 @@ const styles = (theme: Theme) => createStyles({
     flex: '1',
   },
   formControl: {
-    margin: theme.spacing.unit,
+    margin: theme.spacing(1),
     minWidth: 300,
   },
   button: {
@@ -53,8 +54,8 @@ const styles = (theme: Theme) => createStyles({
     minWidth: 'unset'
   },
   spacer: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit,
+    marginLeft: theme.spacing(1),
+    marginRight: theme.spacing(1),
     display: "inline"
   },
   progress: {
@@ -75,6 +76,7 @@ const mapProps = (state: IApplicationStoreState) => ({
   configurations: state.mediator.mediatorServerState.configurations,
   supportedDevices: state.mediator.mediatorServerState.supportedDevices,
   busy: state.mediator.mediatorServerState.busy,
+  isReachable: state.mediator.mediatorServerState.isReachable
 });
 
 const mapDispatch = (dispatcher: IDispatcher) => ({
@@ -96,13 +98,16 @@ const emptyMediatorConfig: MediatorConfig = {
 };
 
 const MediatorServerConfigurationsTable = MaterialTable as MaterialTableCtorType<MediatorConfigResponse>;
+const MediatorServerUnreachableTable = MaterialTable as MaterialTableCtorType<{ Name: string, status: string, ipAdress: string, device: string, actions: string }>
 
 type MediatorApplicationComponentProps = Connect<typeof mapProps, typeof mapDispatch> & WithStyles<typeof styles>;
 
 type MediatorServerSelectionComponentState = {
   busy: boolean,
   mediatorConfigToEdit: MediatorConfig,
-  mediatorConfigEditorMode: EditMediatorConfigDialogMode
+  mediatorConfigEditorMode: EditMediatorConfigDialogMode,
+  mediatorShowInfoMode: MediatorInfoDialogMode,
+  mediatorConfigToDisplay: MediatorConfigResponse | null
 }
 
 class MediatorApplicationComponent extends React.Component<MediatorApplicationComponentProps, MediatorServerSelectionComponentState> {
@@ -114,6 +119,8 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo
       busy: false,
       mediatorConfigToEdit: emptyMediatorConfig,
       mediatorConfigEditorMode: EditMediatorConfigDialogMode.None,
+      mediatorShowInfoMode: MediatorInfoDialogMode.None,
+      mediatorConfigToDisplay: null
     }
   }
 
@@ -135,7 +142,7 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo
           </Tooltip>
         </div>
         <div className={classes.spacer}>
-          <Tooltip title={"Info"} ><IconButton className={classes.button}><InfoIcon /></IconButton></Tooltip>
+          <Tooltip title={"Info"} ><IconButton className={classes.button} onClick={(event) => { this.onOpenInfoDialog(event, rowData) }}><InfoIcon /></IconButton></Tooltip>
         </div>
         <div className={classes.spacer}>
           {process.env.NODE_ENV === "development" ? <Tooltip title={"Edit"} ><IconButton disabled={rowData[BusySymbol]} className={classes.button} onClick={event => this.onOpenEditConfigurationDialog(event, rowData)}><EditIcon /></IconButton></Tooltip> : null}
@@ -145,24 +152,38 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo
     );
 
     const addMediatorConfigAction = { icon: AddIcon, tooltip: 'Add', onClick: this.onOpenAddConfigurationDialog };
+
     return (
       <div className={classes.root}>
         {this.props.busy || this.state.busy
           ? <div className={classes.progress}> <CircularProgress color={"secondary"} size={48} /> </div>
-          : <MediatorServerConfigurationsTable title={this.props.serverName || ''} customActionButtons={[addMediatorConfigAction]} idProperty={"Name"} rows={this.props.configurations} asynchronus columns={[
-            { property: "Name", title: "Mediator", type: ColumnType.text },
-            { property: "Status", title: "Status", type: ColumnType.custom, customControl: ({ rowData }) => rowData.pid ? (<span>Running</span>) : (<span>Stopped</span>) },
-            { property: "DeviceIp", title: "IP Adress", type: ColumnType.text },
-            {
-              property: "Device", title: "Device", type: ColumnType.custom, customControl: ({ rowData }) => {
-                const dev = this.props.supportedDevices && this.props.supportedDevices.find(dev => dev.id === rowData.DeviceType);
-                return (
-                  <span> {dev && `${dev.vendor} - ${dev.device} (${dev.version || '0.0.0'})`} </span>
-                )
-              }
-            },
-            { property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => renderActions(rowData) },
-          ]} />
+          :
+
+          this.props.isReachable ?
+
+            <MediatorServerConfigurationsTable title={this.props.serverName || ''} customActionButtons={[addMediatorConfigAction]} idProperty={"Name"} rows={this.props.configurations} asynchronus columns={[
+              { property: "Name", title: "Mediator", type: ColumnType.text },
+              { property: "Status", title: "Status", type: ColumnType.custom, customControl: ({ rowData }) => rowData.pid ? (<span>Running</span>) : (<span>Stopped</span>) },
+              { property: "DeviceIp", title: "IP Adress", type: ColumnType.text },
+              {
+                property: "Device", title: "Device", type: ColumnType.custom, customControl: ({ rowData }) => {
+                  const dev = this.props.supportedDevices && this.props.supportedDevices.find(dev => dev.id === rowData.DeviceType);
+                  return (
+                    <span> {dev && `${dev.vendor} - ${dev.device} (${dev.version || '0.0.0'})`} </span>
+                  )
+                }
+              },
+              { property: "actions", title: "Actions", type: ColumnType.custom, customControl: ({ rowData }) => renderActions(rowData) },
+            ]} />
+            :
+            <MediatorServerUnreachableTable title={this.props.serverName || ''} idProperty={"Name"} disableFilter={true} disableSorting={true} enableSelection={false} rows={[{ Name: '', status: "Mediator server not found.", ipAdress: '', device: '', actions: '' }]} columns={[
+              { property: "Name", title: "Mediator", type: ColumnType.text },
+              { property: "status", title: "Status", type: ColumnType.text },
+              { property: "ipAdress", title: "IP Adress", type: ColumnType.text },
+              { property: "device", title: "Device", type: ColumnType.text },
+              { property: "actions", title: "Actions", type: ColumnType.text },
+
+            ]} />
         }
 
         <EditMediatorConfigDialog
@@ -170,17 +191,34 @@ class MediatorApplicationComponent extends React.Component<MediatorApplicationCo
           mode={this.state.mediatorConfigEditorMode}
           onClose={this.onCloseEditMediatorConfigDialog} />
 
+        {
+
+          this.state.mediatorShowInfoMode != MediatorInfoDialogMode.None &&
+          <ShowMediatorInfoDialog
+            config={this.state.mediatorConfigToDisplay as MediatorConfigResponse}
+            mode={this.state.mediatorShowInfoMode}
+            onClose={this.onCloseInfoDialog} />
+        }
       </div>
     );
   }
 
+  private onOpenInfoDialog = (event: React.MouseEvent<HTMLElement>, configEntry: MediatorConfigResponse) => {
+    event.stopPropagation();
+    event.preventDefault();
+    this.setState({ mediatorShowInfoMode: MediatorInfoDialogMode.ShowDetails, mediatorConfigToDisplay: configEntry })
+  }
+
+  private onCloseInfoDialog = () => {
+    this.setState({ mediatorShowInfoMode: MediatorInfoDialogMode.None, mediatorConfigToDisplay: null })
+  }
+
   private onOpenAddConfigurationDialog = () => {
     // Tries to determine a free port for netconf listener and snpm listener
     // it it could not determine free ports the dialog will open any way
     // those ports should not be configured from the fontend, furthermore
     // the backend should auto configure them and tell the user the result
     // after the creation process.
-
     this.setState({
       busy: true,
     });
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
index a23afb5f6..a5b34a2dc 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
@@ -42,8 +42,8 @@ const styles = (theme: Theme) => createStyles({
     minWidth: 'unset',
   },
   spacer: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit,
+    marginLeft: theme.spacing(1),
+    marginRight: theme.spacing(1),
     display: "inline",
   },
 });
@@ -58,7 +58,7 @@ const mapDispatch = (dispatcher: IDispatcher) => ({
 });
 
 const emptyMediatorServer: MediatorServer = {
-  _id: "",
+  id: "",
   name: "",
   url: ""
 };
@@ -72,7 +72,7 @@ type MediatorServerSelectionComponentState = {
 
 class MediatorServerSelectionComponent extends React.Component<MediatorServerSelectionComponentProps, MediatorServerSelectionComponentState> {
 
-  constructor (props: MediatorServerSelectionComponentProps) {
+  constructor(props: MediatorServerSelectionComponentProps) {
     super(props);
 
     this.state = {
@@ -94,7 +94,7 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
     };
     return (
       <>
-        <MediatorServersTable customActionButtons={[addMediatorServerActionButton]} idProperty={"_id"}
+        <MediatorServersTable title={"Mediator"} customActionButtons={[addMediatorServerActionButton]} idProperty={"id"}
           {...this.props.mediatorServersActions} {...this.props.mediatorServersProperties} columns={[
             { property: "name", title: "Name", type: ColumnType.text },
             { property: "url", title: "Url", type: ColumnType.text },
@@ -106,19 +106,23 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
                 </div>
               )
             }
-          ]} onHandleClick={ this.onSelectMediatorServer } />
+          ]} onHandleClick={this.onSelectMediatorServer} />
         <EditMediatorServerDialog
-          mediatorServer={ this.state.mediatorServerToEdit }
-          mode={ this.state.mediatorServerEditorMode }
-          onClose={ this.onCloseEditMediatorServerDialog } />
+          mediatorServer={this.state.mediatorServerToEdit}
+          mode={this.state.mediatorServerEditorMode}
+          onClose={this.onCloseEditMediatorServerDialog} />
       </>
     );
   }
 
-  private onSelectMediatorServer = (event: React.MouseEvent<HTMLElement>, server: MediatorServer) =>{
+  public componentDidMount() {
+    this.props.mediatorServersActions.onToggleFilter();
+  }
+
+  private onSelectMediatorServer = (event: React.MouseEvent<HTMLElement>, server: MediatorServer) => {
     event.preventDefault();
     event.stopPropagation();
-    this.props.selectMediatorServer(server && server._id);
+    this.props.selectMediatorServer(server && server.id);
 
   }
 
diff --git a/sdnr/wt/odlux/apps/mediatorApp/webpack.config.js b/sdnr/wt/odlux/apps/mediatorApp/webpack.config.js
index 94943ecd5..3efe2d015 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/mediatorApp/webpack.config.js
@@ -127,19 +127,29 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:3000",
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/ms/": {
+          target: "http://10.20.6.29:28181",
+          secure: false
+        },
+        "/websocket": {
+          target: "http://10.20.6.29:28181",
+          ws: true,
+          changeOrigin: true,
           secure: false
         }
       }
diff --git a/sdnr/wt/odlux/apps/minimumApp/.fbExcludeFilterFile b/sdnr/wt/odlux/apps/minimumApp/.fbExcludeFilterFile
deleted file mode 100644
index 3cd2303d3..000000000
--- a/sdnr/wt/odlux/apps/minimumApp/.fbExcludeFilterFile
+++ /dev/null
@@ -1,25 +0,0 @@
-<FindBugsFilter>
-  <Match>
-    <Or>
-      <Package name="~.*protobuff\.messages.*" />
-      <Package name="~org\.opendaylight\.yang\.gen\..*" />
-      <Package name="~org\.opendaylight\.controller\.config\.yang\.config\..*" />
-    </Or>
-  </Match>
-
-  <Match>
-    <Or>
-      <!-- Anonymous inner classes are very common in ODL. -->
-      <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON" />
-
-      <!-- We use static slf4j Logger (this rule is from KengoTODA/findbugs-slf4j jp.skypencil.findbugs.slf4:bug-pattern) -->
-      <Bug pattern="SLF4J_LOGGER_SHOULD_BE_NON_STATIC" />
-
-      <!-- Guava 23.6+ uses @NullableDecl which FindBugs doesn't know about; fixed in SpotBugs 3.1.2+ -->
-      <Bug pattern="NP_NONNULL_PARAM_VIOLATION" />
-      <Bug pattern="NP_NULL_PARAM_DEREF" />
-      <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE" />
-      <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" />
-    </Or>
-  </Match>
-</FindBugsFilter>
diff --git a/sdnr/wt/odlux/apps/minimumApp/package.json b/sdnr/wt/odlux/apps/minimumApp/package.json
index f738c6354..d9b18a3ce 100644
--- a/sdnr/wt/odlux/apps/minimumApp/package.json
+++ b/sdnr/wt/odlux/apps/minimumApp/package.json
@@ -20,21 +20,21 @@
   ],
   "author": "Matthias Fischer",
   "license": "Apache-2.0",
-   "dependencies": {
-     "@odlux/framework": "*"
-   },
+  "dependencies": {
+    "@odlux/framework": "*"
+  },
   "peerDependencies": {
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "jquery": "3.3.1",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml
index bdc486ae3..51a8f0a6b 100644
--- a/sdnr/wt/odlux/apps/minimumApp/pom.xml
+++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-minimumApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/package.json b/sdnr/wt/odlux/apps/performanceHistoryApp/package.json
index 290046ef5..1e6adf7c3 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/package.json
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/package.json
@@ -21,23 +21,23 @@
   "author": "Sai Neetha Phulmali",
   "license": "Apache-2.0",
   "dependencies": {
-    "@odlux/framework" : "*",
+    "@odlux/framework": "*",
     "@odlux/connect-app": "*",
-    "react-chartjs-2":"2.7.6",
-    "chart.js":"2.8.0"
+    "react-chartjs-2": "2.7.6",
+    "chart.js": "2.8.0"
   },
   "peerDependencies": {
-     "@types/react": "16.4.14",
-     "@types/react-dom": "16.0.8",
-     "@types/react-router-dom": "4.3.1",
-     "@material-ui/core": "3.8.3",
-     "@material-ui/icons": "3.0.2",
-     "@types/classnames": "2.2.6",
-     "@types/flux": "3.1.8",
-     "@types/jquery": "3.3.10",
-     "jquery": "3.3.1",
-     "react": "16.5.2",
-     "react-dom": "16.5.2",
-     "react-router-dom": "4.3.1"
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
+    "@types/react-router-dom": "4.3.1",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
+    "@types/classnames": "2.2.6",
+    "@types/flux": "3.1.8",
+    "@types/jquery": "3.3.10",
+    "jquery": "3.3.1",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
+    "react-router-dom": "4.3.1"
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml
index 647b9efdb..4fc302f05 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -7,18 +8,20 @@
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>sdnr-wt-odlux-app-performanceHistoryApp</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -37,8 +40,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <sourceDirectory>src2/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src2/test/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -61,10 +77,10 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
@@ -87,7 +103,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.7.1</version>
                 <executions>
@@ -99,8 +115,8 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -130,27 +146,5 @@
                 </configuration>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>odlux</targetPath>
-            </resource>
-            <resource>
-                <directory>src2/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src2/test/resources</directory>
-            </resource>
-        </resources>
     </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/actions/connectedNetworkElementsActions.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/actions/deviceListActions.ts
index 97d531608..9637fec81 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/actions/connectedNetworkElementsActions.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/actions/deviceListActions.ts
@@ -19,7 +19,8 @@ import { Action } from '../../../../framework/src/flux/action';
 import { Dispatch } from '../../../../framework/src/flux/store';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 
-import { ConnectedNetworkElementIds } from '../models/connectedNetworkElements';
+import { DeviceListType } from '../models/deviceListType';
+import { PerformanceHistoryService } from '../services/performanceHistoryService';
 
 /** 
  * Represents the base action. 
@@ -27,52 +28,44 @@ import { ConnectedNetworkElementIds } from '../models/connectedNetworkElements';
 export class BaseAction extends Action { }
 
 /** 
- * Represents an action causing the store to load all connected network element Ids. 
+ * Represents an action causing the store to load all devices. 
  */
-export class LoadAllConnectedNetworkElementsAction extends BaseAction { }
+export class LoadAllDeviceListAction extends BaseAction { }
 
 /** 
- * Represents an action causing the store to update all connected network element Ids. 
+ * Represents an action causing the store to update all devices. 
  */
-export class AllConnectedNetworkElementsLoadedAction extends BaseAction {
+export class AllDeviceListLoadedAction extends BaseAction {
   /**
    * Initialize this instance.
    * 
-   * @param connectedNetworkElements The connected network element Ids which are loaded from the state of connectApp.
+   * @param deviceList All the distinct devices from the performance history database.
    */
-  constructor(public connectedNetworkElementIds: ConnectedNetworkElementIds[] | null, public error?: string) {
+  constructor(public deviceList: DeviceListType[] | null, public error?: string) {
     super();
   }
 }
 
 /** 
- * Represents an asynchronous thunk  action to load all connected network element Ids. 
+ * Represents an asynchronous thunk  action to load all devices. 
  */
-export const loadAllConnectedNetworkElementsAsync = (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
-  window.setTimeout(() => {
-    dispatch(new LoadAllConnectedNetworkElementsAction());
-    const connectedNetworkElementsIds = getState().connect.mountedNetworkElements;
-    let mountIdList: ConnectedNetworkElementIds[] = [];
-    connectedNetworkElementsIds.elements.forEach(element => {
-      const connectedNetworkElement = {
-        mountId: element.mountId
-      }
-      mountIdList.push(connectedNetworkElement);
-    });
-    mountIdList.sort((a, b) => {
-      if (a.mountId < b.mountId) return -1;
-      if (a.mountId > b.mountId) return 1;
-      return 0;
-    });
-    dispatch(new AllConnectedNetworkElementsLoadedAction(mountIdList));
-  }, 500);
+export const loadAllDeviceListAsync = async (dispatch: Dispatch) => {
+  dispatch(new LoadAllDeviceListAction());
+  const deviceListFromPerfHistory: DeviceListType[] = await PerformanceHistoryService.getDeviceListfromPerf15minHistory().then(ne => (ne)) || [];
+  const deviceListFromPerf24History: DeviceListType[] = await PerformanceHistoryService.getDeviceListfromPerf24hHistory().then(ne => (ne)) || [];
+  deviceListFromPerf24History.forEach(deviceList24h => {
+    if (deviceListFromPerfHistory.findIndex(deviceList15min => deviceList15min.nodeId === deviceList24h.nodeId) < 0) {
+      deviceListFromPerfHistory.push(deviceList24h);
+    };
+  });
+  return deviceListFromPerfHistory && dispatch(new AllDeviceListLoadedAction(deviceListFromPerfHistory));
 };
 
 /** 
  * Represents an action causing the store to update mountId. 
  */
 export class UpdateMountId extends BaseAction {
-  constructor (public nodeId?: string) {
+  constructor(public nodeId?: string) {
     super();
   }
 }
@@ -80,6 +73,6 @@ export class UpdateMountId extends BaseAction {
 /** 
  * Represents an asynchronous thunk  action to load updated mountId. 
  */
-export const updateMountIdActionCreator = (nodeId: string ) => async (dispatch: Dispatch) => {
+export const updateMountIdActionCreator = (nodeId: string) => async (dispatch: Dispatch) => {
   return dispatch(new UpdateMountId(nodeId));
 }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
index 2564d574a..09d3accd4 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { AdaptiveModulationDataType } from '../models/adaptiveModulationDataType';
+import { AdaptiveModulationDataType, AdaptiveModulationDatabaseDataType } from '../models/adaptiveModulationDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createAdaptiveModulationProperties, createAdaptiveModulationActions } from '../handlers/adaptiveModulationHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -55,9 +55,9 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
     const adaptiveModulationColumns: ColumnModel<AdaptiveModulationDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -416,10 +416,46 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
     ];
 
     _rows.forEach(row => {
+      row.time2StatesS = row.performanceData.time2StatesS
+      row.time2States = row.performanceData.time2States;
+      row.time2StatesL = row.performanceData.time2StatesL;
+      row.time4StatesS = row.performanceData.time4StatesS
+      row.time4States = row.performanceData.time4States;
+      row.time4StatesL = row.performanceData.time4StatesL;
+      row.time16StatesS = row.performanceData.time16StatesS;
+      row.time16States = row.performanceData.time16States;
+      row.time16StatesL = row.performanceData.time16StatesL;
+      row.time32StatesS = row.performanceData.time32StatesS;
+      row.time32States = row.performanceData.time32States;
+      row.time32StatesL = row.performanceData.time32StatesL;
+      row.time64StatesS = row.performanceData.time64StatesS;
+      row.time64States = row.performanceData.time64States;
+      row.time64StatesL = row.performanceData.time64StatesL;
+      row.time128StatesS = row.performanceData.time128StatesS;
+      row.time128States = row.performanceData.time128States;
+      row.time128StatesL = row.performanceData.time128StatesL;
+      row.time256StatesS = row.performanceData.time256StatesS;
+      row.time256States = row.performanceData.time256States;
+      row.time256StatesL = row.performanceData.time256StatesL;
+      row.time512StatesS = row.performanceData.time512StatesS;
+      row.time512States = row.performanceData.time512States;
+      row.time512StatesL = row.performanceData.time512StatesL;
+      row.time1024StatesS = row.performanceData.time1024StatesS;
+      row.time1024States = row.performanceData.time1024States;
+      row.time1024StatesL = row.performanceData.time1024StatesL;
+      row.time2048StatesS = row.performanceData.time2048StatesS;
+      row.time2048States = row.performanceData.time2048States;
+      row.time2048StatesL = row.performanceData.time2048StatesL;
+      row.time4096StatesS = row.performanceData.time4096StatesS;
+      row.time4096States = row.performanceData.time4096States;
+      row.time4096StatesL = row.performanceData.time4096StatesL;
+      row.time8192StatesS = row.performanceData.time8192StatesS;
+      row.time8192States = row.performanceData.time8192States;
+      row.time8192StatesL = row.performanceData.time8192StatesL;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof AdaptiveModulationDataType] as string,
-          y: row[ds.name as keyof AdaptiveModulationDataType] as string
+          x: row["timeStamp" as keyof AdaptiveModulationDataType] as string,
+          y: row.performanceData[ds.name as keyof AdaptiveModulationDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
index 8718171f7..267e00bbe 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, MaterialTableCtorType, ColumnModel } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { CrossPolarDiscriminationDataType } from '../models/crossPolarDiscriminationDataType';
+import { CrossPolarDiscriminationDataType, CrossPolarDiscriminationDatabaseDataType } from '../models/crossPolarDiscriminationDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createCrossPolarDiscriminationProperties, createCrossPolarDiscriminationActions } from '../handlers/crossPolarDiscriminationHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -56,9 +56,9 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     const cpdColumns: ColumnModel<CrossPolarDiscriminationDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -114,10 +114,13 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     }];
 
     _rows.forEach(row => {
+      row.xpdMin = row.performanceData.xpdMin;
+      row.xpdAvg = row.performanceData.xpdAvg;
+      row.xpdMax = row.performanceData.xpdMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof CrossPolarDiscriminationDataType] as string,
-          y: row[ds.name as keyof CrossPolarDiscriminationDataType] as string
+          x: row["timeStamp" as keyof CrossPolarDiscriminationDataType] as string,
+          y: row.performanceData[ds.name as keyof CrossPolarDiscriminationDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
index fc44879dc..c58c49c9e 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
@@ -22,7 +22,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { PerformanceDataType } from '../models/performanceDataType';
+import { PerformanceDataType, PerformanceDatabaseDataType } from '../models/performanceDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createPerformanceDataProperties, createPerformanceDataActions } from '../handlers/performanceDataHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -54,9 +54,9 @@ class PerformanceDataComponent extends React.Component<PerformanceDataComponentP
     const performanceColumns: ColumnModel<PerformanceDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -112,13 +112,17 @@ class PerformanceDataComponent extends React.Component<PerformanceDataComponentP
     }];
 
     _rows.forEach(row => {
+      row.es = row.performanceData.es;
+      row.ses = row.performanceData.ses;
+      row.unavailability = row.performanceData.unavailability;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof PerformanceDataType] as string,
-          y: row[ds.name as keyof PerformanceDataType] as string
+          x: row["timeStamp" as keyof PerformanceDataType] as string,
+          y: row.performanceData[ds.name as keyof PerformanceDatabaseDataType] as string
         });
       });
     });
+
     return {
       datasets: datasets
     };
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
index 9992f5bd8..55bc39860 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { ReceiveLevelDataType } from '../models/receiveLevelDataType';
+import { ReceiveLevelDataType,ReceiveLevelDatabaseDataType } from '../models/receiveLevelDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createReceiveLevelProperties, createReceiveLevelActions } from '../handlers/receiveLevelHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -55,9 +55,9 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
     const receiveLevelColumns: ColumnModel<ReceiveLevelDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -114,10 +114,13 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
     }];
 
     _rows.forEach(row => {
+      row.rxLevelMin = row.performanceData.rxLevelMin;
+      row.rxLevelAvg = row.performanceData.rxLevelAvg;
+      row.rxLevelMax = row.performanceData.rxLevelMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof ReceiveLevelDataType] as string,
-          y: row[ds.name as keyof ReceiveLevelDataType] as string
+          x: row["timeStamp" as keyof ReceiveLevelDataType] as string,
+          y: row.performanceData[ds.name as keyof ReceiveLevelDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
index 98017ae2f..42aa007a9 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { SignalToInterferenceDataType } from '../models/signalToInteferenceDataType';
+import { SignalToInterferenceDataType, SignalToInterferenceDatabaseDataType } from '../models/signalToInteferenceDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createSignalToInterferenceProperties, createSignalToInterferenceActions } from '../handlers/signalToInterferenceHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -56,9 +56,9 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
     const sinrColumns: ColumnModel<SignalToInterferenceDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -116,10 +116,13 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
     }];
 
     _rows.forEach(row => {
+      row.snirMin = row.performanceData.snirMin;
+      row.snirAvg = row.performanceData.snirAvg;
+      row.snirMax = row.performanceData.snirMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof SignalToInterferenceDataType] as string,
-          y: row[ds.name as keyof SignalToInterferenceDataType] as string
+          x: row["timeStamp" as keyof SignalToInterferenceDataType] as string,
+          y: row.performanceData[ds.name as keyof SignalToInterferenceDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
index f1e62cf33..256911c2d 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { TemperatureDataType } from '../models/temperatureDataType';
+import { TemperatureDataType, TemperatureDatabaseDataType } from '../models/temperatureDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createTemperatureProperties, createTemperatureActions } from '../handlers/temperatureHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -55,9 +55,9 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
     const temperatureColumns: ColumnModel<TemperatureDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -114,10 +114,13 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
     }];
 
     _rows.forEach(row => {
+      row.rfTempMin = row.performanceData.rfTempMin;
+      row.rfTempAvg = row.performanceData.rfTempAvg;
+      row.rfTempMax = row.performanceData.rfTempMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof TemperatureDataType] as string,
-          y: row[ds.name as keyof TemperatureDataType] as string
+          x: row["timeStamp" as keyof TemperatureDataType] as string,
+          y: row.performanceData[ds.name as keyof TemperatureDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
index 8ec4561a4..635cbf103 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { TransmissionPowerDataType } from '../models/transmissionPowerDataType';
+import { TransmissionPowerDataType, TransmissionPowerDatabaseDataType } from '../models/transmissionPowerDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createTransmissionPowerProperties, createTransmissionPowerActions } from '../handlers/transmissionPowerHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -56,9 +56,9 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     const transmissionColumns: ColumnModel<TransmissionPowerDataType>[] = [
       { property: "radioSignalId", title: "Radio signal", type: ColumnType.text },
       { property: "scannerId", title: "Scanner ID", type: ColumnType.text },
-      { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      { property: "timeStamp", title: "End Time", type: ColumnType.text },
       {
-        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+        property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => {
           const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
@@ -116,10 +116,13 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     }];
 
     _rows.forEach(row => {
+      row.txLevelMin = row.performanceData.txLevelMin;
+      row.txLevelAvg = row.performanceData.txLevelAvg;
+      row.txLevelMax = row.performanceData.txLevelMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof TransmissionPowerDataType] as string,
-          y: row[ds.name as keyof TransmissionPowerDataType] as string
+          x: row["timeStamp" as keyof TransmissionPowerDataType] as string,
+          y: row.performanceData[ds.name as keyof TransmissionPowerDatabaseDataType] as string
         });
       });
     });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/adaptiveModulationHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/adaptiveModulationHandler.ts
index ba765c8cb..3548bf4dc 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/adaptiveModulationHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/adaptiveModulationHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { AdaptiveModulationDataType, AdaptiveModulationResult } from '../models/adaptiveModulationDataType';
+import { AdaptiveModulationDataType } from '../models/adaptiveModulationDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface IAdaptiveModulationState extends IExternalTableState<AdaptiveModulationDataType> { }
@@ -26,66 +26,7 @@ export interface IAdaptiveModulationState extends IExternalTableState<AdaptiveMo
 /**
  * Creates elastic search material data fetch handler for Adaptive modulation from historicalperformance database.
  */
-const adaptiveModulationSearchHandler = createSearchDataHandler<AdaptiveModulationResult, AdaptiveModulationDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        time2StatesS: hit._source["performance-data"]["time2-states-s"],
-        time2States: hit._source["performance-data"]["time2-states"],
-        time2StatesL: hit._source["performance-data"]["time2-states-l"],
-        time4StatesS: hit._source["performance-data"]["time4-states-s"],
-        time4States: hit._source["performance-data"]["time4-states"],
-        time4StatesL: hit._source["performance-data"]["time4-states-l"],
-        time16StatesS: hit._source["performance-data"]["time16-states-s"],
-        time16States: hit._source["performance-data"]["time16-states"],
-        time16StatesL: hit._source["performance-data"]["time16-states-l"],
-        time32StatesS: hit._source["performance-data"]["time32-states-s"],
-        time32States: hit._source["performance-data"]["time32-states"],
-        time32StatesL: hit._source["performance-data"]["time32-states-l"],
-        time64StatesS: hit._source["performance-data"]["time64-states-s"],
-        time64States: hit._source["performance-data"]["time64-states"],
-        time64StatesL: hit._source["performance-data"]["time64-states-l"],
-        time128StatesS: hit._source["performance-data"]["time128-states-s"],
-        time128States: hit._source["performance-data"]["time128-states"],
-        time128StatesL: hit._source["performance-data"]["time128-states-l"],
-        time256StatesS: hit._source["performance-data"]["time256-states-s"],
-        time256States: hit._source["performance-data"]["time256-states"],
-        time256StatesL: hit._source["performance-data"]["time256-states-l"],
-        time512StatesS: hit._source["performance-data"]["time512-states-s"],
-        time512States: hit._source["performance-data"]["time512-states"],
-        time512StatesL: hit._source["performance-data"]["time512-states-l"],
-        time1024StatesS: hit._source["performance-data"]["time1024-states-s"],
-        time1024States: hit._source["performance-data"]["time1024-states"],
-        time1024StatesL: hit._source["performance-data"]["time1024-states-l"],
-        time2048StatesS: hit._source["performance-data"]["time2048-states-s"],
-        time2048States: hit._source["performance-data"]["time2048-states"],
-        time2048StatesL: hit._source["performance-data"]["time2048-states-l"],
-        time4096StatesS: hit._source["performance-data"]["time4096-states-s"],
-        time4096States: hit._source["performance-data"]["time4096-states"],
-        time4096StatesL: hit._source["performance-data"]["time4096-states-l"],
-        time8192StatesS: hit._source["performance-data"]["time8192-states-s"],
-        time8192States: hit._source["performance-data"]["time8192-states"],
-        time8192StatesL: hit._source["performance-data"]["time8192-states-l"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
-
+const adaptiveModulationSearchHandler = createSearchDataHandler<AdaptiveModulationDataType>(getFilter, null)
 export const {
     actionHandler: adaptiveModulationActionHandler,
     createActions: createAdaptiveModulationActions,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
index 41aceca9f..b3b284b42 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
@@ -29,12 +29,12 @@ export interface IAvailableLtpsState {
   busy: boolean;
 }
 
-const connectedNetworkElementsStateInit: IAvailableLtpsState = {
+const ltpListStateInit: IAvailableLtpsState = {
   distinctLtps: [],
   busy: false
 };
 
-export const availableLtpsActionHandler: IActionHandler<IAvailableLtpsState> = (state = connectedNetworkElementsStateInit, action) => {
+export const availableLtpsActionHandler: IActionHandler<IAvailableLtpsState> = (state = ltpListStateInit, action) => {
   if (action instanceof LoadAllAvailableLtpsAction) {
 
     state = {
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/crossPolarDiscriminationHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/crossPolarDiscriminationHandler.ts
index 074c97d91..1e6c6d0a6 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/crossPolarDiscriminationHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/crossPolarDiscriminationHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { CrossPolarDiscriminationDataType, CrossPolarDiscriminationResult } from '../models/crossPolarDiscriminationDataType';
+import { CrossPolarDiscriminationDataType } from '../models/crossPolarDiscriminationDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface ICrossPolarDiscriminationState extends IExternalTableState<CrossPolarDiscriminationDataType> { }
@@ -26,32 +26,7 @@ export interface ICrossPolarDiscriminationState extends IExternalTableState<Cros
 /**
  * Creates elastic search material data fetch handler for CPD from historicalperformance database.
  */
-const crossPolarDiscriminationSearchHandler = createSearchDataHandler<CrossPolarDiscriminationResult, CrossPolarDiscriminationDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        xpdMin: hit._source["performance-data"]["xpd-min"],
-        xpdAvg: hit._source["performance-data"]["xpd-avg"],
-        xpdMax: hit._source["performance-data"]["xpd-max"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const crossPolarDiscriminationSearchHandler = createSearchDataHandler<CrossPolarDiscriminationDataType>(getFilter, null)
 
 export const {
     actionHandler: crossPolarDiscriminationActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/connectedNetworkElementsActionHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/deviceListActionHandler.ts
index ee14063c2..b3c0db446 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/connectedNetworkElementsActionHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/deviceListActionHandler.ts
@@ -17,32 +17,32 @@
  */
 import { IActionHandler } from '../../../../framework/src/flux/action';
 
-import { AllConnectedNetworkElementsLoadedAction, LoadAllConnectedNetworkElementsAction } from '../actions/connectedNetworkElementsActions';
-import { ConnectedNetworkElementIds } from '../models/connectedNetworkElements';
+import { AllDeviceListLoadedAction, LoadAllDeviceListAction } from '../actions/deviceListActions';
+import { DeviceListType } from '../models/deviceListType';
 
-export interface IConnectedNetworkElementsState {
-  connectedNetworkElementIds: ConnectedNetworkElementIds[];
+export interface IDeviceListState {
+  deviceList: DeviceListType[];
   busy: boolean;
 }
 
-const connectedNetworkElementsStateInit: IConnectedNetworkElementsState = {
-  connectedNetworkElementIds: [],
+const deviceListStateInit: IDeviceListState = {
+  deviceList: [],
   busy: false
 };
 
-export const connectedNetworkElementsActionHandler: IActionHandler<IConnectedNetworkElementsState> = (state = connectedNetworkElementsStateInit, action) => {
-  if (action instanceof LoadAllConnectedNetworkElementsAction) {
+export const deviceListActionHandler: IActionHandler<IDeviceListState> = (state = deviceListStateInit, action) => {
+  if (action instanceof LoadAllDeviceListAction) {
 
     state = {
       ...state,
       busy: true
     };
 
-  } else if (action instanceof AllConnectedNetworkElementsLoadedAction) {
-    if (!action.error && action.connectedNetworkElementIds) {
+  } else if (action instanceof AllDeviceListLoadedAction) {
+    if (!action.error && action.deviceList) {
       state = {
         ...state,
-        connectedNetworkElementIds: action.connectedNetworkElementIds,
+        deviceList: action.deviceList,
         busy: false
       };
     } else {
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceDataHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceDataHandler.ts
index 51b537fea..131566367 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceDataHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceDataHandler.ts
@@ -20,7 +20,7 @@ import * as moment from 'moment';
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { PerformanceResult, PerformanceDataType } from '../models/performanceDataType';
+import {  PerformanceDataType } from '../models/performanceDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface IPerformanceDataState extends IExternalTableState<PerformanceDataType> { }
@@ -28,32 +28,7 @@ export interface IPerformanceDataState extends IExternalTableState<PerformanceDa
 /**
 * Creates elastic search material data fetch handler for performance data from historicalperformance15min database.
 */
-const performanceDataSearchHandler = createSearchDataHandler<PerformanceResult, PerformanceDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        es: hit._source["performance-data"]["es"],
-        ses: hit._source["performance-data"]["ses"],
-        unavailability: hit._source["performance-data"]["unavailability"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const performanceDataSearchHandler = createSearchDataHandler<PerformanceDataType>(getFilter, null);
 
 export const {
     actionHandler: performanceDataActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
index 85ff01634..c33f10a7e 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
@@ -32,15 +32,15 @@ import { ITemperatureState, temperatureActionHandler } from './temperatureHandle
 import { ISignalToInterferenceState, signalToInterferenceActionHandler } from './signalToInterferenceHandler';
 import { ICrossPolarDiscriminationState, crossPolarDiscriminationActionHandler } from './crossPolarDiscriminationHandler';
 import { SetPanelAction } from '../actions/panelChangeActions';
-import { IConnectedNetworkElementsState, connectedNetworkElementsActionHandler } from './connectedNetworkElementsActionHandler';
+import { IDeviceListState, deviceListActionHandler } from './deviceListActionHandler';
 import { IAvailableLtpsState, availableLtpsActionHandler } from './availableLtpsActionHandler';
 import { PmDataInterval } from '../models/performanceDataType';
 import { TimeChangeAction } from '../actions/timeChangeAction';
-import { UpdateMountId } from '../actions/connectedNetworkElementsActions';
+import { UpdateMountId } from '../actions/deviceListActions';
 
 export interface IPerformanceHistoryStoreState {
-  mountId: string;
-  networkElements: IConnectedNetworkElementsState;
+  nodeId: string;
+  networkElements: IDeviceListState;
   ltps: IAvailableLtpsState;
   performanceData: IPerformanceDataState;
   receiveLevel: IReceiveLevelState;
@@ -86,8 +86,8 @@ declare module '../../../../framework/src/store/applicationStore' {
 }
 
 const actionHandlers = {
-  mountId: mountIdHandler,
-  networkElements: connectedNetworkElementsActionHandler,
+  nodeId: mountIdHandler,
+  networkElements: deviceListActionHandler,
   ltps: availableLtpsActionHandler,
   performanceData: performanceDataActionHandler,
   receiveLevel: receiveLevelActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/receiveLevelHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/receiveLevelHandler.ts
index adb70b120..91595cc58 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/receiveLevelHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/receiveLevelHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { ReceiveLevelDataType, ReceiveLevelResult } from '../models/receiveLevelDataType';
+import { ReceiveLevelDataType } from '../models/receiveLevelDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface IReceiveLevelState extends IExternalTableState<ReceiveLevelDataType> { }
@@ -26,32 +26,7 @@ export interface IReceiveLevelState extends IExternalTableState<ReceiveLevelData
 /**
  * Creates elastic search material data fetch handler for receiveLevel from historicalperformance database.
  */
-const receiveLevelSearchHandler = createSearchDataHandler<ReceiveLevelResult, ReceiveLevelDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        rxLevelMin: hit._source["performance-data"]["rx-level-min"],
-        rxLevelAvg: hit._source["performance-data"]["rx-level-avg"],
-        rxLevelMax: hit._source["performance-data"]["rx-level-max"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const receiveLevelSearchHandler = createSearchDataHandler<ReceiveLevelDataType>(getFilter, null);
 
 export const {
     actionHandler: receiveLevelActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/signalToInterferenceHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/signalToInterferenceHandler.ts
index aa75ba226..e0f804086 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/signalToInterferenceHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/signalToInterferenceHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { SignalToInterferenceDataType, SignalToInterferenceResult } from '../models/signalToInteferenceDataType';
+import { SignalToInterferenceDataType } from '../models/signalToInteferenceDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface ISignalToInterferenceState extends IExternalTableState<SignalToInterferenceDataType> { }
@@ -26,32 +26,7 @@ export interface ISignalToInterferenceState extends IExternalTableState<SignalTo
 /**
  * Creates elastic search material data fetch handler for SINR from historicalperformance database.
  */
-const signalToInterferenceSearchHandler = createSearchDataHandler<SignalToInterferenceResult, SignalToInterferenceDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        snirMin: hit._source["performance-data"]["snir-min"],
-        snirAvg: hit._source["performance-data"]["snir-avg"],
-        snirMax: hit._source["performance-data"]["snir-max"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const signalToInterferenceSearchHandler = createSearchDataHandler<SignalToInterferenceDataType>(getFilter, null);
 
 export const {
     actionHandler: signalToInterferenceActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/temperatureHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/temperatureHandler.ts
index 8a9ae7025..0a6c73a1c 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/temperatureHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/temperatureHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { TemperatureDataType, TemperatureResult } from '../models/temperatureDataType';
+import { TemperatureDataType } from '../models/temperatureDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface ITemperatureState extends IExternalTableState<TemperatureDataType> { }
@@ -26,32 +26,7 @@ export interface ITemperatureState extends IExternalTableState<TemperatureDataTy
 /**
  * Creates elastic search material data fetch handler for Temperature from historicalperformance database.
  */
-const temperatureSearchHandler = createSearchDataHandler<TemperatureResult, TemperatureDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        rfTempMin: hit._source["performance-data"]["rf-temp-min"],
-        rfTempAvg: hit._source["performance-data"]["rf-temp-avg"],
-        rfTempMax: hit._source["performance-data"]["rf-temp-max"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const temperatureSearchHandler = createSearchDataHandler< TemperatureDataType>(getFilter, null);
 
 export const {
     actionHandler: temperatureActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/transmissionPowerHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/transmissionPowerHandler.ts
index c2ad82183..32bef817d 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/transmissionPowerHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/transmissionPowerHandler.ts
@@ -18,7 +18,7 @@
 import { createExternal, IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
 import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
 
-import { TransmissionPowerDataType, TransmissionPowerResult } from '../models/transmissionPowerDataType';
+import { TransmissionPowerDataType } from '../models/transmissionPowerDataType';
 import { getFilter } from '../utils/tableUtils';
 
 export interface ITransmissionPowerState extends IExternalTableState<TransmissionPowerDataType> { }
@@ -26,32 +26,7 @@ export interface ITransmissionPowerState extends IExternalTableState<Transmissio
 /**
  * Creates elastic search material data fetch handler for Transmission power from historicalperformance database.
  */
-const transmissionPowerSearchHandler = createSearchDataHandler<TransmissionPowerResult, TransmissionPowerDataType>(
-    getFilter,
-    null,
-    (hit) => ({
-        _id: hit._id,
-        radioSignalId: hit._source["radio-signal-id"],
-        scannerId: hit._source["scanner-id"],
-        utcTimeStamp: hit._source["time-stamp"],
-        suspectIntervalFlag: hit._source["suspect-interval-flag"],
-        txLevelMin: hit._source["performance-data"]["tx-level-min"],
-        txLevelAvg: hit._source["performance-data"]["tx-level-avg"],
-        txLevelMax: hit._source["performance-data"]["tx-level-max"],
-    }),
-    (pmDataEntry: string) => {
-        switch (pmDataEntry) {
-            case "radioSignalId":
-                return "radio-signal-id";
-            case "scannerId":
-                return "scanner-id";
-            case "utcTimeStamp":
-                return "time-stamp"
-            case "suspectIntervalFlag":
-                return "suspect-interval-flag";
-        }
-        return pmDataEntry
-    });
+const transmissionPowerSearchHandler = createSearchDataHandler<TransmissionPowerDataType>(getFilter, null)
 
 export const {
     actionHandler: transmissionPowerActionHandler,
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/adaptiveModulationDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/adaptiveModulationDataType.ts
index 9c1d28986..adb0bcd6f 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/adaptiveModulationDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/adaptiveModulationDataType.ts
@@ -4,13 +4,13 @@
  * =================================================================================================
  * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
  * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * 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
+ * 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==========================================================================
@@ -21,53 +21,43 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Adaptive Modulation data fields of the performance history table.
  */
 export type AdaptiveModulationDatabaseDataType = {
-  "time2-states-s": number;
-  "time2-states": number;
-  "time2-states-l": number;
-  "time4-states-s": number;
-  "time4-states": number;
-  "time4-states-l": number;
-  "time16-states-s": number;
-  "time16-states": number;
-  "time16-states-l": number;
-  "time32-states-s": number;
-  "time32-states": number;
-  "time32-states-l": number;
-  "time64-states-s": number;
-  "time64-states": number;
-  "time64-states-l": number;
-  "time128-states-s": number;
-  "time128-states": number;
-  "time128-states-l": number;
-  "time256-states-s": number;
-  "time256-states": number;
-  "time256-states-l": number;
-  "time512-states-s": number;
-  "time512-states": number;
-  "time512-states-l": number;
-  "time1024-states-s": number;
-  "time1024-states": number;
-  "time1024-states-l": number;
-  "time2048-states-s": number;
-  "time2048-states": number;
-  "time2048-states-l": number;
-  "time4096-states-s": number;
-  "time4096-states": number;
-  "time4096-states-l": number;
-  "time8192-states-s": number;
-  "time8192-states": number;
-  "time8192-states-l": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type AdaptiveModulationResult = {
-  "performance-data": AdaptiveModulationDatabaseDataType;
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string ;
+  time2StatesS: number;
+  time2States: number;
+  time2StatesL: number;
+  time4StatesS: number;
+  time4States: number;
+  time4StatesL: number;
+  time16StatesS: number;
+  time16States: number;
+  time16StatesL: number;
+  time32StatesS: number;
+  time32States: number;
+  time32StatesL: number;
+  time64StatesS: number;
+  time64States: number;
+  time64StatesL: number;
+  time128StatesS: number;
+  time128States: number;
+  time128StatesL: number;
+  time256StatesS: number;
+  time256States: number;
+  time256StatesL: number;
+  time512StatesS: number;
+  time512States: number;
+  time512StatesL: number;
+  time1024StatesS: number;
+  time1024States: number;
+  time1024StatesL: number;
+  time2048StatesS: number;
+  time2048States: number;
+  time2048StatesL: number;
+  time4096StatesS: number;
+  time4096States: number;
+  time4096StatesL: number;
+  time8192StatesS: number;
+  time8192States: number;
+  time8192StatesL: number;
 };
 
 
@@ -75,44 +65,45 @@ export type AdaptiveModulationResult = {
  * Internally used type to provide table and chart data
  */
 export type AdaptiveModulationDataType = {
+  performanceData: AdaptiveModulationDatabaseDataType;
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
-  "time2StatesS": number;
-  "time2States": number;
-  "time2StatesL": number;
-  "time4StatesS": number;
-  "time4States": number;
-  "time4StatesL": number;
-  "time16StatesS": number;
-  "time16States": number;
-  "time16StatesL": number;
-  "time32StatesS": number;
-  "time32States": number;
-  "time32StatesL": number;
-  "time64StatesS": number;
-  "time64States": number;
-  "time64StatesL": number;
-  "time128StatesS": number;
-  "time128States": number;
-  "time128StatesL": number;
-  "time256StatesS": number;
-  "time256States": number;
-  "time256StatesL": number;
-  "time512StatesS": number;
-  "time512States": number;
-  "time512StatesL": number;
-  "time1024StatesS": number;
-  "time1024States": number;
-  "time1024StatesL": number;
-  "time2048StatesS": number;
-  "time2048States": number;
-  "time2048StatesL": number;
-  "time4096StatesS": number;
-  "time4096States": number;
-  "time4096StatesL": number;
-  "time8192StatesS": number;
-  "time8192States": number;
-  "time8192StatesL": number;
+  time2StatesS: number;
+  time2States: number;
+  time2StatesL: number;
+  time4StatesS: number;
+  time4States: number;
+  time4StatesL: number;
+  time16StatesS: number;
+  time16States: number;
+  time16StatesL: number;
+  time32StatesS: number;
+  time32States: number;
+  time32StatesL: number;
+  time64StatesS: number;
+  time64States: number;
+  time64StatesL: number;
+  time128StatesS: number;
+  time128States: number;
+  time128StatesL: number;
+  time256StatesS: number;
+  time256States: number;
+  time256StatesL: number;
+  time512StatesS: number;
+  time512States: number;
+  time512StatesL: number;
+  time1024StatesS: number;
+  time1024States: number;
+  time1024StatesL: number;
+  time2048StatesS: number;
+  time2048States: number;
+  time2048StatesL: number;
+  time4096StatesS: number;
+  time4096States: number;
+  time4096StatesL: number;
+  time8192StatesS: number;
+  time8192States: number;
+  time8192StatesL: number;
 } & { _id: string };
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/availableLtps.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/availableLtps.ts
index fcf7ad5f6..dc6c7bc16 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/availableLtps.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/availableLtps.ts
@@ -16,16 +16,6 @@
  * ============LICENSE_END==========================================================================
  */
   export type LtpIds = {
-    key: string
+    key : string
   }
 
-  export type Bucket<T>={ 
-    buckets: T[]
-  }
-
-/**
- * Represents distinct available ltps using elasticsearch aggregations structure.
- */
-  export type DistinctLtp = {
-    "uuid-interface": Bucket<LtpIds>
-  }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/chartTypes.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/chartTypes.ts
index 487cf029d..53039faa2 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/chartTypes.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/chartTypes.ts
@@ -45,5 +45,5 @@ export interface IDataSetsObject {
  * Interface used by chart for sorting on time-stamp
  */
 export interface ITimeStamp {
-  "utcTimeStamp": string;
+  timeStamp: string;
 }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/connectedNetworkElements.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/connectedNetworkElements.ts
deleted file mode 100644
index b7277f777..000000000
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/connectedNetworkElements.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Represents connected network elements.
- */
-
-export type ConnectedNetworkElementIds = {
-    mountId: string;
-  }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/crossPolarDiscriminationDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/crossPolarDiscriminationDataType.ts
index ef4415393..8adb16f45 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/crossPolarDiscriminationDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/crossPolarDiscriminationDataType.ts
@@ -22,29 +22,20 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Receive level data fields of the performance history table.
  */
 export type CrossPolarDiscriminationDatabaseDataType = {
-  "xpd-min": number;
-  "xpd-avg": number;
-  "xpd-max": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type CrossPolarDiscriminationResult = {
-  "performance-data": CrossPolarDiscriminationDatabaseDataType
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string;
+  xpdMin: number;
+  xpdAvg: number;
+  xpdMax: number;
 };
 
 /**
  * Internally used type to provide table and chart data
  */
 export type CrossPolarDiscriminationDataType = {
+  performanceData: CrossPolarDiscriminationDatabaseDataType
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   xpdMin: number;
   xpdAvg: number;
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/requiredNetworkElements.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/deviceListType.ts
index 42d22afc0..db8f2d71e 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/models/requiredNetworkElements.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/deviceListType.ts
@@ -15,13 +15,11 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-import { NetworkElementBaseType } from "./networkElementBase";
 
 /**
-* Represents data of Required Network Elements.
-*/
-export type RequiredNetworkElementType = NetworkElementBaseType & {
-  username?: string;
-  password?: string;
-}
+ * Represents all the distinct devices from the performance history data.
+ */
 
+export type DeviceListType = {
+  nodeId: string;
+}
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/panelId.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/panelId.ts
index 1f05b47cc..5889a64c8 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/panelId.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/panelId.ts
@@ -1,4 +1,22 @@
 /**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+
+/**
  * Represents PanelIds for the available Expansional panels.
  */
 export type PanelId = null | "PerformanceData" | "ReceiveLevel" | "TransmissionPower" | "AdaptiveModulation" | "Temperature" | "SINR" | "CPD";
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/performanceDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/performanceDataType.ts
index 6af29c4a8..30f97fb54 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/performanceDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/performanceDataType.ts
@@ -23,30 +23,21 @@ import { Moment } from "moment";
  * Represents performance data fields of the performance history table as used in the database
  */
 export type PerformanceDatabaseDataType = {
-  "es": number;
-  "ses": number;
-  "unavailability": number;
-};
-
-
-/**
- * Represents Result type of database query
- */
-export type PerformanceResult = {
-  "performance-data": PerformanceDatabaseDataType;
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string;
+  es: number;
+  ses: number;
+  unavailability: number;
 };
 
 /**
  * Internally used type to provide table and chart data
  */
 export type PerformanceDataType = {
+
+  performanceData: PerformanceDatabaseDataType;
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   es: number;
   ses: number;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/receiveLevelDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/receiveLevelDataType.ts
index 836bf58d9..2748a3d5d 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/receiveLevelDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/receiveLevelDataType.ts
@@ -21,29 +21,20 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Receive level data fields of the performance history table.
  */
 export type ReceiveLevelDatabaseDataType = {
-  "rx-level-min": number;
-  "rx-level-avg": number;
-  "rx-level-max": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type ReceiveLevelResult = {
-  "performance-data": ReceiveLevelDatabaseDataType
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string;
+  rxLevelMin: number;
+  rxLevelAvg: number;
+  rxLevelMax: number;
 };
 
 /**
  * Internally used type to provide table and chart data
  */
 export type ReceiveLevelDataType = {
+  performanceData: ReceiveLevelDatabaseDataType;
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   rxLevelMin: number;
   rxLevelAvg: number;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/signalToInteferenceDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/signalToInteferenceDataType.ts
index deb1d8f18..5c675feb8 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/signalToInteferenceDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/signalToInteferenceDataType.ts
@@ -22,30 +22,20 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Receive level data fields of the performance history table.
  */
 export type SignalToInterferenceDatabaseDataType = {
-  "snir-min": number;
-  "snir-avg": number;
-  "snir-max": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type SignalToInterferenceResult = {
-  "performance-data": SignalToInterferenceDatabaseDataType
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string; 
+  snirMin: number;
+  snirAvg: number;
+  snirMax: number;
 };
 
-
 /**
  * Internally used type to provide table and chart data
  */
 export type SignalToInterferenceDataType = {
+  performanceData: SignalToInterferenceDatabaseDataType;
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   snirMin: number;
   snirAvg: number;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/temperatureDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/temperatureDataType.ts
index dd3ce5253..3b0cb7683 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/temperatureDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/temperatureDataType.ts
@@ -22,29 +22,20 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Receive level data fields of the performance history table.
  */
 export type TemperatureDatabaseDataType = {
-  "rf-temp-min": number;
-  "rf-temp-avg": number;
-  "rf-temp-max": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type TemperatureResult = {
-  "performance-data": TemperatureDatabaseDataType
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string;
+  rfTempMin: number;
+  rfTempAvg: number;
+  rfTempMax: number;
 };
 
 /**
  * Internally used type to provide table and chart data
  */
 export type TemperatureDataType = {
+  performanceData: TemperatureDatabaseDataType
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   rfTempMin: number;
   rfTempAvg: number;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/topologyNetConf.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/topologyNetconf.ts
index 6bd89411d..99123f55e 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/topologyNetConf.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/topologyNetconf.ts
@@ -15,15 +15,12 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
+
 export interface TopologyNode {
   "node-id": string;
-  "netconf-node-topology:connection-status": string;
 }
 
-/**
- * Represents restConf network element topology.
- */
 export interface Topology {
   "topology-id": string;
-  "node": TopologyNode[];
+  node: TopologyNode[];
 }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/transmissionPowerDataType.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/transmissionPowerDataType.ts
index 2c31f5378..62c00bfe4 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/transmissionPowerDataType.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/models/transmissionPowerDataType.ts
@@ -22,29 +22,20 @@ export { HitEntry, Result } from '../../../../framework/src/models';
  * Represents Receive level data fields of the performance history table.
  */
 export type TransmissionPowerDatabaseDataType = {
-  "tx-level-min": number;
-  "tx-level-avg": number;
-  "tx-level-max": number;
-};
-
-/**
- * Represents Result type of database query
- */
-export type TransmissionPowerResult = {
-  "performance-data": TransmissionPowerDatabaseDataType
-  "radio-signal-id": string;
-  "scanner-id": string;
-  "suspect-interval-flag": boolean;
-  "time-stamp": string;
+  _id: string;
+  txLevelMin: number;
+  txLevelAvg: number;
+  txLevelMax: number;
 };
 
 /**
  * Internally used type to provide table and chart data
  */
 export type TransmissionPowerDataType = {
+  performanceData: TransmissionPowerDatabaseDataType;
   radioSignalId: string;
   scannerId: string;
-  utcTimeStamp: string;
+  timeStamp: string;
   suspectIntervalFlag: boolean;
   txLevelMin: number;
   txLevelAvg: number;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/plugin.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/pluginPerformance.tsx
index a3fa2dbfe..df3ffd90a 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/pluginPerformance.tsx
@@ -29,7 +29,7 @@ import { ApplicationStore } from '../../../framework/src/store/applicationStore'
 
 import connect, { Connect, IDispatcher } from '../../../framework/src/flux/connect';
 import { IApplicationStoreState } from "../../../framework/src/store/applicationStore";
-import { updateMountIdActionCreator } from "./actions/connectedNetworkElementsActions";
+import { updateMountIdActionCreator } from "./actions/deviceListActions";
 
 let api: {
   readonly applicationStore: ApplicationStore | null;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/services/performanceHistoryService.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/services/performanceHistoryService.ts
index 0f3c89b83..2b03d1c2e 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/services/performanceHistoryService.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/services/performanceHistoryService.ts
@@ -18,7 +18,10 @@
 import { requestRest } from '../../../../framework/src/services/restService';
 import { Result } from '../../../../framework/src/models/elasticSearch';
 
-import { DistinctLtp, LtpIds } from '../models/availableLtps';
+import { convertPropertyNames, replaceUpperCase } from '../../../../framework/src/utilities/yangHelper';
+import { LtpIds } from '../models/availableLtps';
+import { DeviceListType } from '../models/deviceListType';
+import { Topology, TopologyNode } from '../models/topologyNetconf';
 
 /** 
  * Represents a web api accessor service for Network elements actions.
@@ -31,33 +34,75 @@ class PerformanceService {
   public async getDistinctLtpsFromDatabase(networkElement: string, selectedTimePeriod: string): Promise<LtpIds[] | null> {
     let path;
     const query = {
-      "size": 0,
-      "query": {
-        "match": {
-          "node-name": networkElement
-        }
-      },
-      "aggs": {
-        "uuid-interface": {
-          "terms": {
-            "field": "uuid-interface"
-          }
-        }
+      "filter": [{
+        "property": "node-name",
+        "filtervalue": networkElement
+      }],
+      "sortorder": [],
+      "pagination": {
+        "size": 20,
+        "page": 1
       }
-    };
+    }
+
 
     if (selectedTimePeriod === "15min") {
-      path = 'database/sdnperformance/historicalperformance15min/_search';
+      path = '/restconf/operations/data-provider:read-pmdata-15m-ltp-list';
     } else {
-      path = 'database/sdnperformance/historicalperformance24h/_search';
+      path = '/restconf/operations/data-provider:read-pmdata-24h-ltp-list';
     }
 
-    const result = await requestRest<Result<DistinctLtp>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.aggregations && result.aggregations["uuid-interface"].buckets.map(ne => ({
-      key: ne.key
+    const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
+    return result && result.output && result.output.data.map(ne => ({ key: ne })) || null;
+  }
+
+
+
+  /**
+  * Gets all devices from the performanceHistory 15min backend.
+  */
+  public async getDeviceListfromPerf15minHistory(): Promise<(DeviceListType)[] | null> {
+    const path = '/restconf/operations/data-provider:read-pmdata-15m-device-list';
+    const query = {
+      "input": {
+        "filter": [],
+        "sortorder": [],
+        "pagination": {
+          "size": 20,
+          "page": 1
+        }
+      }
+    };
+
+    const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(query) });
+    return result && result.output && result.output.data && result.output.data.map(ne => ({
+      nodeId: ne
+    })) || null;
+  }
+
+  /**
+   * Gets all devices from the performanceHistory 24h backend.
+   */
+  public async getDeviceListfromPerf24hHistory(): Promise<(DeviceListType)[] | null> {
+    const path = '/restconf/operations/data-provider:read-pmdata-24h-device-list';
+    const query = {
+      "input": {
+        "filter": [],
+        "sortorder": [],
+        "pagination": {
+          "size": 20,
+          "page": 1
+        }
+      }
+    };
+
+    const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(query) });
+    return result && result.output && result.output.data && result.output.data.map(ne => ({
+      nodeId: ne
     })) || null;
   }
 }
 
+
 export const PerformanceHistoryService = new PerformanceService();
 export default PerformanceHistoryService;
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
index 52b5ddb58..3240f73f1 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
@@ -69,7 +69,7 @@ export const lineChart = (chartPagedData: IDataSetsObject) => {
 
 export const sortDataByTimeStamp = <T extends ITimeStamp>(_rows: T[]): T[] => {
   return (_rows.sort((a, b) => {
-    const result = Date.parse(a["utcTimeStamp"]) - Date.parse(b["utcTimeStamp"]);
+    const result = Date.parse(a["timeStamp"]) - Date.parse(b["timeStamp"]);
     return isNaN(result) ? 0 : result;
   }));
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
index 865d89c88..b5a3a3f36 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
@@ -18,7 +18,7 @@
 import { ColumnType, ColumnModel } from '../../../../framework/src/components/material-table';
 
 import { PmDataInterval } from '../models/performanceDataType';
-import { getPmDataInterval } from '../plugin';
+import { getPmDataInterval } from '../pluginPerformance';
 
 export const addColumnLabels = <T>(name: string, title: string, disableFilter = true, disableSorting = true): ColumnModel<T> => {
   return { property: name as keyof T, title: title, type: ColumnType.text, disableFilter: disableFilter, disableSorting: disableSorting };
@@ -27,9 +27,9 @@ export const addColumnLabels = <T>(name: string, title: string, disableFilter =
 export function getFilter(): string {
   switch (getPmDataInterval()) {
       case PmDataInterval.pmInterval15Min:
-          return "sdnperformance/historicalperformance15min";
+          return "pmdata-15m";
       case PmDataInterval.pmInterval24Hours:
-          return "sdnperformance/historicalperformance24h";
+          return "pmdata-24h";
       default:
           throw new Error("Unknown time intervall");
   }
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/views/performanceHistoryApplication.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/views/performanceHistoryApplication.tsx
index 218250d18..ae22f8041 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/views/performanceHistoryApplication.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/views/performanceHistoryApplication.tsx
@@ -25,7 +25,6 @@ import Select from '@material-ui/core/Select';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import { Panel } from '../../../../framework/src/components/material-ui';
-import { loadAllMountedNetworkElementsAsync } from '../../../connectApp/src/actions/mountedNetworkElementsActions';
 import { NavigateToApplication } from '../../../../framework/src/actions/navigationActions';
 import { Dispatch } from '../../../../framework/src/flux/store';
 
@@ -38,7 +37,7 @@ import AdaptiveModulation from '../components/adaptiveModulation';
 import Temperature from '../components/temperature';
 import SignalToInterference from '../components/signalToInterference';
 import CrossPolarDiscrimination from '../components/crossPolarDiscrimination';
-import { loadAllConnectedNetworkElementsAsync } from '../actions/connectedNetworkElementsActions';
+import { loadAllDeviceListAsync } from '../actions/deviceListActions';
 import { TimeChangeAction } from '../actions/timeChangeAction';
 import { loadDistinctLtpsbyNetworkElementAsync } from '../actions/ltpAction';
 import { SetPanelAction } from '../actions/panelChangeActions';
@@ -58,7 +57,7 @@ const PerformanceHistoryComponentStyles = (theme: Theme) => createStyles({
     flexWrap: "wrap",
   },
   margin: {
-    margin: theme.spacing.unit,
+    margin: theme.spacing(1),
   },
   display: {
     display: "inline-block"
@@ -79,7 +78,7 @@ const mapProps = (state: IApplicationStoreState) => ({
   ...state.performanceHistory,
   activePanel: state.performanceHistory.currentOpenPanel,
   availableLtps: state.performanceHistory.ltps.distinctLtps,
-  networkElements: state.performanceHistory.networkElements.connectedNetworkElementIds
+  networkElements: state.performanceHistory.networkElements.deviceList,
 });
 
 const mapDispatcher = (dispatcher: IDispatcher) => ({
@@ -104,9 +103,8 @@ const mapDispatcher = (dispatcher: IDispatcher) => ({
   temperaturePreActions: createTemperaturePreActions(dispatcher.dispatch),
   signalToInterferencePreActions: createSignalToInterferencePreActions(dispatcher.dispatch),
   crossPolarDiscriminationPreActions: createCrossPolarDiscriminationPreActions(dispatcher.dispatch),
-  getConnectedNetworkElementsIds: async () => {
-    await dispatcher.dispatch(loadAllMountedNetworkElementsAsync)
-    dispatcher.dispatch(loadAllConnectedNetworkElementsAsync);
+  getAllDevicesPMdata: async () => {
+    await dispatcher.dispatch(loadAllDeviceListAsync);
   },
   getDistinctLtpsIds: (selectedNetworkElement: string, selectedTimePeriod: string, selectedLtp: string, selectFirstLtp?: Function, resetLTP?: Function) => dispatcher.dispatch(loadDistinctLtpsbyNetworkElementAsync(selectedNetworkElement, selectedTimePeriod, selectedLtp, selectFirstLtp, resetLTP)),
   setCurrentPanel: (panelId: PanelId) => dispatcher.dispatch(new SetPanelAction(panelId)),
@@ -117,7 +115,7 @@ const mapDispatcher = (dispatcher: IDispatcher) => ({
 });
 
 export type NetworkElementType = {
-  mountId: string,
+  nodeId: string,
 }
 const NetworkElementTable = MaterialTable as MaterialTableCtorType<NetworkElementType>;
 
@@ -184,62 +182,62 @@ class PerformanceHistoryComponent extends React.Component<PerformanceHistoryComp
 
   render(): JSX.Element {
     const { classes } = this.props;
-    const { activePanel, mountId } = this.props;
-    if (mountId === "") {
+    const { activePanel, nodeId } = this.props;
+    if (nodeId === "") {
       return (
         <>
-          <h2>Please select the network element !</h2>
-          <NetworkElementTable idProperty={"mountId"}  rows={ this.props.networkElements }  asynchronus
-            onHandleClick={(event, rowData) => { this.handleNetworkElementSelect(rowData.mountId) }} columns={
-              [{ property: "mountId" }]
+          <NetworkElementTable title={"Please select the network element!"} idProperty={"nodeId"} rows={this.props.networkElements} asynchronus
+            onHandleClick={(event, rowData) => { this.handleNetworkElementSelect(rowData.nodeId) }} columns={
+              [{ property: "nodeId", title: "Node Name" }]
             } />
         </>
       )
     }
     else {
-      this.handleURLChange(mountId);
+      3
+      this.handleURLChange(nodeId);
       return (
         <>
-          <h2>Selected Network Element: { this.state.selectedNetworkElement } </h2>
-          { this.state.showLtps && (
+          <h3>Selected Network Element: {this.state.selectedNetworkElement} </h3>
+          {this.state.showLtps && (
             <div>
-              <FormControl className={ classes.display }>
+              <FormControl className={classes.display}>
                 <span>
                   Select LTP
                 </span>
-                <Select className={ classes.selectDropdown } value={ this.state.selectedLtp } onChange={ this.handleLtpChange }  >
-                  <MenuItem value={ "-1" }><em>--Select--</em></MenuItem>
-                  { this.props.availableLtps.map(ltp =>
-                    (<MenuItem value={ ltp.key } key={ ltp.key }>{ ltp.key }</MenuItem>)) }
+                <Select className={classes.selectDropdown} value={this.state.selectedLtp} onChange={this.handleLtpChange}  >
+                  <MenuItem value={"-1"}><em>--Select--</em></MenuItem>
+                  {this.props.availableLtps.map(ltp =>
+                    (<MenuItem value={ltp.key} key={ltp.key}>{ltp.key}</MenuItem>))}
                 </Select>
                 <span> Time-Period </span>
-                <Select className={ classes.selectDropdown } value={ this.state.selectedTimePeriod } onChange={ this.handleTimePeriodChange } >
-                  <MenuItem value={ "15min" }>15min</MenuItem>
-                  <MenuItem value={ "24hours" }>24hours</MenuItem>
+                <Select className={classes.selectDropdown} value={this.state.selectedTimePeriod} onChange={this.handleTimePeriodChange} >
+                  <MenuItem value={"15min"}>15min</MenuItem>
+                  <MenuItem value={"24hours"}>24hours</MenuItem>
                 </Select>
               </FormControl>
-              { this.state.showPanels && (
+              {this.state.showPanels && (
                 <div>
-                  <Panel activePanel={ activePanel } panelId={ "PerformanceData" } onToggle={ this.onTogglePanel } title={ "Performance Data" }>
-                    <PerformanceData selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"PerformanceData"} onToggle={this.onTogglePanel} title={"Performance Data"}>
+                    <PerformanceData selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "ReceiveLevel" } onToggle={ this.onTogglePanel } title={ "Receive Level" }>
-                    <ReceiveLevel selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"ReceiveLevel"} onToggle={this.onTogglePanel} title={"Receive Level"}>
+                    <ReceiveLevel selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "TransmissionPower" } onToggle={ this.onTogglePanel } title={ "Transmission Power" }>
-                    <TransmissionPower selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"TransmissionPower"} onToggle={this.onTogglePanel} title={"Transmission Power"}>
+                    <TransmissionPower selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "AdaptiveModulation" } onToggle={ this.onTogglePanel } title={ "Adaptive Modulation" }>
-                    <AdaptiveModulation selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"AdaptiveModulation"} onToggle={this.onTogglePanel} title={"Adaptive Modulation"}>
+                    <AdaptiveModulation selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "Temperature" } onToggle={ this.onTogglePanel } title={ "Temperature" }>
-                    <Temperature selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"Temperature"} onToggle={this.onTogglePanel} title={"Temperature"}>
+                    <Temperature selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "SINR" } onToggle={ this.onTogglePanel } title={ "Signal-to-interference-plus-noise ratio (SINR)" }>
-                    <SignalToInterference selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"SINR"} onToggle={this.onTogglePanel} title={"Signal-to-interference-plus-noise ratio (SINR)"}>
+                    <SignalToInterference selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
-                  <Panel activePanel={ activePanel } panelId={ "CPD" } onToggle={ this.onTogglePanel } title={ "Cross Polar Discrimination" }>
-                    <CrossPolarDiscrimination selectedTimePeriod={ this.state.selectedTimePeriod } />
+                  <Panel activePanel={activePanel} panelId={"CPD"} onToggle={this.onTogglePanel} title={"Cross Polar Discrimination"}>
+                    <CrossPolarDiscrimination selectedTimePeriod={this.state.selectedTimePeriod} />
                   </Panel>
                 </div>
               )}
@@ -251,7 +249,7 @@ class PerformanceHistoryComponent extends React.Component<PerformanceHistoryComp
   };
 
   public componentDidMount() {
-    this.props.getConnectedNetworkElementsIds();
+    this.props.getAllDevicesPMdata();
     this.props.enableFilterPerformanceData.onToggleFilter();
     this.props.enableFilterReceiveLevel.onToggleFilter();
     this.props.enableFilterTransmissionPower.onToggleFilter();
@@ -290,38 +288,38 @@ class PerformanceHistoryComponent extends React.Component<PerformanceHistoryComp
 
   }
 
- /**
-  * Function which handles network element changes.
-  */
- private handleNetworkElementSelect = (selectedNetworkElement: string) => {
-
-  this.setState({
-    showLtps: true,
-    selectedNetworkElement: selectedNetworkElement,
-    showNetworkElementsTable: false,
-    showPanels: false,
-    selectedLtp: "-1"
-  });
-  this.props.changeNode(selectedNetworkElement);
-  this.props.getDistinctLtpsIds(selectedNetworkElement, this.state.selectedTimePeriod, "-1", this.selectFirstLtp);
-}
+  /**
+   * Function which handles network element changes.
+   */
+  private handleNetworkElementSelect = (selectedNetworkElement: string) => {
 
-private handleURLChange = (selectedNetworkElement: string) => {
-  if(selectedNetworkElement !== this.state.selectedNetworkElement) {
     this.setState({
       showLtps: true,
       selectedNetworkElement: selectedNetworkElement,
+      showNetworkElementsTable: false,
       showPanels: false,
       selectedLtp: "-1"
     });
+    this.props.changeNode(selectedNetworkElement);
     this.props.getDistinctLtpsIds(selectedNetworkElement, this.state.selectedTimePeriod, "-1", this.selectFirstLtp);
   }
-}
 
-/**
-  * Function which resets the ltps to "--select--" in the state if the passed parameter @ltpNotSelected is true.
-  * @param ltpNotSelected: true, if existing selected is not available in the given time period, else false
-  */
+  private handleURLChange = (selectedNetworkElement: string) => {
+    if (selectedNetworkElement !== this.state.selectedNetworkElement) {
+      this.setState({
+        showLtps: true,
+        selectedNetworkElement: selectedNetworkElement,
+        showPanels: false,
+        selectedLtp: "-1"
+      });
+      this.props.getDistinctLtpsIds(selectedNetworkElement, this.state.selectedTimePeriod, "-1", this.selectFirstLtp);
+    }
+  }
+
+  /**
+    * Function which resets the ltps to "--select--" in the state if the passed parameter @ltpNotSelected is true.
+    * @param ltpNotSelected: true, if existing selected is not available in the given time period, else false
+    */
   private resetLtpDropdown = (ltpNotSelected: boolean) => {
     if (ltpNotSelected) {
       this.setState({
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/webpack.config.js b/sdnr/wt/odlux/apps/performanceHistoryApp/webpack.config.js
index 27a5949ac..9c2414864 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = (env) => {
     context: path.resolve(__dirname, "src"),
 
     entry: {
-      performanceHistoryApp: ["./plugin.tsx"]
+      performanceHistoryApp: ["./pluginPerformance.tsx"]
     },
 
     devtool: env === "release" ? false : "source-map",
@@ -125,12 +125,16 @@ module.exports = (env) => {
         colors: true
       },
       proxy: {
+        "/oauth2/": {
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
         "/restconf": {
-          target: "http://localhost:8181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database": {
-          target: "http://localhost:8181",
+          target: "http://10.20.6.29:48181",
           secure: false
         }
       }
diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml
index 35655954a..a0c01c995 100644
--- a/sdnr/wt/odlux/core/features/pom.xml
+++ b/sdnr/wt/odlux/core/features/pom.xml
@@ -14,18 +14,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-odlux-core-feature</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -35,7 +36,6 @@
 
     <dependencyManagement>
         <dependencies>
-            
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -45,7 +45,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
 
         <dependency>
diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml
index 98a4fd50f..bf6243c6c 100755
--- a/sdnr/wt/odlux/core/installer/pom.xml
+++ b/sdnr/wt/odlux/core/installer/pom.xml
@@ -1,99 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-odlux-core-installer</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<properties>
-		<application.name>sdnr-wt-odlux-core</application.name>
-		<include.transitive.dependencies>false</include.transitive.dependencies>
-	</properties>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-		</license>
-	</licenses>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-			<artifactId>${application.name}-feature</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-			<artifactId>${application.name}-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+    <properties>
+        <application.name>sdnr-wt-odlux-core</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>maven-repo-zip</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<attach>true</attach>
-							<finalName>stage/${application.name}-${project.version}</finalName>
-							<descriptors>
-								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>true</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-nested-dependencies</id>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<phase>prepare-package</phase>
-						<configuration>
-							<transitive>true</transitive>
-							<outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<useRepositoryLayout>true</useRepositoryLayout>
-							<addParentPoms>false</addParentPoms>
-							<copyPom>false</copyPom>
-							<!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
-							<!--<scope>provided</scope> -->
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <!--<includeArtifactIds>sdnr-wt-apigateway-provider,${application.name}</includeArtifactIds> -->
+                            <!--<scope>provided</scope> -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml
index 1618e7aa1..ad80dc080 100644
--- a/sdnr/wt/odlux/core/model/pom.xml
+++ b/sdnr/wt/odlux/core/model/pom.xml
@@ -2,18 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-odlux-core-model</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-    <packaging>bundle</packaging>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
         <version>1.5.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -36,6 +37,7 @@
         </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
index e85c88b6f..4e2332b4e 100644
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
@@ -113,7 +113,7 @@ public class OdluxBundle {
             return null;
         LOG.debug("try to load res " + url.toString());
         StringBuilder sb = new StringBuilder();
-        BufferedReader in;
+        BufferedReader in = null;
         try {
             in = new BufferedReader(new InputStreamReader(url.openStream()));
 
@@ -121,11 +121,19 @@ public class OdluxBundle {
             while ((inputLine = in.readLine()) != null) {
                 sb.append(inputLine + LR);
             }
-            in.close();
         } catch (IOException e) {
             LOG.warn("could not load resfile " + url.toString() + ": " + e.getMessage());
             return null;
         }
+        finally {
+        	if(in!=null) {
+        		try {
+					in.close();
+				} catch (IOException e) {
+					
+				}
+        	}
+        }
 
         return sb.toString();
     }
diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml
index c41075a10..de888e7f4 100644
--- a/sdnr/wt/odlux/core/pom.xml
+++ b/sdnr/wt/odlux/core/pom.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-odlux-core-top</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>odlux-core</name>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
 
-	<properties>
-		<feature-name>sdnr-wt-odlux-core</feature-name>
-	</properties>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-		</license>
-	</licenses>
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>features</module>
+        <module>installer</module>
+    </modules>
 
-	<modules>
-		<module>model</module>
-		<module>provider</module>
-		<module>features</module>
-		<module>installer</module>
-	</modules>
+    <properties>
+        <feature-name>sdnr-wt-odlux-core</feature-name>
+    </properties>
 </project>
diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
index 84838a05f..2b8d9e4c6 100644
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ b/sdnr/wt/odlux/core/provider/pom.xml
@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-odlux-core-provider</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-	<packaging>bundle</packaging>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-		</license>
-	</licenses>
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-			<artifactId>sdnr-wt-odlux-core-model</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sdnr-wt-odlux-framework</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.compendium</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-		</dependency>
-				<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*;
-						</Import-Package>
-						<Embed-Dependency>sdnr-wt-odlux-framework;inline=true</Embed-Dependency>
-						<Embed-Transitive>true</Embed-Transitive>
-						<Export-Package>${project.groupId}.*</Export-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-odlux-core-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*;
+                        </Import-Package>
+                        <Embed-Dependency>sdnr-wt-odlux-framework;inline=true</Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
+                        <Export-Package>${project.groupId}.*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java
index d335e52c7..73d61a7b3 100644
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java
+++ b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java
@@ -52,7 +52,6 @@ public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResource
         return loadFileContent(url, OdluxBundleLoaderImpl.getInstance().getLoadedBundles(this.getBundleName()));
     }
 
-
     @Override
     public String getResourceFileContent(String fn, List<String> bundleNames) {
         return loadFileContent(this.getResource(fn),bundleNames);
@@ -65,7 +64,7 @@ public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResource
         LOG.debug("try to load res " + url.toString());
         StringBuilder sb = new StringBuilder();
         Matcher matcher;
-        BufferedReader in;
+        BufferedReader in=null;
         try {
             in = new BufferedReader(new InputStreamReader(url.openStream()));
 
@@ -96,11 +95,20 @@ public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResource
                 }
                 sb.append(inputLine + LR);
             }
-            in.close();
+          
         } catch (IOException e) {
             LOG.warn("could not load resfile {} : {}", url, e.getMessage());
             return null;
         }
+		finally {
+			try {
+				if (in != null) {
+					in.close();
+				}
+			} catch (IOException e) {
+
+			}
+		}
 
         return sb.toString();
     }
diff --git a/sdnr/wt/odlux/framework/package.json b/sdnr/wt/odlux/framework/package.json
index e76cc5c3c..d0fe49b57 100644
--- a/sdnr/wt/odlux/framework/package.json
+++ b/sdnr/wt/odlux/framework/package.json
@@ -24,18 +24,18 @@
   "author": "Matthias Fischer",

   "license": "Apache-2.0",

   "peerDependencies": {

-    "@types/node" : "11.9.5",

-    "@types/react": "16.4.14",

-    "@types/react-dom": "16.0.8",

+    "@types/node": "11.9.5",

+    "@types/react": "16.9.11",

+    "@types/react-dom": "16.9.4",

     "@types/react-router-dom": "4.3.1",

-    "@material-ui/core": "3.8.3",

-    "@material-ui/icons": "3.0.2",

+    "@material-ui/core": "4.6.1",

+    "@material-ui/icons": "4.5.1",

     "@types/classnames": "2.2.6",

     "@types/flux": "3.1.8",

     "@types/jquery": "3.3.10",

     "jquery": "3.3.1",

-    "react": "16.5.2",

-    "react-dom": "16.5.2",

+    "react": "16.11.0",

+    "react-dom": "16.11.0",

     "react-router-dom": "4.3.1",

     "@fortawesome/react-fontawesome": "0.1.3",

     "@fortawesome/fontawesome-svg-core": "1.2.12",

@@ -46,4 +46,4 @@
   "dependencies": {

     "http-server": "^0.11.1"

   }

-}

+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index abd0df0f5..210727c53 100644
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -1,160 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-odlux-framework</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-	<name>sdnr-wt-odlux-framework</name>
-	<properties>
-		<buildtime>${maven.build.timestamp}</buildtime>
-		<distversion>ONAP Dublin (Flourine-SR2)</distversion>
-		<buildno>15.b8b89e4(19/08/12)</buildno>
-		<odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
-	</properties>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-		</license>
-	</licenses>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>dist</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>node</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>node_modules</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>../node_modules</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<!-- eclipse bug build bin folder in basedir -->
-						<fileset>
-							<directory>bin</directory>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>de.jacksitlab</groupId>
-				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.7.1</version>
-				<executions>
-					<execution>
-						<id>install node and yarn</id>
-						<goals>
-							<goal>install-node-and-yarn</goal>
-						</goals>
-						<!-- optional: default phase is "generate-resources" -->
-						<phase>initialize</phase>
-						<configuration>
-							<nodeVersion>v8.10.0</nodeVersion>
-							<yarnVersion>v1.12.3</yarnVersion>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install lerna</id>
-						<goals>
-							<goal>yarn</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<arguments>add lerna@3.13.1 -W --exact</arguments>
-							<installDirectory>${project.basedir}</installDirectory>
-							<workingDirectory>${project.basedir}/../</workingDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>exec lerna bootstrap</id>
-						<goals>
-							<goal>lerna</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							 <lernaInheritsProxyConfigFromMaven>false</lernaInheritsProxyConfigFromMaven>
-							<arguments>bootstrap</arguments>
-							<installDirectory>${project.basedir}</installDirectory>
-							<workingDirectory>${project.basedir}/../</workingDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>yarn build</id>
-						<goals>
-							<goal>yarn</goal>
-						</goals>
-						<configuration>
-							<arguments>run build</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>replacer</artifactId>
-				<version>1.5.2</version>
-				<executions>
-					<execution>
-						<id>replace version</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<basedir>${project.build.directory}/classes/odlux</basedir>
-					<includes>
-						<include>app.js</include>
-					</includes>
-					<replacements>
-						<replacement>
-							<token>##odlux.version##</token>
-							<value>${odlux.version}</value>
-						</replacement>
-					</replacements>
-				</configuration>
-			</plugin>
-		</plugins>
-		<resources>
-			<resource>
-				<directory>dist</directory>
-				<targetPath>odlux</targetPath>
-			</resource>
-		</resources>
-	</build>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>highstreet repo</id>
-			<url>https://cloud-highstreet-technologies.com/mvn/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-framework</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <buildtime>${maven.build.timestamp}</buildtime>
+        <distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
+        <buildno>36.1a30021(19/12/12)</buildno>
+        <odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
+    </properties>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>dist</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>node</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>node_modules</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>../node_modules</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <!-- eclipse bug build bin folder in basedir -->
+                        <fileset>
+                            <directory>bin</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>de.jacks-it-lab</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.7.1</version>
+                <executions>
+                    <execution>
+                        <id>install node and yarn</id>
+                        <goals>
+                            <goal>install-node-and-yarn</goal>
+                        </goals>
+                        <!-- optional: default phase is "generate-resources" -->
+                        <phase>initialize</phase>
+                        <configuration>
+                            <nodeVersion>v10.16.3</nodeVersion>
+                            <yarnVersion>v1.19.0</yarnVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>clear cache</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <arguments>cache clean</arguments>
+                            <installDirectory>${project.basedir}</installDirectory>
+                            <workingDirectory>${project.basedir}/../</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install lerna</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <arguments>add lerna@3.13.1 -W --exact</arguments>
+                            <installDirectory>${project.basedir}</installDirectory>
+                            <workingDirectory>${project.basedir}/../</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>exec lerna bootstrap</id>
+                        <goals>
+                            <goal>lerna</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <lernaInheritsProxyConfigFromMaven>false</lernaInheritsProxyConfigFromMaven>
+                            <arguments>bootstrap</arguments>
+                            <installDirectory>${project.basedir}</installDirectory>
+                            <workingDirectory>${project.basedir}/../</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn build</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.2</version>
+                <executions>
+                    <execution>
+                        <id>replace version</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <basedir>${project.build.directory}/classes/odlux</basedir>
+                    <includes>
+                        <include>app.js</include>
+                    </includes>
+                    <replacements>
+                        <replacement>
+                            <token>##odlux.version##</token>
+                            <value>${odlux.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/odlux/framework/src/actions/menuAction.ts b/sdnr/wt/odlux/framework/src/actions/menuAction.ts
new file mode 100644
index 000000000..ec0796587
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/actions/menuAction.ts
@@ -0,0 +1,31 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { Action } from '../flux/action';
+
+export class MenuAction extends Action {
+    constructor(public isOpen: boolean) {
+        super();
+    }
+}
+
+export class MenuClosedByUser extends Action {
+    constructor(public isClosed: boolean) {
+        super();
+    }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/actions/websocketAction.ts b/sdnr/wt/odlux/framework/src/actions/websocketAction.ts
new file mode 100644
index 000000000..8512d59d5
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/actions/websocketAction.ts
@@ -0,0 +1,8 @@
+import { Action } from "../flux/action";
+
+
+export class SetWebsocketAction extends Action {
+    constructor(public isConnected: boolean) {
+        super();
+    }
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/app.css b/sdnr/wt/odlux/framework/src/app.css
index f3d3b7aab..356f36dd0 100644
--- a/sdnr/wt/odlux/framework/src/app.css
+++ b/sdnr/wt/odlux/framework/src/app.css
@@ -2,4 +2,5 @@ html, body, #app {
   height: 100%;
   padding: 0px;
   margin: 0px;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/app.tsx b/sdnr/wt/odlux/framework/src/app.tsx
index 09c7a76e2..85b0dfb34 100644
--- a/sdnr/wt/odlux/framework/src/app.tsx
+++ b/sdnr/wt/odlux/framework/src/app.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================

+ */

 /******************************************************************************

  * Copyright 2018 highstreet technologies GmbH

  *

@@ -50,6 +50,8 @@ import { startRestService } from './services/restService';
 import theme from './design/default';

 import '!style-loader!css-loader!./app.css';

 import { ReplaceAction } from './actions/navigationActions';

+import { startForceLogoutService } from './services/forceLogoutService';

+import { startNotificationService } from './services/notificationService';

 

 declare module '@material-ui/core/styles/createMuiTheme' {

 

@@ -90,6 +92,8 @@ export const runApplication = () => {
 

   startRestService(applicationStore);

   startHistoryListener(applicationStore);

+  startForceLogoutService(applicationStore);

+  startNotificationService(applicationStore);

 

   const App = (): JSX.Element => (

     <ApplicationStoreProvider applicationStore={applicationStore} >

diff --git a/sdnr/wt/odlux/framework/src/common/event.ts b/sdnr/wt/odlux/framework/src/common/event.ts
index f71b0164a..913487911 100644
--- a/sdnr/wt/odlux/framework/src/common/event.ts
+++ b/sdnr/wt/odlux/framework/src/common/event.ts
@@ -1,4 +1,23 @@
 /**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+
+
+/**
   * Represents an event.
   * Events enable a class or object to notify other classes or objects when something of interest occurs.
   * The class that sends (or invokes) the event is called the publisher and the classes that receive (or handle) the event are called subscribers.
diff --git a/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx b/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
index a20c592c5..4cf63e927 100644
--- a/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
+++ b/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
@@ -36,10 +36,10 @@ const styles = (theme: Theme) => createStyles({
     justifyContent: "center",
   },
   paper: {
-    width: theme.spacing.unit * 50,
+    width: theme.spacing(50),
     backgroundColor: theme.palette.background.paper,
     boxShadow: theme.shadows[5],
-    padding: theme.spacing.unit * 4,
+    padding: theme.spacing(4),
   },
   card: {
     minWidth: 275,
@@ -75,43 +75,47 @@ type ErrorDisplayProps = WithStyles<typeof styles> & Connect;
  * Represents a compnent for formaing and displaying errors.
  */
 class ErrorDisplayComponent extends React.Component<ErrorDisplayProps> {
+  constructor(props: ErrorDisplayProps) {
+    super(props);
+  }
+
   render(): JSX.Element {
     const { classes, state } = this.props;
     const errorInfo = state.framework.applicationState.errors.length && state.framework.applicationState.errors[state.framework.applicationState.errors.length - 1];
     return (
-      <Modal className={ classes.modal }
+      <Modal className={classes.modal}
         aria-labelledby="simple-modal-title"
         aria-describedby="simple-modal-description"
-        open={ state.framework.applicationState.errors && state.framework.applicationState.errors.length > 0 }
-        onClose={ () => this.props.dispatch(new ClearErrorInfoAction()) }
+        open={state.framework.applicationState.errors && state.framework.applicationState.errors.length > 0}
+        onClose={() => this.props.dispatch(new ClearErrorInfoAction())}
       >
-        { errorInfo &&
-          <div className={ classes.paper }>
-            <Card className={ classes.card }>
+        {errorInfo &&
+          <div className={classes.paper}>
+            <Card className={classes.card}>
               <CardContent>
-                <Typography className={ classes.title } color="textSecondary">
-                  Something went wrong.
+                <Typography className={classes.title} color="textSecondary">
+                  {errorInfo.title != null ? errorInfo.title : "Something went wrong."}
                 </Typography>
-                <Typography variant="headline" component="h2">
-                { errorInfo.error && errorInfo.error.toString() }
+                <Typography variant="h5" component="h2">
+                  {errorInfo.error && errorInfo.error.toString()}
                 </Typography>
-                <Typography className={ classes.pos } color="textSecondary">
-                { errorInfo.message && errorInfo.message .toString() }
+                <Typography className={classes.pos} color="textSecondary">
+                  {errorInfo.message && errorInfo.message.toString()}
                 </Typography>
                 <Typography component="p">
-                { errorInfo.info && errorInfo.info.componentStack && errorInfo.info.componentStack.split('\n').map(line => {
-                  return [line, <br />];
-                }) }
-                { errorInfo.info && errorInfo.info.extra && errorInfo.info.extra.split('\n').map(line => {
-                  return [line, <br />];
-                }) }
+                  {errorInfo.info && errorInfo.info.componentStack && errorInfo.info.componentStack.split('\n').map(line => {
+                    return [line, <br />];
+                  })}
+                  {errorInfo.info && errorInfo.info.extra && errorInfo.info.extra.split('\n').map(line => {
+                    return [line, <br />];
+                  })}
                 </Typography>
               </CardContent>
               <CardActions>
-              <Button size="small" onClick={ () => this.props.dispatch(new RemoveErrorInfoAction(errorInfo)) } >Close</Button>
-              </CardActions> 
+                <Button size="small" onClick={() => this.props.dispatch(new RemoveErrorInfoAction(errorInfo))} >Close</Button>
+              </CardActions>
             </Card>
-          </div> || null
+          </div> || <div></div>
         }
       </Modal>
     );
diff --git a/sdnr/wt/odlux/framework/src/components/material-table/index.tsx b/sdnr/wt/odlux/framework/src/components/material-table/index.tsx
index d89ced23a..3e31c5e03 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/index.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-table/index.tsx
@@ -33,19 +33,21 @@ import { EnhancedTableFilter } from './tableFilter';
 import { ColumnModel, ColumnType } from './columnModel';
 import { Omit } from '@material-ui/core';
 import { SvgIconProps } from '@material-ui/core/SvgIcon/SvgIcon';
+import { replaceHyphen } from '../../utilities/yangHelper';
+import { string } from 'prop-types';
 export { ColumnModel, ColumnType } from './columnModel';
 
-type propType = string | number | null | undefined | (string|number)[];
+type propType = string | number | null | undefined | (string | number)[];
 type dataType = { [prop: string]: propType };
-type resultType<TData = dataType> = { page: number, rowCount: number, rows: TData[] };
+type resultType<TData = dataType> = { page: number, total: number, rows: TData[] };
 
-export type DataCallback<TData = dataType> = (page?: number, rowsPerPage?: number, orderBy?: string | null, order?: 'asc' | 'desc' | null, filter?: { [property: string]: string }) =>resultType<TData> | Promise<resultType<TData>>;
+export type DataCallback<TData = dataType> = (page?: number, rowsPerPage?: number, orderBy?: string | null, order?: 'asc' | 'desc' | null, filter?: { [property: string]: string }) => resultType<TData> | Promise<resultType<TData>>;
 
 function desc(a: dataType, b: dataType, orderBy: string) {
-  if ((b[orderBy] || "") < (a[orderBy] || "") ) {
+  if ((b[orderBy] || "") < (a[orderBy] || "")) {
     return -1;
   }
-  if ((b[orderBy] || "") > (a[orderBy] || "") ) {
+  if ((b[orderBy] || "") > (a[orderBy] || "")) {
     return 1;
   }
   return 0;
@@ -68,7 +70,7 @@ function getSorting(order: 'asc' | 'desc' | null, orderBy: string) {
 const styles = (theme: Theme) => createStyles({
   root: {
     width: '100%',
-    marginTop: theme.spacing.unit * 3,
+    marginTop: theme.spacing(3),
   },
   table: {
     minWidth: 1020,
@@ -83,7 +85,7 @@ export type MaterialTableComponentState<TData = {}> = {
   orderBy: string | null;
   selected: any[] | null;
   rows: TData[];
-  rowCount: number;
+  total: number;
   page: number;
   rowsPerPage: number;
   loading: boolean;
@@ -95,18 +97,19 @@ export type TableApi = { forceRefresh?: () => Promise<void> };
 
 type MaterialTableComponentBaseProps<TData> = WithStyles<typeof styles> & {
   columns: ColumnModel<TData>[];
-  idProperty: keyof TData | ((data: TData) => React.Key );
+  idProperty: keyof TData | ((data: TData) => React.Key);
+  tableId?: string;
   title?: string;
   enableSelection?: boolean;
   disableSorting?: boolean;
   disableFilter?: boolean;
-  customActionButtons?: { icon: React.ComponentType<SvgIconProps>, tooltip?: string, onClick: () => void  }[];
+  customActionButtons?: { icon: React.ComponentType<SvgIconProps>, tooltip?: string, onClick: () => void }[];
   onHandleClick?(event: React.MouseEvent<HTMLTableRowElement>, rowData: TData): void;
 };
 
-type MaterialTableComponentPropsWithRows<TData={}> = MaterialTableComponentBaseProps<TData> & { rows: TData[]; asynchronus?: boolean; };
-type MaterialTableComponentPropsWithRequestData<TData={}> = MaterialTableComponentBaseProps<TData> & { onRequestData: DataCallback; tableApi?: TableApi; };
-type MaterialTableComponentPropsWithExternalState<TData={}> = MaterialTableComponentBaseProps<TData> & MaterialTableComponentState & {
+type MaterialTableComponentPropsWithRows<TData = {}> = MaterialTableComponentBaseProps<TData> & { rows: TData[]; asynchronus?: boolean; };
+type MaterialTableComponentPropsWithRequestData<TData = {}> = MaterialTableComponentBaseProps<TData> & { onRequestData: DataCallback; tableApi?: TableApi; };
+type MaterialTableComponentPropsWithExternalState<TData = {}> = MaterialTableComponentBaseProps<TData> & MaterialTableComponentState & {
   onToggleFilter: () => void;
   onFilterChanged: (property: string, filterTerm: string) => void;
   onHandleChangePage: (page: number) => void;
@@ -152,7 +155,7 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
       orderBy: isMaterialTableComponentPropsWithRowsAndRequestData(this.props) ? this.props.orderBy : null,
       selected: isMaterialTableComponentPropsWithRowsAndRequestData(this.props) ? this.props.selected : null,
       rows: isMaterialTableComponentPropsWithRows(this.props) && this.props.rows.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) || [],
-      rowCount: isMaterialTableComponentPropsWithRows(this.props) && this.props.rows.length || 0,
+      total: isMaterialTableComponentPropsWithRows(this.props) && this.props.rows.length || 0,
       page,
       rowsPerPage,
     };
@@ -167,58 +170,58 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
   }
   render(): JSX.Element {
     const { classes, columns } = this.props;
-    const { rows, rowCount, order, orderBy, selected, rowsPerPage, page, showFilter, filter } = this.state;
+    const { rows, total: rowCount, order, orderBy, selected, rowsPerPage, page, showFilter, filter } = this.state;
     const emptyRows = rowsPerPage - Math.min(rowsPerPage, rowCount - page * rowsPerPage);
-    const getId = typeof this.props.idProperty !== "function" ? (data: TData) => ((data as {[key:string]: any })[this.props.idProperty as any as string] as string | number) : this.props.idProperty;
+    const getId = typeof this.props.idProperty !== "function" ? (data: TData) => ((data as { [key: string]: any })[this.props.idProperty as any as string] as string | number) : this.props.idProperty;
     const toggleFilter = isMaterialTableComponentPropsWithRowsAndRequestData(this.props) ? this.props.onToggleFilter : () => { !this.props.disableFilter && this.setState({ showFilter: !showFilter }, this.update) }
     return (
-      <Paper className={ classes.root }>
-        <TableToolbar numSelected={ selected && selected.length } title={ this.props.title } customActionButtons={ this.props.customActionButtons } onExportToCsv={ this.exportToCsv }
-          onToggleFilter={ toggleFilter } />
-        <div className={ classes.tableWrapper }>
-          <Table className={ classes.table } aria-labelledby="tableTitle">
+      <Paper className={classes.root}>
+        <TableToolbar tableId={this.props.tableId} numSelected={selected && selected.length} title={this.props.title} customActionButtons={this.props.customActionButtons} onExportToCsv={this.exportToCsv}
+          onToggleFilter={toggleFilter} />
+        <div className={classes.tableWrapper}>
+          <Table className={classes.table} aria-labelledby="tableTitle">
             <EnhancedTableHead
-              columns={ columns }
-              numSelected={ selected && selected.length }
-              order={ order }
-              orderBy={ orderBy }
-              onSelectAllClick={ this.handleSelectAllClick }
-              onRequestSort={ this.onHandleRequestSort }
-              rowCount={ rows.length }
-              enableSelection={ this.props.enableSelection }
+              columns={columns}
+              numSelected={selected && selected.length}
+              order={order}
+              orderBy={orderBy}
+              onSelectAllClick={this.handleSelectAllClick}
+              onRequestSort={this.onHandleRequestSort}
+              rowCount={rows.length}
+              enableSelection={this.props.enableSelection}
             />
             <TableBody>
-              { showFilter && <EnhancedTableFilter columns={ columns } filter={ filter } onFilterChanged={ this.onFilterChanged } enableSelection={this.props.enableSelection} /> || null }
-              { rows // may need ordering here
+              {showFilter && <EnhancedTableFilter columns={columns} filter={filter} onFilterChanged={this.onFilterChanged} enableSelection={this.props.enableSelection} /> || null}
+              {rows // may need ordering here
                 .map((entry: TData & { [key: string]: any }) => {
                   const entryId = getId(entry);
                   const isSelected = this.isSelected(entryId);
                   return (
                     <TableRow
                       hover
-                      onClick={ event => this.handleClick(event, entry, entryId) }
+                      onClick={event => this.handleClick(event, entry, entryId)}
                       role="checkbox"
-                      aria-checked={ isSelected }
-                      tabIndex={ -1 }
-                      key={ entryId }
-                      selected={ isSelected }
+                      aria-checked={isSelected}
+                      tabIndex={-1}
+                      key={entryId}
+                      selected={isSelected}
                     >
-                      { this.props.enableSelection
-                       ? <TableCell padding="checkbox" style={ { width: "50px" } }>
-                          <Checkbox checked={ isSelected } />
+                      {this.props.enableSelection
+                        ? <TableCell padding="checkbox" style={{ width: "50px" }}>
+                          <Checkbox checked={isSelected} />
                         </TableCell>
-                       : null
+                        : null
                       }
                       {
                         this.props.columns.map(
                           col => {
-                            const style = col.width ? { width: col.width } : { };
+                            const style = col.width ? { width: col.width } : {};
                             return (
-                              <TableCell key={ col.property } align={ col.type === ColumnType.numeric && !col.align ? "right": col.align } style={ style }>
-                                { col.type === ColumnType.custom && col.customControl
-                                  ? <col.customControl className={col.className} style={col.style} rowData={ entry } />
+                              <TableCell key={col.property} align={col.type === ColumnType.numeric && !col.align ? "right" : col.align} style={style}>
+                                {col.type === ColumnType.custom && col.customControl
+                                  ? <col.customControl className={col.className} style={col.style} rowData={entry} />
                                   : col.type === ColumnType.boolean
-                                    ? <span className={col.className} style={col.style}>{col.labels ? col.labels[entry[col.property] ? "true": "false"] : String(entry[col.property]) }</span>
+                                    ? <span className={col.className} style={col.style}>{col.labels ? col.labels[entry[col.property] ? "true" : "false"] : String(entry[col.property])}</span>
                                     : <span className={col.className} style={col.style}>{String(entry[col.property])}</span>
                                 }
                               </TableCell>
@@ -228,29 +231,29 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
                       }
                     </TableRow>
                   );
-                }) }
-              { emptyRows > 0 && (
-                <TableRow style={ { height: 49 * emptyRows } }>
-                  <TableCell colSpan={ this.props.columns.length } />
+                })}
+              {emptyRows > 0 && (
+                <TableRow style={{ height: 49 * emptyRows }}>
+                  <TableCell colSpan={this.props.columns.length} />
                 </TableRow>
-              ) }
+              )}
             </TableBody>
           </Table>
         </div>
         <TablePagination
-          rowsPerPageOptions={[5, 10, 20, 50] }
+          rowsPerPageOptions={[5, 10, 20, 50]}
           component="div"
-          count={ rowCount }
-          rowsPerPage={ rowsPerPage }
-          page={ page }
-          backIconButtonProps={ {
+          count={rowCount}
+          rowsPerPage={rowsPerPage}
+          page={page}
+          backIconButtonProps={{
             'aria-label': 'Previous Page',
-          } }
-          nextIconButtonProps={ {
+          }}
+          nextIconButtonProps={{
             'aria-label': 'Next Page',
-          } }
-          onChangePage={ this.onHandleChangePage }
-          onChangeRowsPerPage={ this.onHandleChangeRowsPerPage }
+          }}
+          onChangePage={this.onHandleChangePage}
+          onChangeRowsPerPage={this.onHandleChangeRowsPerPage}
         />
       </Paper>
     );
@@ -261,7 +264,7 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
       return {
         ...state,
         rows: props.rows,
-        rowCount: props.rowCount,
+        total: props.total,
         orderBy: props.orderBy,
         order: props.order,
         filter: props.filter,
@@ -281,9 +284,11 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
     return state;
   }
 
-  private static updateRows(props: MaterialTableComponentPropsWithRows, state: MaterialTableComponentState): { rows: {}[], rowCount: number } {
+  private static updateRows(props: MaterialTableComponentPropsWithRows, state: MaterialTableComponentState): { rows: {}[], total: number, page: number } {
+
+    const { page, rowsPerPage, order, orderBy, filter } = state;
+
     try {
-      const { page, rowsPerPage, order, orderBy, filter } = state;
       let data: dataType[] = props.rows || [];
       let filtered = false;
       if (state.showFilter) {
@@ -292,25 +297,84 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
           filtered = filtered || exp !== undefined;
           data = exp !== undefined ? data.filter((val) => {
             const value = val[prop];
-            return (value == exp) || (value && value.toString().indexOf(String(exp)) > -1);
+
+            if (value) {
+
+              if (typeof exp === 'boolean') {
+                return value == exp;
+
+              } else if (typeof exp === 'string') {
+
+                const valueAsString = value.toString();
+                if (exp.length === 0) return value;
+
+                const regex = new RegExp("\\*", "g");
+                const regex2 = new RegExp("\\?", "g");
+
+                const countStar = (exp.match(regex) || []).length;
+                const countQuestionmarks = (exp.match(regex2) || []).length;
+
+                if (countStar > 0 || countQuestionmarks > 0) {
+                  let editableExpression = exp;
+
+                  if (!exp.startsWith('*')) {
+                    editableExpression = '^' + exp;
+                  }
+
+                  if (!exp.endsWith('*')) {
+                    editableExpression = editableExpression + '$';
+                  }
+
+                  const expressionAsRegex = editableExpression.replace(/\*/g, ".*").replace(/\?/g, ".");
+
+                  return valueAsString.match(new RegExp(expressionAsRegex, "g"));
+                }
+                else if (exp.includes('>=')) {
+                  return Number(valueAsString) >= Number(exp.replace('>=', ''));
+                } else if (exp.includes('<=')) {
+                  return Number(valueAsString) <= Number(exp.replace('<=', ''));
+                } else
+                  if (exp.includes('>')) {
+                    return Number(valueAsString) > Number(exp.replace('>', ''));
+                  } else if (exp.includes('<')) {
+                    return Number(valueAsString) < Number(exp.replace('<', ''));
+                  }
+              }
+            }
+
+            return (value == exp)
           }) : data;
         });
       }
 
       const rowCount = data.length;
 
-      data = (orderBy && order
-        ? stableSort(data, getSorting(order, orderBy))
-        : data).slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage);
+      if (page > 0 && rowsPerPage * page > rowCount) { //if result is smaller than the currently shown page, new search and repaginate
+        let newPage = Math.floor(rowCount / rowsPerPage);
+        return {
+          rows: data,
+          total: rowCount,
+          page: newPage
+        };
+      } else {
+        data = (orderBy && order
+          ? stableSort(data, getSorting(order, orderBy))
+          : data).slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage);
+
+        return {
+          rows: data,
+          total: rowCount,
+          page: page
+        };
+      }
 
-      return {
-        rows: data,
-        rowCount
-      };
-    } catch{
+
+    } catch (e) {
+      console.error(e);
       return {
         rows: [],
-        rowCount: 0
+        total: 0,
+        page: page
       }
     }
   }
@@ -323,7 +387,8 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
       );
       this.setState(response);
     } else {
-      this.setState(MaterialTableComponent.updateRows(this.props, this.state));
+      let updateResult = MaterialTableComponent.updateRows(this.props, this.state);
+      this.setState(updateResult);
     }
   }
 
@@ -361,7 +426,7 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
 
   handleSelectAllClick: () => {};
 
-  private onHandleChangePage = (event: React.MouseEvent<HTMLButtonElement> | null, page: number) => {
+  private onHandleChangePage = (event: any | null, page: number) => {
     if (isMaterialTableComponentPropsWithRowsAndRequestData(this.props)) {
       this.props.onHandleChangePage(page);
       return;
@@ -390,12 +455,12 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
     return (selectedIndex > -1);
   }
 
-  private handleClick(event: React.MouseEvent<HTMLTableRowElement>, rowData: TData, id: string | number): void {
+  private handleClick(event: any, rowData: TData, id: string | number): void {
     if (this.props.onHandleClick instanceof Function) {
       this.props.onHandleClick(event, rowData);
       return;
     }
-    if (!this.props.enableSelection){
+    if (!this.props.enableSelection) {
       return;
     }
     let selected = this.state.selected || [];
@@ -416,20 +481,26 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
     });
   }
 
+
   private exportToCsv = async () => {
     let file;
     let data: dataType[] | null = null;
     let csv: string[] = [];
 
-
     if (isMaterialTableComponentPropsWithRequestData(this.props)) {
+      // table with extra request handler 
       this.setState({ loading: true });
       const result = await Promise.resolve(
-        this.props.onRequestData( 0, 1000, this.state.orderBy, this.state.order, this.state.showFilter && this.state.filter || {})
+        this.props.onRequestData(0, 1000, this.state.orderBy, this.state.order, this.state.showFilter && this.state.filter || {})
       );
       data = result.rows;
       this.setState({ loading: true });
-    } else {
+    } else if (isMaterialTableComponentPropsWithRowsAndRequestData(this.props)) {
+      // table with generated handlers note: exports data shown on current page
+      data = this.props.rows;
+    }
+    else {
+      // table with local data
       data = MaterialTableComponent.updateRows(this.props, this.state).rows;
     }
 
@@ -438,7 +509,7 @@ class MaterialTableComponent<TData extends {} = {}> extends React.Component<Mate
       this.state.rows && this.state.rows.forEach((row: any) => {
         csv.push(this.props.columns.map(col => row[col.property]).join(',') + "\r\n");
       });
-      const properties = { type: "text/csv;charset=utf-8"  }; // Specify the file's mime-type.
+      const properties = { type: "text/csv;charset=utf-8" }; // Specify the file's mime-type.
       try {
         // Specify the filename using the File constructor, but ...
         file = new File(csv, "export.csv", properties);
diff --git a/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx b/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
index 0356aa225..737ea85f9 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-table/tableFilter.tsx
@@ -33,7 +33,7 @@ const styles = (theme: Theme) => createStyles({
     flexWrap: 'wrap',
   },
   input: {
-    margin: theme.spacing.unit,
+    margin: theme.spacing(1),
   },
 });
 
@@ -45,7 +45,7 @@ interface IEnhancedTableFilterComponentProps extends WithStyles<typeof styles> {
 }
 
 class EnhancedTableFilterComponent extends React.Component<IEnhancedTableFilterComponentProps> {
-  createFilterHandler = (property: string) => (event: React.ChangeEvent<HTMLInputElement|HTMLSelectElement|HTMLTextAreaElement>) => {
+  createFilterHandler = (property: string) => (event: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => {
     this.props.onFilterChanged && this.props.onFilterChanged(property, event.target.value);
   };
 
@@ -53,33 +53,33 @@ class EnhancedTableFilterComponent extends React.Component<IEnhancedTableFilterC
     const { columns, filter, classes } = this.props;
     return (
       <TableRow>
-         { this.props.enableSelection
-           ? <TableCell padding="checkbox" style={ { width: "50px" } }>
-             </TableCell>
-           : null
-         }
-        { columns.map(col => {
+        {this.props.enableSelection
+          ? <TableCell padding="checkbox" style={{ width: "50px" }}>
+          </TableCell>
+          : null
+        }
+        {columns.map(col => {
           const style = col.width ? { width: col.width } : {};
           return (
             <TableCell
-              key={ col.property }
-              padding={ col.disablePadding ? 'none' : 'default' }
-              style={ style }
+              key={col.property}
+              padding={col.disablePadding ? 'none' : 'default'}
+              style={style}
             >
-              { col.disableFilter || (col.type === ColumnType.custom)
+              {col.disableFilter || (col.type === ColumnType.custom)
                 ? null
                 : (col.type === ColumnType.boolean)
                   ? <Select className={classes.input} value={filter[col.property] !== undefined ? filter[col.property] : ''} onChange={this.createFilterHandler(col.property)} inputProps={{ name: `${col.property}-bool`, id: `${col.property}-bool` }} >
                     <MenuItem value={undefined}>
                       <em>None</em>
                     </MenuItem>
-                    <MenuItem value={true as any as string}>{ col.labels ? col.labels["true"]:"true"}</MenuItem>
-                    <MenuItem value={false as any as string}>{ col.labels ? col.labels["false"] : "false"}</MenuItem>
+                    <MenuItem value={true as any as string}>{col.labels ? col.labels["true"] : "true"}</MenuItem>
+                    <MenuItem value={false as any as string}>{col.labels ? col.labels["false"] : "false"}</MenuItem>
                   </Select>
                   : <Input className={classes.input} inputProps={{ 'aria-label': 'Filter' }} value={filter[col.property] || ''} onChange={this.createFilterHandler(col.property)} />}
             </TableCell>
           );
-        }, this) }
+        }, this)}
       </TableRow>
     );
   }
diff --git a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
index 80d38ab52..a4080b51b 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
@@ -32,7 +32,7 @@ import { SvgIconProps } from '@material-ui/core/SvgIcon/SvgIcon';
 
 const styles = (theme: Theme) => createStyles({
   root: {
-    paddingRight: theme.spacing.unit,
+    paddingRight: theme.spacing(1),
   },
   highlight:
     theme.palette.type === 'light'
@@ -65,6 +65,7 @@ const styles = (theme: Theme) => createStyles({
 interface ITableToolbarComponentProps extends WithStyles<typeof styles> {
   numSelected: number | null;
   title?: string;
+  tableId?: string;
   customActionButtons?: { icon: React.ComponentType<SvgIconProps>, tooltip?: string, onClick: () => void }[];
   onToggleFilter: () => void;
   onExportToCsv: () => void;
@@ -79,7 +80,7 @@ class TableToolbarComponent extends React.Component<ITableToolbarComponentProps,
     };
   }
 
-  private handleMenu  = (event: React.MouseEvent<HTMLElement>) => {
+  private handleMenu = (event: React.MouseEvent<HTMLElement>) => {
     this.setState({ anchorEl: event.currentTarget });
   };
 
@@ -89,55 +90,55 @@ class TableToolbarComponent extends React.Component<ITableToolbarComponentProps,
   render() {
     const { numSelected, classes } = this.props;
     const open = !!this.state.anchorEl;
-
+    const buttonPrefix = this.props.tableId !== undefined ? this.props.tableId + '-' : '';
     return (
-      <Toolbar className={ `${ classes.root } ${ numSelected && numSelected > 0 ? classes.highlight : '' } ` } >
-        <div className={ classes.title }>
-          { numSelected && numSelected > 0 ? (
-            <Typography color="inherit" variant="subheading">
-              { numSelected } selected
+      <Toolbar className={`${classes.root} ${numSelected && numSelected > 0 ? classes.highlight : ''} `} >
+        <div className={classes.title}>
+          {numSelected && numSelected > 0 ? (
+            <Typography color="inherit" variant="subtitle1">
+              {numSelected} selected
           </Typography>
           ) : (
-              <Typography variant="headline" id="tableTitle">
-                { this.props.title || null }
+              <Typography variant="h5" id="tableTitle">
+                {this.props.title || null}
               </Typography>
-            ) }
+            )}
         </div>
-        <div className={ classes.spacer } />
-        <div className={ classes.actions }>
-          { this.props.customActionButtons 
-            ? this.props.customActionButtons.map((action, ind) =>(
-              <Tooltip key={ `custom-action-${ ind }`} title={action.tooltip}>
-              <IconButton aria-label={ `custom-action-${ind}` } onClick={() => action.onClick() }>
-                <action.icon />
-              </IconButton>
-            </Tooltip>
+        <div className={classes.spacer} />
+        <div className={classes.actions}>
+          {this.props.customActionButtons
+            ? this.props.customActionButtons.map((action, ind) => (
+              <Tooltip key={`custom-action-${ind}`} title={action.tooltip}>
+                <IconButton aria-label={buttonPrefix + `custom-action-${ind}`} onClick={() => action.onClick()}>
+                  <action.icon />
+                </IconButton>
+              </Tooltip>
             ))
-            : null }
-          { numSelected && numSelected > 0 ? (
+            : null}
+          {numSelected && numSelected > 0 ? (
             <Tooltip title="Delete">
-              <IconButton aria-label="Delete">
+              <IconButton aria-label={buttonPrefix + "delete"}>
                 <DeleteIcon />
               </IconButton>
             </Tooltip>
           ) : (
               <Tooltip title="Filter list">
-                <IconButton aria-label="Filter list" onClick={ () => { this.props.onToggleFilter && this.props.onToggleFilter() } }>
+                <IconButton aria-label={buttonPrefix + "filter-list"} onClick={() => { this.props.onToggleFilter && this.props.onToggleFilter() }}>
                   <FilterListIcon />
                 </IconButton>
               </Tooltip>
-            ) }
+            )}
           <Tooltip title="Actions">
             <IconButton color="inherit"
-              aria-owns={ open ? 'menu-appbar' : undefined }
+              aria-owns={open ? 'menu-appbar' : undefined}
               aria-haspopup="true"
-              onClick={ this.handleMenu } >
+              onClick={this.handleMenu} >
               <MoreIcon />
             </IconButton>
           </Tooltip>
-          <Menu id="menu-appbar" anchorEl={ this.state.anchorEl } anchorOrigin={ { vertical: 'top', horizontal: 'right' } } 
-                transformOrigin={ { vertical: 'top', horizontal: 'right' } } open={ open } onClose={ this.handleClose } >
-            <MenuItem onClick={ this.props.onExportToCsv }>Export as CSV</MenuItem>
+          <Menu id="menu-appbar" anchorEl={this.state.anchorEl} anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
+            transformOrigin={{ vertical: 'top', horizontal: 'right' }} open={open} onClose={this.handleClose} >
+            <MenuItem onClick={this.props.onExportToCsv}>Export as CSV</MenuItem>
           </Menu>
         </div>
       </Toolbar>
diff --git a/sdnr/wt/odlux/framework/src/components/material-table/utilities.ts b/sdnr/wt/odlux/framework/src/components/material-table/utilities.ts
index 43c3b5e35..6e8902c07 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/utilities.ts
+++ b/sdnr/wt/odlux/framework/src/components/material-table/utilities.ts
@@ -27,7 +27,7 @@ export interface IExternalTableState<TData> {
   orderBy: string | null;
   selected: any[] | null;
   rows: TData[];
-  rowCount: number;
+  total: number;
   page: number;
   rowsPerPage: number;
   loading: boolean;
@@ -68,13 +68,13 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
   }
 
   class SetPreFilterChangedAction extends TableAction {
-    constructor(public preFilter: {[key: string]: string}) {
+    constructor(public preFilter: { [key: string]: string }) {
       super();
     }
   }
 
   class SetFilterChangedAction extends TableAction {
-    constructor (public filter: { [key: string]: string }) {
+    constructor(public filter: { [key: string]: string }) {
       super();
     }
   }
@@ -92,7 +92,7 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
   }
 
   class SetResultAction extends TableAction {
-    constructor(public result: { page: number, rowCount: number, rows: TData[] }) {
+    constructor(public result: { page: number, total: number, rows: TData[] }) {
       super();
     }
   }
@@ -105,7 +105,7 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
     orderBy: null,
     selected: null,
     rows: [],
-    rowCount: 0,
+    total: 0,
     page: 0,
     rowsPerPage: 10,
     loading: false,
@@ -126,14 +126,14 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
         ...state,
         loading: false,
         rows: action.result.rows,
-        rowCount: action.result.rowCount,
+        total: action.result.total,
         page: action.result.page,
       }
     } else if (action instanceof RequestSortAction) {
       state = {
         ...state,
         loading: true,
-        orderBy : state.orderBy === action.orderBy && state.order === 'desc' ? null : action.orderBy ,
+        orderBy: state.orderBy === action.orderBy && state.order === 'desc' ? null : action.orderBy,
         order: state.orderBy === action.orderBy && state.order === 'asc' ? 'desc' : 'asc',
       }
     } else if (action instanceof SetShowFilterAction) {
@@ -176,9 +176,23 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
   const reloadAction = (dispatch: Dispatch, getAppState: () => IApplicationStoreState) => {
     dispatch(new RefreshAction());
     const ownState = selectState(getAppState());
-    const filter = { ...ownState.preFilter, ...(ownState.showFilter && ownState.filter || {})};
-    Promise.resolve(callback(ownState.page, ownState.rowsPerPage, ownState.orderBy, ownState.order, filter )).then(result => {
-      dispatch(new SetResultAction(result));
+    const filter = { ...ownState.preFilter, ...(ownState.showFilter && ownState.filter || {}) };
+    Promise.resolve(callback(ownState.page, ownState.rowsPerPage, ownState.orderBy, ownState.order, filter)).then(result => {
+
+      if (ownState.page > 0 && ownState.rowsPerPage * ownState.page > result.total) { //if result is smaller than the currently shown page, new search and repaginate
+
+        let newPage = Math.floor(result.total / ownState.rowsPerPage);
+
+        Promise.resolve(callback(newPage, ownState.rowsPerPage, ownState.orderBy, ownState.order, filter)).then(result1 => {
+          dispatch(new SetResultAction(result1));
+        });
+
+
+      } else {
+        dispatch(new SetResultAction(result));
+      }
+
+
     }).catch(error => new AddErrorInfoAction(error));
   };
 
@@ -186,8 +200,8 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
     return {
       onPreFilterChanged: (preFilter: { [key: string]: string }) => {
         dispatch(new SetPreFilterChangedAction(preFilter));
-          (!skipRefresh) && dispatch(reloadAction);
-        }
+        (!skipRefresh) && dispatch(reloadAction);
+      }
     };
   }
 
@@ -236,7 +250,7 @@ export function createExternal<TData>(callback: DataCallback<TData>, selectState
   const createProperties = (state: IApplicationStoreState) => {
     return {
       ...selectState(state)
-     }
+    }
   }
 
   return {
diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/index.ts b/sdnr/wt/odlux/framework/src/components/material-ui/index.ts
index c756f7f07..e0e3fc943 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/index.ts
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/index.ts
@@ -15,8 +15,8 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-export { ListItemLink } from './listItemLink';

-export { Panel } from './panel';

-export { ToggleButton, ToggleButtonClassKey } from './toggleButton';

-export { TreeView, ITreeItem, TreeViewCtorType} from './treeView';

-

+export { ListItemLink } from './listItemLink';
+export { Panel } from './panel';
+export { ToggleButton, ToggleButtonClassKey } from './toggleButton';
+export { TreeView, ITreeItem, TreeViewCtorType} from './treeView';
+export { Loader } from './loader';
diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/loader.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/loader.tsx
new file mode 100644
index 000000000..5ab2fd415
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/loader.tsx
@@ -0,0 +1,45 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from "react";
+
+import { WithStyles, withStyles, createStyles, Theme } from '@material-ui/core/styles';
+
+const styles = (theme: Theme) => createStyles({
+  "@keyframes spin": {
+    "0%": { transform: "rotate(0deg)" },
+    "100%": { transform: "rotate(360deg)" },
+  },
+  loader: {
+    border: `16px solid ${theme.palette.grey.A200}`,
+    borderTop: `16px solid ${theme.palette.secondary.main}`,
+    borderRadius: "50%",
+    width: "120px",
+    height: "120px",
+    animation: "$spin 2s linear infinite",
+  }
+});
+
+const LoaderComponent: React.FC<WithStyles<typeof styles>> = (props) => {
+  return (
+    <div className={props.classes.loader} />
+  );
+};
+
+export const Loader = withStyles(styles)(LoaderComponent);
diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/panel.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/panel.tsx
index 9627a749b..378d48592 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/panel.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/panel.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';

 

 import { withStyles, Theme, WithStyles, createStyles } from '@material-ui/core/styles';

@@ -32,8 +32,8 @@ const styles = (theme: Theme) => createStyles({
   detail: {

     // background: theme.palette.background.paper,

     // color: theme.palette.text.primary,

-    position: "relative", 

-    display: 'flex', 

+    position: "relative",

+    display: 'flex',

     flexDirection: 'column'

   },

   text: {

@@ -53,18 +53,18 @@ type PanalProps = WithStyles<typeof styles> & {
 const PanelComponent: React.SFC<PanalProps> = (props) => {

   const { classes, activePanel, onToggle } = props;

   return (

-    <ExpansionPanel className={ classes.accordion } expanded={ activePanel === props.panelId } onChange={ () => onToggle(props.panelId) } >

-      <ExpansionPanelSummary expandIcon={ <ExpandMoreIcon /> }>

-        <Typography className={ classes.text } >{ props.title }</Typography>

+    <ExpansionPanel className={classes.accordion} expanded={activePanel === props.panelId} onChange={() => onToggle(props.panelId)} >

+      <ExpansionPanelSummary expandIcon={<ExpandMoreIcon />}>

+        <Typography className={classes.text} >{props.title}</Typography>

       </ExpansionPanelSummary>

-      <ExpansionPanelDetails className={ classes.detail }>

-        { props.children }

+      <ExpansionPanelDetails className={classes.detail}>

+        {props.children}

       </ExpansionPanelDetails>

-      { props.customActionButtons 

+      {props.customActionButtons

         ? <ExpansionPanelActions>

-          { props.customActionButtons }

-         </ExpansionPanelActions> 

-        : null }  

+          {props.customActionButtons}

+        </ExpansionPanelActions>

+        : null}

     </ExpansionPanel>

   );

 };

diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/snackDisplay.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/snackDisplay.tsx
index 610376107..437784ce5 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/snackDisplay.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/snackDisplay.tsx
@@ -21,7 +21,7 @@ import { IApplicationStoreState } from '../../store/applicationStore';
 import { Connect, connect, IDispatcher } from '../../flux/connect';
 import { RemoveSnackbarNotification } from '../../actions/snackbarActions';
 
-import { InjectedNotistackProps, withSnackbar } from 'notistack';
+import { WithSnackbarProps, withSnackbar } from 'notistack';
 
 const mapProps = (state: IApplicationStoreState) => ({
   notifications: state.framework.applicationState.snackBars
@@ -33,7 +33,7 @@ const mapDispatch = (dispatcher: IDispatcher) => ({
    }
 });
 
-type DisplaySnackbarsComponentProps = Connect<typeof mapProps, typeof mapDispatch> & InjectedNotistackProps;
+type DisplaySnackbarsComponentProps = Connect<typeof mapProps, typeof mapDispatch> & WithSnackbarProps;
 
 class DisplaySnackbarsComponent extends React.Component<DisplaySnackbarsComponentProps> {
   private displayed: number[] = [];
diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/toggleButton.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/toggleButton.tsx
index fb10ca941..1a29d6970 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/toggleButton.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/toggleButton.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';

 import classNames from 'classnames';

@@ -30,7 +30,7 @@ export const styles = (theme: Theme) => createStyles({
         height: 32,

         minWidth: 48,

         margin: 0,

-        padding: `${theme.spacing.unit - 4}px ${theme.spacing.unit * 1.5}px`,

+        padding: `${theme.spacing(1 - 4)}px ${theme.spacing(1.5)}px`,

         borderRadius: 2,

         willChange: 'opacity',

         color: fade(theme.palette.action.active, 0.38),

@@ -119,6 +119,7 @@ class ToggleButtonComponent extends React.Component<IToggleButtonProps> {
     handleChange = (event: React.FormEvent<HTMLElement>) => {

         const { onChange, onClick, value } = this.props;

 

+        event.stopPropagation();

         if (onClick) {

             onClick(event, value);

             if (event.isDefaultPrevented()) {

@@ -129,6 +130,7 @@ class ToggleButtonComponent extends React.Component<IToggleButtonProps> {
         if (onChange) {

             onChange(event, value);

         }

+        event.preventDefault();

     };

 

     render() {

@@ -157,6 +159,7 @@ class ToggleButtonComponent extends React.Component<IToggleButtonProps> {
                 disabled={disabled}

                 focusRipple={!disableFocusRipple}

                 onClick={this.handleChange}

+                href="#"

                 {...other}

             >

                 <span className={classes.label}>{children}</span>

diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/treeView.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/treeView.tsx
index 7f2f73926..e4eb3a794 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/treeView.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/treeView.tsx
@@ -103,21 +103,21 @@ class TreeViewComponent<TData extends ITreeItem> extends React.Component<TreeVie
         ...this.props.style
       },
       search: {
-        padding: `0px ${ this.props.theme.spacing.unit }px`
+        padding: `0px ${this.props.theme.spacing(1)}px`
       }
     };
     return (
-      <div style={ styles.root }>
-        { children }
-        { enableSearchBar && <TextField label={ "Search" } fullWidth={ true } style={ styles.search } value={ searchTerm } onChange={ this.onChangeSearchText } /> || null }
+      <div style={styles.root}>
+        {children}
+        {enableSearchBar && <TextField label={"Search"} fullWidth={true} style={styles.search} value={searchTerm} onChange={this.onChangeSearchText} /> || null}
         <List>
-            { this.renderItems(items, searchTerm && searchTerm.toLowerCase()) }
+          {this.renderItems(items, searchTerm && searchTerm.toLowerCase())}
         </List>
       </div>
     );
   }
 
-  private itemIndex: number = 0; 
+  private itemIndex: number = 0;
   private renderItems = (items: TData[], searchTerm: string | undefined, depth: number = 1) => {
     return items.reduce((acc, item) => {
 
@@ -144,7 +144,7 @@ class TreeViewComponent<TData extends ITreeItem> extends React.Component<TreeVie
   private renderItem = (item: TData, searchTerm: string | undefined, depth: number, isFolder: boolean, expanded: boolean): JSX.Element | null => {
     const styles = {
       item: {
-        paddingLeft: (((this.props.depthOffset || 0) + depth) * this.props.theme.spacing.unit * 3),
+        paddingLeft: (((this.props.depthOffset || 0) + depth) * this.props.theme.spacing(3)),
         backgroundColor: this.state.activeItem === item ? this.props.theme.palette.action.selected : undefined,
         height: this.props.itemHeight || undefined,
         cursor: item.disabled ? 'not-allowed' : 'pointer',
@@ -159,47 +159,47 @@ class TreeViewComponent<TData extends ITreeItem> extends React.Component<TreeVie
     const searchTermLength = searchTerm && searchTerm.length || 0;
 
     const handleClickCreator = (isIcon: boolean) => (event: React.SyntheticEvent) => {
-          if (item.disabled) return;
-          event.preventDefault();
-          event.stopPropagation();
-          if (isFolder && (this.props.autoExpandFolder || isIcon)) {
-            this.props.onFolderClick ? this.props.onFolderClick(item) : this.onFolderClick(item); 
-          } else {
-            this.props.onItemClick ? this.props.onItemClick(item) : this.onItemClick(item);
-          }
-        };
+      if (item.disabled) return;
+      event.preventDefault();
+      event.stopPropagation();
+      if (isFolder && (this.props.autoExpandFolder || isIcon)) {
+        this.props.onFolderClick ? this.props.onFolderClick(item) : this.onFolderClick(item);
+      } else {
+        this.props.onItemClick ? this.props.onItemClick(item) : this.onItemClick(item);
+      }
+    };
 
     return ((searchTerm && (matchIndex > -1 || expanded) || !searchTerm)
       ? (
-        <ListItem key={ `tree-list-${ this.itemIndex++ }` } style={ styles.item } onClick={ handleClickCreator(false) } button >
+        <ListItem key={`tree-list-${this.itemIndex++}`} style={styles.item} onClick={handleClickCreator(false)} button >
 
           { // display the left icon
-            (this.props.useFolderIcons && <ListItemIcon>{ isFolder ? <FolderIcon /> : <FileIcon /> }</ListItemIcon>) ||
-            (item.icon && (<ListItemIcon><item.icon /></ListItemIcon>)) }
+            (this.props.useFolderIcons && <ListItemIcon>{isFolder ? <FolderIcon /> : <FileIcon />}</ListItemIcon>) ||
+            (item.icon && (<ListItemIcon><item.icon /></ListItemIcon>))}
+
 
-          
           { // highlight search result
             matchIndex > -1
-            ? (<span>
-                { text.substring(0, matchIndex) }
-              <span
-                style={ {
-                  display: 'inline-block',
-                  backgroundColor: 'rgba(255,235,59,0.5)',
-                  padding: '3px',
-                } }
-              >
-                  { text.substring(matchIndex, matchIndex + searchTermLength) }
-              </span>
-                { text.substring(matchIndex + searchTermLength) }
-            </span>)
-            : (<ListItemText primary={ text } />)
+              ? (<span>
+                {text.substring(0, matchIndex)}
+                <span
+                  style={{
+                    display: 'inline-block',
+                    backgroundColor: 'rgba(255,235,59,0.5)',
+                    padding: '3px',
+                  }}
+                >
+                  {text.substring(matchIndex, matchIndex + searchTermLength)}
+                </span>
+                {text.substring(matchIndex + searchTermLength)}
+              </span>)
+              : (<ListItemText primary={text} />)
           }
 
           { // display the right icon, depending on the state 
-            !isFolder ? null : expanded ? (<OpenIcon onClick={ handleClickCreator(true) } />) : (<CloseIcon onClick={ handleClickCreator(true) } />) }
+            !isFolder ? null : expanded ? (<OpenIcon onClick={handleClickCreator(true)} />) : (<CloseIcon onClick={handleClickCreator(true)} />)}
         </ListItem>
-       )
+      )
       : null
     );
   }
@@ -264,5 +264,5 @@ class TreeViewComponent<TData extends ITreeItem> extends React.Component<TreeVie
 
 export type TreeViewCtorType<TData extends ITreeItem = ITreeItem> = new () => React.Component<Omit<TreeViewComponentProps<TData>, 'theme'>>;
 
-export const TreeView = withTheme()(TreeViewComponent);
+export const TreeView = withTheme(TreeViewComponent);
 export default TreeView;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx b/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx
index e3adaeed7..00d43d99c 100644
--- a/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx
+++ b/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';

 import { withStyles, WithStyles, createStyles, Theme } from '@material-ui/core/styles';

 

@@ -29,7 +29,9 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 

 import ListItemLink from '../components/material-ui/listItemLink';

 

-import connect, { Connect } from '../flux/connect';

+import connect, { Connect, IDispatcher } from '../flux/connect';

+import { MenuAction } from '../actions/menuAction';

+import * as classNames from 'classnames';

 

 const drawerWidth = 240;

 

@@ -38,41 +40,101 @@ const styles = (theme: Theme) => createStyles({
     position: 'relative',

     width: drawerWidth,

   },

-  toolbar: theme.mixins.toolbar

+  toolbar: theme.mixins.toolbar,

+  drawerOpen: {

+    width: drawerWidth,

+    transition: theme.transitions.create('width', {

+      easing: theme.transitions.easing.sharp,

+      duration: theme.transitions.duration.enteringScreen,

+    }),

+  },

+  drawerClose: {

+    transition: theme.transitions.create('width', {

+      easing: theme.transitions.easing.sharp,

+      duration: theme.transitions.duration.leavingScreen,

+    }),

+    overflowX: 'hidden',

+    width: theme.spacing(7) + 1,

+    [theme.breakpoints.up('sm')]: {

+      width: theme.spacing(9) + 1,

+    },

+  }

 });

 

-export const NavigationMenu = withStyles(styles)(connect()(({ classes, state }: WithStyles<typeof styles> & Connect) => {

+const tabletWidthBreakpoint = 768;

+

+export const NavigationMenu = withStyles(styles)(connect()(({ classes, state, dispatch }: WithStyles<typeof styles> & Connect & Connect) => {

   const { user } = state.framework.authenticationState

+  const isOpen = state.framework.applicationState.isMenuOpen

+  const closedByUser = state.framework.applicationState.isMenuClosedByUser

+

+  const [responsive, setResponsive] = React.useState(false);

+

+  React.useEffect(() => {

+

+    function handleResize() {

+      if (user && user.isValid) {

+        if (window.innerWidth < tabletWidthBreakpoint && !responsive) {

+          setResponsive(true);

+          if (!closedByUser) {

+            console.log("responsive menu collapsed")

+            dispatch(new MenuAction(false));

+          }

+

+        } else if (window.innerWidth > tabletWidthBreakpoint && responsive) {

+          setResponsive(false);

+          if (!closedByUser) {

+            console.log("responsive menu restored")

+            dispatch(new MenuAction(true));

+          }

+

+        }

+      }

+    }

+    window.addEventListener("resize", handleResize);

+

+

+    return () => {

+      window.removeEventListener("resize", handleResize);

+    }

+  })

+

   return (

     <Drawer

       variant="permanent"

+      className={

+        classNames({

+          [classes.drawerOpen]: isOpen,

+          [classes.drawerClose]: !isOpen

+        })

+      }

       classes={{

         paper: classes.drawerPaper,

       }}

     >

       {user && user.isValid && <>

         <div className={classes.toolbar} />

-      { /* https://fiffty.github.io/react-treeview-mui/ */}

-      <List component="nav">

+        { /* https://fiffty.github.io/react-treeview-mui/ */}

+        <List component="nav">

           <ListItemLink exact to="/" primary="Home" icon={<FontAwesomeIcon icon={faHome} />} />

           <Divider />

-        {

-          state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {

-            const reg = state.framework.applicationRegistraion[key];

-            return reg && (

-              <ListItemLink

-                key={reg.name}

-                to={reg.path || `/${reg.name}`}

-                primary={reg.menuEntry || reg.name}

-                secondary={reg.subMenuEntry}

-                icon={reg.icon && <FontAwesomeIcon icon={reg.icon} /> || null} />

-            ) || null;

-          }) || null

-        }

-        <Divider />

-        <ListItemLink to="/about" primary="About" icon={<FontAwesomeIcon icon={faAddressBook} />} />

+          {

+            state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {

+              const reg = state.framework.applicationRegistraion[key];

+              return reg && (

+                <ListItemLink

+                  key={reg.name}

+                  to={reg.path || `/${reg.name}`}

+                  primary={reg.menuEntry || reg.name}

+                  secondary={reg.subMenuEntry}

+                  icon={reg.icon && <FontAwesomeIcon icon={reg.icon} /> || null} />

+              ) || null;

+            }) || null

+          }

+          <Divider />

+          <ListItemLink to="/about" primary="About" icon={<FontAwesomeIcon icon={faAddressBook} />} />

         </List>

-        </> || null

+      </> || null

       }

     </Drawer>)

 }));

diff --git a/sdnr/wt/odlux/framework/src/components/titleBar.tsx b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
index 81759d628..7168ff496 100644
--- a/sdnr/wt/odlux/framework/src/components/titleBar.tsx
+++ b/sdnr/wt/odlux/framework/src/components/titleBar.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';

 import { withRouter, RouteComponentProps } from 'react-router-dom';

 

@@ -24,18 +24,23 @@ import Toolbar from '@material-ui/core/Toolbar';
 import Typography from '@material-ui/core/Typography';

 import Button from '@material-ui/core/Button';

 import IconButton from '@material-ui/core/IconButton';

+import Block from '@material-ui/icons/Block';

+import Adjust from '@material-ui/icons/Adjust';

 import MenuIcon from '@material-ui/icons/Menu';

 import AccountCircle from '@material-ui/icons/AccountCircle';

 import MenuItem from '@material-ui/core/MenuItem';

 import Menu from '@material-ui/core/Menu';

 

 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

+import { faBan } from '@fortawesome/free-solid-svg-icons';

+import { faDotCircle } from '@fortawesome/free-solid-svg-icons';

 

 import { UpdateAuthentication } from '../actions/authentication';

 import { ReplaceAction } from '../actions/navigationActions';

 

 import connect, { Connect, IDispatcher } from '../flux/connect';

 import Logo from './logo';

+import { MenuAction, MenuClosedByUser } from '../actions/menuAction';

 

 const styles = (theme: Theme) => createStyles({

   appBar: {

@@ -51,6 +56,15 @@ const styles = (theme: Theme) => createStyles({
   icon: {

     marginLeft: 16,

     marginRight: 8

+  },

+  connected: {

+    color: "green"

+  },

+  notConnected: {

+    color: "red"

+  },

+  notificationInfo: {

+    marginLeft: 5

   }

 });

 

@@ -59,6 +73,10 @@ const mapDispatch = (dispatcher: IDispatcher) => {
     logout: () => {

       dispatcher.dispatch(new UpdateAuthentication(null));

       dispatcher.dispatch(new ReplaceAction("/login"));

+    },

+    toggleMainMenu: (value: boolean, value2: boolean) => {

+      dispatcher.dispatch(new MenuAction(value));

+      dispatcher.dispatch(new MenuClosedByUser(value2))

     }

   }

 };

@@ -69,7 +87,6 @@ class TitleBarComponent extends React.Component<TitleBarProps, { anchorEl: HTMLE
 

   constructor(props: TitleBarProps) {

     super(props);

-

     this.state = {

       anchorEl: null

     }

@@ -78,64 +95,103 @@ class TitleBarComponent extends React.Component<TitleBarProps, { anchorEl: HTMLE
   render(): JSX.Element {

     const { classes, state, history, location } = this.props;

     const open = !!this.state.anchorEl;

+    let toolbarElements: Array<JSX.Element>;

+    toolbarElements = [];

+

+    // create notificationInfo element

+    const notificationInfo = state.framework.applicationState.isWebsocketAvailable != undefined ?

+      (state.framework.applicationState.isWebsocketAvailable ?

+        <Typography variant="body1" className={classes.notificationInfo}>Notifications <FontAwesomeIcon className={classes.connected} icon={faDotCircle} />  |</Typography> : <Typography variant="body1" className={classes.notificationInfo}>Notifications <FontAwesomeIcon className={classes.notConnected} icon={faBan} /> |</Typography>)

+      : <Typography variant="body1" className={classes.notificationInfo}>Notifications N/A |</Typography>;

+

+

+    // add notificationInfo element before help

+    if (state.framework.applicationRegistraion) {

+      let isNotificationInfoAdded = false;

+      Object.keys(state.framework.applicationRegistraion).map(key => {

+        const reg = state.framework.applicationRegistraion[key];

+        if (reg && reg.statusBarElement) {

+          if (key === "help") {

+            isNotificationInfoAdded = true;

+            toolbarElements.push(notificationInfo);

+          }

+          toolbarElements.push(<reg.statusBarElement key={key} />);

+        }

+      });

+

+      // add notificationInfo in case help wasn't found

+      if (!isNotificationInfoAdded) {

+        toolbarElements.push(notificationInfo);

+      }

+    }

 

     return (

-      <AppBar position="absolute" className={ classes.appBar }>

+      <AppBar position="absolute" className={classes.appBar}>

         <Toolbar>

-          <IconButton className={ classes.menuButton } color="inherit" aria-label="Menu">

+          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={this.toggleMainMenu}>

             <MenuIcon />

           </IconButton>

           <Logo />

-          <Typography variant="title" color="inherit" >

-            { state.framework.applicationState.icon

-              ? (<FontAwesomeIcon className={ classes.icon } icon={ state.framework.applicationState.icon } />)

-              : null }

-            { state.framework.applicationState.title }

+          <Typography variant="h6" color="inherit" >

+            {state.framework.applicationState.icon

+              ? (<FontAwesomeIcon className={classes.icon} icon={state.framework.applicationState.icon} />)

+              : null}

+            {state.framework.applicationState.title}

           </Typography>

           <div className={classes.grow}></div>

-          { state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {

-            const reg = state.framework.applicationRegistraion[key];

-            return reg && reg.statusBarElement && <reg.statusBarElement key={key} /> || null

-          })}

-

-          { state.framework.authenticationState.user

+          {

+            // render toolbar

+            toolbarElements.map((item) => {

+              return item

+            })

+          }

+

+          {state.framework.authenticationState.user

             ? (<div>

-              <Button

-                aria-owns={ open ? 'menu-appbar' : undefined }

+              <Button aria-label="current user menu button"

+                aria-owns={open ? 'menu-appbar' : undefined}

                 aria-haspopup="true"

-                onClick={ this.openMenu }

+                onClick={this.openMenu}

                 color="inherit"

               >

                 <AccountCircle />

-                { state.framework.authenticationState.user.user }

+                {state.framework.authenticationState.user.user}

               </Button>

               <Menu

                 id="menu-appbar"

-                anchorEl={ this.state.anchorEl }

-                anchorOrigin={ {

+                anchorEl={this.state.anchorEl}

+                anchorOrigin={{

                   vertical: 'top',

                   horizontal: 'right',

-                } }

-                transformOrigin={ {

+                }}

+                transformOrigin={{

                   vertical: 'top',

                   horizontal: 'right',

-                } }

-                open={ open }

-                onClose={ this.closeMenu }

+                }}

+                open={open}

+                onClose={this.closeMenu}

               >

-                <MenuItem onClick={ this.closeMenu }>Profile</MenuItem>

-                <MenuItem onClick={ () => {

+                {/* <MenuItem onClick={ this.closeMenu }>Profile</MenuItem> */}

+                <MenuItem onClick={() => {

                   this.props.logout();

                   this.closeMenu();

-                } }>Logout</MenuItem>

+                }}>Logout</MenuItem>

               </Menu>

             </div>)

-            : (<Button onClick={ () => { history.push('/login') } } color="inherit" disabled={ location.pathname == "/login" }>Login</Button>) }

+            : (<Button onClick={() => { history.push('/login') }} color="inherit" disabled={location.pathname == "/login"}>Login</Button>)}

         </Toolbar>

       </AppBar>

     );

   };

 

+  private toggleMainMenu = (event: React.MouseEvent<HTMLElement>) => {

+    console.log(this.props);

+    if (this.props.state.framework.authenticationState.user && this.props.state.framework.authenticationState.user.isValid) {

+      const isMainMenuOpen = this.props.state.framework.applicationState.isMenuOpen

+      const isClosedByUser = this.props.state.framework.applicationState.isMenuClosedByUser

+      this.props.toggleMainMenu(!isMainMenuOpen, !isClosedByUser);

+    }

+  }

 

   private openMenu = (event: React.MouseEvent<HTMLElement>) => {

     this.setState({ anchorEl: event.currentTarget });

diff --git a/sdnr/wt/odlux/framework/src/design/default.ts b/sdnr/wt/odlux/framework/src/design/default.ts
index 62e28e5c3..542c436f6 100644
--- a/sdnr/wt/odlux/framework/src/design/default.ts
+++ b/sdnr/wt/odlux/framework/src/design/default.ts
@@ -55,7 +55,26 @@ const theme = createMuiTheme({
       dark: "#07819B",
       contrastText: "#ffffff"
     },
-  }
+  },
+  overrides: { //temp fix for labels turning white after material new version (palette primary color)
+    MuiFormLabel: {
+      root: {
+        "&$focused": {
+          color: "rgba(143,143,143,1)"
+        }
+      },
+
+      focused: {}
+    },
+    MuiInput: {
+      underline: {
+
+        "&:after": {
+          borderBottom: "2px solid #444444"
+        }
+      }
+    }
+  },
 });
 
 export default theme;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/flux/action.ts b/sdnr/wt/odlux/framework/src/flux/action.ts
index 8a90f24b2..76890257e 100644
--- a/sdnr/wt/odlux/framework/src/flux/action.ts
+++ b/sdnr/wt/odlux/framework/src/flux/action.ts
@@ -1,4 +1,22 @@
 /**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+
+/**
   * Represents an action in the odlux flux architecture.
   */
 export abstract class Action { }
diff --git a/sdnr/wt/odlux/framework/src/flux/connect.ts b/sdnr/wt/odlux/framework/src/flux/connect.ts
index fca7df6fa..f54e4e0f0 100644
--- a/sdnr/wt/odlux/framework/src/flux/connect.ts
+++ b/sdnr/wt/odlux/framework/src/flux/connect.ts
@@ -38,19 +38,15 @@ interface IDispatchProps {
   dispatch: Dispatch;
 }
 
-type FuncInfer<T> = {
-  ([...args]: any): T;
-};
-
-type FunctionResult<T> = T extends FuncInfer<infer U> ? U : never;
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
 
 type ComponentDecoratorInfer<TMergedProps> = {
-  <TProps>(wrappedComponent: React.ComponentType<TProps & TMergedProps>): React.ComponentClass<TProps>;
+  <TProps>(wrappedComponent: React.ComponentType<TProps & TMergedProps>): React.ComponentClass<Omit<TProps & TMergedProps, keyof TMergedProps>>;
 };
 
-export type Connect<TMapProps = undefined, TMapDispatch = undefined> =
-  (TMapProps extends undefined ? IApplicationStoreProps : FunctionResult<TMapProps>) &
-  (TMapDispatch extends undefined ? IDispatchProps : FunctionResult<TMapDispatch>);
+export type Connect<TMapProps extends ((...args: any) => any) | undefined = undefined, TMapDispatch extends ((...args: any) => any) | undefined = undefined> =
+  (TMapProps extends ((...args: any) => any) ? ReturnType<TMapProps> : IApplicationStoreProps) &
+  (TMapDispatch extends ((...args: any) => any) ? ReturnType<TMapDispatch> : IDispatchProps);
 
 export function connect(): ComponentDecoratorInfer<IApplicationStoreProps & IDispatchProps>;
 
@@ -73,9 +69,9 @@ export function connect<TDispatchProps>(
 export function connect<TProps, TStateProps, TDispatchProps>(
   mapStateToProps?: ((state: IApplicationStoreState) => TStateProps),
   mapDispatchToProps?: ((dispatcher: IDispatcher) => TDispatchProps)
-) :
+):
   ((WrappedComponent: React.ComponentType<TProps & (IApplicationStoreProps | TStateProps) & IDispatchProps>) => React.ComponentType<TProps>) {
-  
+
   const injectApplicationStore = (WrappedComponent: React.ComponentType<TProps & (IApplicationStoreProps | TStateProps) & IDispatchProps>): React.ComponentType<TProps> => {
 
     class StoreAdapter extends React.Component<TProps, {}> {
@@ -83,7 +79,7 @@ export function connect<TProps, TStateProps, TDispatchProps>(
       context: IApplicationStoreContext;
 
       render(): JSX.Element {
-        
+
         if (isWrappedComponentIsVersion1(WrappedComponent)) {
           const element = React.createElement(WrappedComponent, { ...(this.props as any), state: this.store.state, dispatch: this.store.dispatch.bind(this.store) });
           return element;
@@ -91,10 +87,10 @@ export function connect<TProps, TStateProps, TDispatchProps>(
           const element = React.createElement(WrappedComponent, { ...(this.props as any), ...(mapStateToProps(this.store.state) as any), dispatch: this.store.dispatch.bind(this.store) });
           return element;
         } else if (mapStateToProps && mapDispatchToProps && isWrappedComponentIsVersion3(WrappedComponent)) {
-          const element = React.createElement(WrappedComponent, { ...(this.props as any), ...(mapStateToProps(this.store.state) as any), ...(mapDispatchToProps({ dispatch: this.store.dispatch.bind(this.store)}) as any) });
+          const element = React.createElement(WrappedComponent, { ...(this.props as any), ...(mapStateToProps(this.store.state) as any), ...(mapDispatchToProps({ dispatch: this.store.dispatch.bind(this.store) }) as any) });
           return element;
         } else if (!mapStateToProps && mapDispatchToProps && isWrappedComponentIsVersion4(WrappedComponent)) {
-          const element = React.createElement(WrappedComponent, { ...(this.props as any), state: this.store.state, ...(mapDispatchToProps({ dispatch: this.store.dispatch.bind(this.store)}) as any) });
+          const element = React.createElement(WrappedComponent, { ...(this.props as any), state: this.store.state, ...(mapDispatchToProps({ dispatch: this.store.dispatch.bind(this.store) }) as any) });
           return element;
         }
         throw new Error("Invalid arguments in connect.");
@@ -158,7 +154,7 @@ export class ApplicationStoreProvider extends React.Component<ApplicationStorePr
   }
 
   render(): JSX.Element {
-    return React.Children.only(this.props.children);
+    return React.Children.only(this.props.children) as any; //type error, fix when possible
   }
 }
 
diff --git a/sdnr/wt/odlux/framework/src/flux/middleware.ts b/sdnr/wt/odlux/framework/src/flux/middleware.ts
index 6179f3bcf..de6505c4f 100644
--- a/sdnr/wt/odlux/framework/src/flux/middleware.ts
+++ b/sdnr/wt/odlux/framework/src/flux/middleware.ts
@@ -35,7 +35,7 @@ export type ActionHandlerMapObject<S extends { [key: string]: any }, A extends A
 }
 
 export const combineActionHandler = <TState extends { [key: string]: any }, TAction extends Action = Action>(actionHandlers: ActionHandlerMapObject<TState, TAction>) : IActionHandler<TState, TAction> => {
-  const finalActionHandlers: ActionHandlerMapObject<TState> = {} as ActionHandlerMapObject<TState>;
+  const finalActionHandlers = {} as { [key: string]: any }; // https://github.com/microsoft/TypeScript/issues/31808
   Object.keys(actionHandlers).forEach(actionHandlerKey => {
     const handler = actionHandlers[actionHandlerKey];
     if (typeof handler === 'function') {
@@ -55,7 +55,7 @@ export const combineActionHandler = <TState extends { [key: string]: any }, TAct
 
   return function combination<TAction extends Action>(state: TState = ({} as TState), action: TAction) {
     let hasChanged = false;
-    const nextState : TState = {} as TState;
+    const nextState = {} as { [key: string]: any }; // https://github.com/microsoft/TypeScript/issues/31808
     Object.keys(finalActionHandlers).forEach(key => {
       const actionHandler = finalActionHandlers[key];
       const previousState = state[key];
@@ -76,7 +76,7 @@ export const chainMiddleware = <TStoreState>(...middlewares: Middleware<TStoreSt
     const middlewareAPI = {
       getState() { return store.state },
       dispatch: <TAction extends Action>(action: TAction) => store.dispatch(action) // we want to use the combinded dispatch
-      // we should NOT use the flux dispatcher here, since the action would affect ALL stores 
+      // we should NOT use the flux dispatcher here, since the action would affect ALL stores
     };
     const chain = middlewares.map(middleware => middleware(middlewareAPI));
     return compose(...chain)(store.dispatch) as Dispatch;
diff --git a/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts b/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
index 75ea92e43..a93f96a82 100644
--- a/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
+++ b/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
@@ -20,22 +20,25 @@ import { SetTitleAction } from '../actions/titleActions';
 
 import { AddSnackbarNotification, RemoveSnackbarNotification } from '../actions/snackbarActions';
 import { AddErrorInfoAction, RemoveErrorInfoAction, ClearErrorInfoAction } from '../actions/errorActions';
-
+import { MenuAction, MenuClosedByUser } from '../actions/menuAction'
 import { IconType } from '../models/iconDefinition';
 
 import { ErrorInfo } from '../models/errorInfo';
 import { SnackbarItem } from '../models/snackbarItem';
+import { SetWebsocketAction } from '../actions/websocketAction';
 
 export interface IApplicationState {
   title: string;
   appId?: string;
   icon?: IconType;
-
+  isMenuOpen: boolean;
+  isMenuClosedByUser: boolean;
   errors: ErrorInfo[];
   snackBars: SnackbarItem[];
+  isWebsocketAvailable: boolean | undefined;
 }
 
-const applicationStateInit: IApplicationState = { title: "Loading ...",  errors: [], snackBars:[] };
+const applicationStateInit: IApplicationState = { title: "Loading ...", errors: [], snackBars: [], isMenuOpen: true, isMenuClosedByUser: false, isWebsocketAvailable: undefined };
 
 export const applicationStateHandler: IActionHandler<IApplicationState> = (state = applicationStateInit, action) => {
   if (action instanceof SetTitleAction) {
@@ -84,6 +87,22 @@ export const applicationStateHandler: IActionHandler<IApplicationState> = (state
       ...state,
       snackBars: state.snackBars.filter(s => s.key !== action.key)
     };
+  } else if (action instanceof MenuAction) {
+    state = {
+      ...state,
+      isMenuOpen: action.isOpen
+    }
+  } else if (action instanceof MenuClosedByUser) {
+    state = {
+      ...state,
+      isMenuClosedByUser: action.isClosed
+    }
+  }
+  else if (action instanceof SetWebsocketAction) {
+    state = {
+      ...state,
+      isWebsocketAvailable: action.isConnected
+    }
   }
   return state;
 };
diff --git a/sdnr/wt/odlux/framework/src/handlers/authenticationHandler.ts b/sdnr/wt/odlux/framework/src/handlers/authenticationHandler.ts
index c0f2b4215..82b228dc0 100644
--- a/sdnr/wt/odlux/framework/src/handlers/authenticationHandler.ts
+++ b/sdnr/wt/odlux/framework/src/handlers/authenticationHandler.ts
@@ -21,6 +21,7 @@ import { UpdateAuthentication } from '../actions/authentication';
 import { User } from '../models/authentication';
 
 import { onLogin, onLogout } from '../services/applicationApi';
+import { startWebsocketSession, endWebsocketSession } from '../services/notificationService';
 
 export interface IAuthenticationState {
   user?: User;
@@ -28,6 +29,10 @@ export interface IAuthenticationState {
 
 const initialToken = localStorage.getItem("userToken");
 
+if (initialToken !== null) {
+  startWebsocketSession();
+}
+
 const authenticationStateInit: IAuthenticationState = {
   user: initialToken && User.fromString(initialToken) || undefined
 };
@@ -38,9 +43,11 @@ export const authenticationStateHandler: IActionHandler<IAuthenticationState> =
     const user = action.bearerToken && new User(action.bearerToken) || undefined;
     if (user) {
       localStorage.setItem("userToken", user.toString());
+      startWebsocketSession();
       onLogin();
     } else {
       localStorage.removeItem("userToken");
+      endWebsocketSession();
       onLogout();
     }
 
diff --git a/sdnr/wt/odlux/framework/src/models/elasticSearch.ts b/sdnr/wt/odlux/framework/src/models/elasticSearch.ts
index 62a138524..12cfd7d28 100644
--- a/sdnr/wt/odlux/framework/src/models/elasticSearch.ts
+++ b/sdnr/wt/odlux/framework/src/models/elasticSearch.ts
@@ -1,34 +1,29 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 type Result<TSource extends {}> = {

-  aggregations: TSource;

-  took: number;

-  timed_out: boolean;

-  _shards: {

-    total: number;

-    successful: number;

-    failed: number;

-  };

-  hits: {

-    total: number;

-    max_score: number;

-    hits?: (HitEntry<TSource>)[] | null;

-  };

+  output: {

+    pagination?: {

+      size: number,

+      page: number,

+      total: number

+    },

+    data: TSource[];

+  }

 }

 

 export type HitEntry<TSource extends {}> = {

diff --git a/sdnr/wt/odlux/framework/src/models/errorInfo.ts b/sdnr/wt/odlux/framework/src/models/errorInfo.ts
index 9081f20f1..21217a108 100644
--- a/sdnr/wt/odlux/framework/src/models/errorInfo.ts
+++ b/sdnr/wt/odlux/framework/src/models/errorInfo.ts
@@ -16,6 +16,7 @@
  * ============LICENSE_END==========================================================================
  */
 export type ErrorInfo = {
+  title?: string,
   error?: Error | null,
   url?: string,
   line?: number,
diff --git a/sdnr/wt/odlux/framework/src/models/restService.ts b/sdnr/wt/odlux/framework/src/models/restService.ts
index 053c29b8e..03f580b01 100644
--- a/sdnr/wt/odlux/framework/src/models/restService.ts
+++ b/sdnr/wt/odlux/framework/src/models/restService.ts
@@ -1,4 +1,22 @@
 /**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
+ */
+
+/**
   * The PlainObject type is a JavaScript object containing zero or more key-value pairs.
   */
 export interface PlainObject<T = any> {
diff --git a/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts b/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts
new file mode 100644
index 000000000..ce4faab6b
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/services/forceLogoutService.ts
@@ -0,0 +1,52 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 { ApplicationStore } from "../store/applicationStore";
+import { UpdateAuthentication } from "../actions/authentication";
+import { ReplaceAction } from "../actions/navigationActions";
+
+const maxMinutesTillLogout = 15;
+let applicationStore: ApplicationStore | null;
+let tickTimer = 15;
+
+
+export const startForceLogoutService = (store: ApplicationStore) => {
+    applicationStore = store;
+    createForceLogoutInterval();
+};
+
+const createForceLogoutInterval = () => {
+    console.log("logout timer running...")
+
+    return setInterval(function () {
+        if (applicationStore && applicationStore.state.framework.authenticationState.user) {
+            tickTimer--;
+
+            if (tickTimer === 0) {
+                console.log("got logged out by timer")
+                if (applicationStore) {
+                    applicationStore.dispatch(new UpdateAuthentication(null));
+                    applicationStore.dispatch(new ReplaceAction("/login"));
+                }
+            }
+        }
+
+    }, 1 * 60000)
+}
+
+document.addEventListener("mousemove", function () { tickTimer = maxMinutesTillLogout; }, false)
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/services/notificationService.ts b/sdnr/wt/odlux/framework/src/services/notificationService.ts
index b12c19985..85d3f716b 100644
--- a/sdnr/wt/odlux/framework/src/services/notificationService.ts
+++ b/sdnr/wt/odlux/framework/src/services/notificationService.ts
@@ -1,24 +1,31 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as X2JS from 'x2js';

+import { ApplicationStore } from '../store/applicationStore';

+import { SetWebsocketAction } from '../actions/websocketAction';

 

 const socketUrl = [location.protocol === 'https:' ? 'wss://' : 'ws://', 'admin', ':', 'admin', '@', location.hostname, ':', location.port, '/websocket'].join('');

-const subscriptions: { [scope: string]: SubscriptionCallback[] } = { };

+const subscriptions: { [scope: string]: SubscriptionCallback[] } = {};

+let socketReady: Promise<WebSocket>;

+let userLoggedOut = false;

+let wasWebsocketConnectionEstablished: undefined | boolean;

+let applicationStore: ApplicationStore | null;

+

 

 export interface IFormatedMessage {

   notifType: string | null;

@@ -27,7 +34,7 @@ export interface IFormatedMessage {
 

 export type SubscriptionCallback<TMessage extends IFormatedMessage = IFormatedMessage> = (msg: TMessage) => void;

 

-function formatData(event: MessageEvent) : IFormatedMessage | undefined {

+function formatData(event: MessageEvent): IFormatedMessage | undefined {

 

   var x2js = new X2JS();

   var jsonObj: { [key: string]: IFormatedMessage } = x2js.xml2js(event.data);

@@ -35,7 +42,7 @@ function formatData(event: MessageEvent) : IFormatedMessage | undefined {
 

     const notifType = Object.keys(jsonObj)[0];

     const formated = jsonObj[notifType];

-    formated.notifType = notifType ;

+    formated.notifType = notifType;

     formated.time = new Date().toISOString();

     return formated;

   }

@@ -43,42 +50,31 @@ function formatData(event: MessageEvent) : IFormatedMessage | undefined {
 

 }

 

-export function subscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): Promise<boolean> {

-  return socketReady.then((notificationSocket) => {

-    const scopes = scope instanceof Array ? scope : [scope];

+export function subscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): boolean {

+  const scopes = scope instanceof Array ? scope : [scope];

 

-    // send all new scopes to subscribe

-    const newScopesToSubscribe: string[] = scopes.reduce((acc: string[], cur: string) => {

-      const currentCallbacks = subscriptions[cur];

-      if (currentCallbacks) {

-        if (!currentCallbacks.some(c => c === callback)) {

-          currentCallbacks.push(callback);

-        }

-      } else {

-        subscriptions[cur] = [callback];

-        acc.push(cur);

+  // send all new scopes to subscribe

+  const newScopesToSubscribe: string[] = scopes.reduce((acc: string[], cur: string) => {

+    const currentCallbacks = subscriptions[cur];

+    if (currentCallbacks) {

+      if (!currentCallbacks.some(c => c === callback)) {

+        currentCallbacks.push(callback);

       }

-      return acc;

-    }, []);

-

-    if (newScopesToSubscribe.length === 0) {

-      return true;

+    } else {

+      subscriptions[cur] = [callback];

+      acc.push(cur);

     }

+    return acc;

+  }, []);

 

-    // send a subscription to all active scopes

-    const scopesToSubscribe = Object.keys(subscriptions);

-    if (notificationSocket.readyState === notificationSocket.OPEN) {

-      const data = {

-        'data': 'scopes',

-        'scopes': scopesToSubscribe

-      };

-      notificationSocket.send(JSON.stringify(data));

-      return true;

-    }

-    return false;

-  });

+  if (newScopesToSubscribe.length === 0) {

+    return true;

+  }

+

+  return true;

 }

 

+

 export function unsubscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): Promise<boolean> {

   return socketReady.then((notificationSocket) => {

     const scopes = scope instanceof Array ? scope : [scope];

@@ -107,6 +103,10 @@ export function unsubscribe<TMessage extends IFormatedMessage = IFormatedMessage
   });

 }

 

+export const startNotificationService = (store: ApplicationStore) => {

+  applicationStore = store;

+}

+

 const connect = (): Promise<WebSocket> => {

   return new Promise((resolve, reject) => {

     const notificationSocket = new WebSocket(socketUrl);

@@ -132,22 +132,58 @@ const connect = (): Promise<WebSocket> => {
     };

 

     notificationSocket.onerror = function (error) {

-      console.log("Socket error: " + error);

+      console.log("Socket error:");

+      console.log(error);

       reject("Socket error: " + error);

+      if (applicationStore) {

+        applicationStore.dispatch(new SetWebsocketAction(false));

+      }

     };

 

     notificationSocket.onopen = function (event) {

+      if (applicationStore) {

+        applicationStore.dispatch(new SetWebsocketAction(true));

+      }

       console.log("Socket connection opened.");

       resolve(notificationSocket);

+

+      // send a subscription to all active scopes

+      const scopesToSubscribe = Object.keys(subscriptions);

+      if (notificationSocket.readyState === notificationSocket.OPEN) {

+        const data = {

+          'data': 'scopes',

+          'scopes': scopesToSubscribe

+        };

+        notificationSocket.send(JSON.stringify(data));

+      };

     };

 

     notificationSocket.onclose = function (event) {

-      socketReady = connect();

+      console.log("socket connection closed");

+      if (applicationStore) {

+        applicationStore.dispatch(new SetWebsocketAction(false));

+      }

+      if (!userLoggedOut) {

+        socketReady = connect();

+      }

     };

   });

 }

 

-let socketReady = connect();

+

+

+

+export const startWebsocketSession = () => {

+  socketReady = connect();

+  userLoggedOut = false;

+}

+

+export const endWebsocketSession = () => {

+  socketReady.then(websocket => {

+    websocket.close();

+    userLoggedOut = true;

+  })

+}

 

 

 

diff --git a/sdnr/wt/odlux/framework/src/services/restService.ts b/sdnr/wt/odlux/framework/src/services/restService.ts
index c25deda84..b02d7d19f 100644
--- a/sdnr/wt/odlux/framework/src/services/restService.ts
+++ b/sdnr/wt/odlux/framework/src/services/restService.ts
@@ -30,38 +30,76 @@ export const formEncode = (params: { [key: string]: string | number }) => Object
   return encodeURIComponent(key) + '=' + encodeURIComponent(params[key].toString());
 }).join('&');
 
-export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | false | null> {
+/** Sends a rest request to the given path. 
+ * @returns The data, or null it there was any error
+ */
+export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | null> {
+  const res = await requestRestExt<TData>(path, init, authenticate, isResource);
+  if (res && res.status >= 200 && res.status < 300) {
+    return res.data;
+  }
+  return null;
+}
+
+/** Sends a rest request to the given path and reports the server state. 
+ *  @returns An object with the server state, a message and the data.
+ */
+export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number, message?: string, data: TData | null }> {
+  const result: { status: number, message?: string, data: TData | null } = {
+    status: -1,
+    data: null,
+  };
   const isAbsUrl = absUrlPattern.test(path);
   const uri = isAbsUrl ? path : isResource ? path.replace(/\/{2,}/i, '/') : (baseUri) + ('/' + path).replace(/\/{2,}/i, '/');
-  init.headers = {
+  init = {
     'method': 'GET',
-    'Content-Type': 'application/json',
-    'Accept': 'application/json',
-    ...init.headers
+    ...init,
+    headers: {
+      'Content-Type': 'application/json',
+      'Accept': 'application/json',
+      ...init.headers
+    }
   };
   if (!isAbsUrl && authenticate && applicationStore) {
     const { state: { framework: { authenticationState: { user } } } } = applicationStore;
     // do not request if the user is not valid
     if (!user || !user.isValid) {
-      return null;
+      return {
+        ...result,
+        message: "User is not valid or not logged in."
+      };
     }
     (init.headers = {
       ...init.headers,
-      'Authorization':  `${user.tokenType} ${user.token}`
+      'Authorization': `${user.tokenType} ${user.token}`
       //'Authorization': 'Basic YWRtaW46YWRtaW4='
     });
   }
-  const result = await fetch(uri, init);
-  if (result.status === 401 || result.status === 403) {
+  const fetchResult = await fetch(uri, init);
+  if (fetchResult.status === 401 || fetchResult.status === 403) {
     applicationStore && applicationStore.dispatch(new ReplaceAction(`/login?returnTo=${applicationStore.state.framework.navigationState.pathname}`));
-    return null;
+    return {
+      ...result,
+      status: 403,
+      message: "Authentication requested by server."
+    };
   }
-  const contentType = result.headers.get("Content-Type") || result.headers.get("content-type");
+  const contentType = fetchResult.headers.get("Content-Type") || fetchResult.headers.get("content-type");
   const isJson = contentType && contentType.toLowerCase().startsWith("application/json");
   try {
-    const data = result.ok && (isJson ? await result.json() : await result.text()) as TData ;
-    return data;
-  } catch {
-    return null;
+    const data = (isJson ? await fetchResult.json() : await fetchResult.text()) as TData;
+    return {
+      ...result,
+      status: fetchResult.status,
+      message: fetchResult.statusText,
+      data: data
+    };
+  } catch (error) {
+    return {
+      ...result,
+      status: fetchResult.status,
+      message: error && error.message || String(error),
+      data: null
+    };
   }
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/utilities/elasticSearch.ts b/sdnr/wt/odlux/framework/src/utilities/elasticSearch.ts
index 54713f1b1..c18a40b0b 100644
--- a/sdnr/wt/odlux/framework/src/utilities/elasticSearch.ts
+++ b/sdnr/wt/odlux/framework/src/utilities/elasticSearch.ts
@@ -16,70 +16,61 @@
  * ============LICENSE_END==========================================================================
  */
 
+import { Result } from '../models';
 import { DataCallback } from '../components/material-table';
-import { Result, HitEntry } from '../models';
 
 import { requestRest } from '../services/restService';
 
+import { convertPropertyNames, convertPropertyValues, replaceUpperCase, replaceHyphen } from './yangHelper';
+
 type propType = string | number | null | undefined | (string | number)[];
 type dataType = { [prop: string]: propType };
 
-export function createSearchDataHandler<TResult extends {} = dataType>(uri: (() => string) | string, additionalParameters?: {}): DataCallback<(TResult & { _id: string })>;
-export function createSearchDataHandler<TResult extends {} = dataType, TData = dataType>(uri: (() => string) | string, additionalParameters: {} | null | undefined, mapResult: (res: HitEntry<TResult>, index: number, arr: HitEntry<TResult>[]) => (TData & { _id: string }), mapRequest?: (name?: string | null) => string): DataCallback<(TData & { _id: string })>
-export function createSearchDataHandler<TResult, TData>(uri: (() => string) | string, additionalParameters?: {} | null | undefined, mapResult?: (res: HitEntry<TResult>, index: number, arr: HitEntry<TResult>[]) => (TData & { _id: string }), mapRequest?: (name?: string | null) => string): DataCallback<(TData & { _id: string })> {
-  const fetchData: DataCallback<(TData & { _id: string })> = async (page, rowsPerPage, orderBy, order, filter) => {
-    const url = `${ window.location.origin }/database/${typeof uri === "function" ? uri(): uri}/_search`;
-    const from = rowsPerPage && page != null && !isNaN(+page)
-      ? (+page) * rowsPerPage
-      : null;
+/** Represents a fabric for the searchDataHandler used by the internal data api.
+ *  @param typeName The name of the entry type to create a searchDataHandler for.
+ *  @param additionalFilters Filterproperties and their values to add permanently.
+ *  @returns The searchDataHandler callback to be used with the material table.
+*/
+export function createSearchDataHandler<TResult>(typeName: (() => string) | string, additionalFilters?: {} | null | undefined): DataCallback<(TResult)> {
+  const fetchData: DataCallback<(TResult)> = async (pageIndex, rowsPerPage, orderBy, order, filter) => {
+    const url = `/restconf/operations/data-provider:read-${typeof typeName === "function" ? typeName(): typeName}-list`;
+
+    filter = { ...filter, ...additionalFilters };
 
     const filterKeys = filter && Object.keys(filter) || [];
 
     const query = {
-      ...filterKeys.length > 0 ? {
-        query: {
-          bool: {
-            must: filterKeys.reduce((acc, cur) => {
-              if (acc && filter && filter[cur]) {
-                acc.push({ [filter[cur].indexOf("*") > -1 || filter[cur].indexOf("?") > -1 ? "wildcard" : "term"]: { [mapRequest ? mapRequest(cur) : cur]: filter[cur] } });
-              }
-              return acc;
-            }, [] as any[])
-          }
-        }
-      } : { "query": { "match_all": {} } },
-      ...rowsPerPage ? { "size": rowsPerPage } : {},
-      ...from ? { "from": from } : {},
-      ...orderBy && order ? { "sort": [{ [mapRequest ? mapRequest(orderBy) : orderBy]: order }] } : {},
-      ...additionalParameters ? additionalParameters : {}
+      input: {
+        filter: filterKeys.filter(f => filter![f] != null && filter![f] !== "").map(property => ({ property, filtervalue: filter![property]})),
+        sortorder: orderBy ? [{ property: orderBy, sortorder: order === "desc" ? "descending" : "ascending" }] : [],
+        pagination: { size: rowsPerPage, page: (pageIndex != null && pageIndex > 0 && pageIndex || 0) +1 }
+      }
     };
-    const result = await requestRest<Result<TResult & { _id: string }>>(url, {
+    const result = await requestRest<Result<TResult>>(url, {
       method: "POST",       // *GET, POST, PUT, DELETE, etc.
-      mode: "no-cors",      // no-cors, cors, *same-origin
+      mode: "same-origin",  // no-cors, cors, *same-origin
       cache: "no-cache",    // *default, no-cache, reload, force-cache, only-if-cached
       headers: {
-        "Content-Type": "application/json; charset=utf-8",
+        "Content-Type": "application/json",
         // "Content-Type": "application/x-www-form-urlencoded",
       },
-      body: JSON.stringify(query), // body data type must match "Content-Type" header
+      body: JSON.stringify(convertPropertyValues(query, replaceUpperCase)), // body data type must match "Content-Type" header
     });
 
     if (result) {
-      let rows: (TData & { _id: string })[] = [];
+      let rows: TResult[] = [];
 
-      if (result && result.hits && result.hits.hits) {
-        rows = result.hits.hits.map( mapResult ? mapResult :  h => (
-          { ...(h._source as any as TData), _id: h._id }
-        )) || []
+      if (result && result.output && result.output.data) {
+        rows = result.output.data.map(obj => convertPropertyNames(obj, replaceHyphen)) || []
       }
 
       const data = {
-        page: Math.min(page || 0, result.hits.total || 0 / (rowsPerPage || 1)), rowCount: result.hits.total, rows: rows
+        page: result.output.pagination && result.output.pagination.page != null && result.output.pagination.page - 1  || 0 , total: result.output.pagination && result.output.pagination.total || 0, rows: rows
       };
       return data;
     }
 
-    return { page: 0, rowCount: 0, rows: [] };
+    return { page: 1, total: 0, rows: [] };
   };
 
   return fetchData;
diff --git a/sdnr/wt/odlux/framework/src/utilities/yangHelper.ts b/sdnr/wt/odlux/framework/src/utilities/yangHelper.ts
new file mode 100644
index 000000000..127f3e07d
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/utilities/yangHelper.ts
@@ -0,0 +1,39 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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 replaceHyphen = (name: string) => name.replace(/-([a-z])/g, (g) => (g[1].toUpperCase()));
+export const replaceUpperCase = (name: string) => name.replace(/([a-z][A-Z])/g, (g) => g[0] + '-' + g[1].toLowerCase());
+
+export const convertPropertyNames = <T extends { [prop: string]: any }>(obj: T, conv: (name: string) => string): T => {
+  return Object.keys(obj).reduce<{ [prop: string]: any }>((acc, cur) => {
+    acc[conv(cur)] = typeof obj[cur] === "object" ? convertPropertyNames(obj[cur], conv) : obj[cur];
+    return acc;
+  }, obj instanceof Array ? [] : {}) as T;
+}
+
+export const convertPropertyValues = <T extends { [prop: string]: any }>(obj: T, conv: (name: string) => string): T => {
+  return Object.keys(obj).reduce<{ [prop: string]: any }>((acc, cur) => {
+    acc[cur] = typeof obj[cur] === "object"
+      ? convertPropertyValues(obj[cur], conv)
+      : cur === "property"
+        ? conv(obj[cur])
+        : obj[cur];
+    return acc;
+  }, obj instanceof Array ? [] : {}) as T;
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/views/frame.tsx b/sdnr/wt/odlux/framework/src/views/frame.tsx
index a39516de3..b93b7ee01 100644
--- a/sdnr/wt/odlux/framework/src/views/frame.tsx
+++ b/sdnr/wt/odlux/framework/src/views/frame.tsx
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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 * as React from 'react';

 import { HashRouter as Router, Route, Redirect, Switch } from 'react-router-dom';

 

@@ -49,60 +49,70 @@ const styles = (theme: Theme) => createStyles({
     display: "flex",

     flexDirection: "column",

     backgroundColor: theme.palette.background.default,

-    padding: theme.spacing.unit * 3,

+    padding: theme.spacing(3),

     minWidth: 0, // So the Typography noWrap works

   },

   toolbar: theme.mixins.toolbar

 });

 

-export const Frame = withStyles(styles)(({ classes }: WithStyles<typeof styles>) => {

-  const registrations = applicationService.applications;

-  return (

-    <SnackbarProvider maxSnack={3}>

-      <Router>

-        <div className={ classes.root }>

-          <SnackDisplay />

-          <ErrorDisplay />

-          <TitleBar />

-          <Menu />

-          <main className={ classes.content }>

-            <div className={ classes.toolbar } />

-            <Switch>

-              <Route exact path="/" component={ () => (

-                <AppFrame title={ "Home" } icon={ faHome } >

-                  <Home />

-                </AppFrame>

-              ) } />

-              <Route path="/about" component={ () => (

-                <AppFrame title={ "About" } icon={ faAddressBook } >

-                  <About />

-                </AppFrame>

-              )} />

-              { process.env.NODE_ENV === "development" ? <Route path="/test" component={() => (

-                <AppFrame title={"Test"} icon={faAddressBook} >

-                  <Test />

-                </AppFrame>

-              )} /> : null}

-              <Route path="/login" component={ () => (

-                <AppFrame title={ "Login" } icon={ faSignInAlt } >

-                  <Login />

-                </AppFrame>

-              ) } />

-              { Object.keys(registrations).map(p => {

-                const application = registrations[p];

-                return (<Route key={ application.name } path={ application.path || `/${ application.name }` } component={ () => (

-                  <AppFrame title={ application.title || (typeof application.menuEntry === 'string' && application.menuEntry) || application.name } icon={ application.icon } appId={application.name} >

-                    <application.rootComponent />

+type FrameProps = WithStyles<typeof styles>;

+

+class FrameComponent extends React.Component<FrameProps>{

+

+  render() {

+    const registrations = applicationService.applications;

+    const { classes } = this.props;

+    return (

+      <SnackbarProvider maxSnack={3}>

+        <Router>

+          <div className={classes.root}>

+            <SnackDisplay />

+            <ErrorDisplay />

+            <TitleBar />

+            <Menu />

+            <main className={classes.content}>

+              {

+                <div className={classes.toolbar} /> //needed for margins, don't remove!

+              }

+              <Switch>

+                <Route exact path="/" component={() => (

+                  <AppFrame title={"Home"} icon={faHome} >

+                    <Home />

                   </AppFrame>

-                ) } />)

-              }) }

-              <Redirect to="/" />

-            </Switch>

-          </main>

-        </div>

-      </Router>

-    </SnackbarProvider>

-  );

-});

+                )} />

+                <Route path="/about" component={() => (

+                  <AppFrame title={"About"} icon={faAddressBook} >

+                    <About />

+                  </AppFrame>

+                )} />

+                {process.env.NODE_ENV === "development" ? <Route path="/test" component={() => (

+                  <AppFrame title={"Test"} icon={faAddressBook} >

+                    <Test />

+                  </AppFrame>

+                )} /> : null}

+                <Route path="/login" component={() => (

+                  <AppFrame title={"Login"} icon={faSignInAlt} >

+                    <Login />

+                  </AppFrame>

+                )} />

+                {Object.keys(registrations).map(p => {

+                  const application = registrations[p];

+                  return (<Route key={application.name} path={application.path || `/${application.name}`} component={() => (

+                    <AppFrame title={application.title || (typeof application.menuEntry === 'string' && application.menuEntry) || application.name} icon={application.icon} appId={application.name} >

+                      <application.rootComponent />

+                    </AppFrame>

+                  )} />)

+                })}

+                <Redirect to="/" />

+              </Switch>

+            </main>

+          </div>

+        </Router>

+      </SnackbarProvider>

+    );

+  }

+}

+

+export const Frame = withStyles(styles)(FrameComponent);

 

 export default Frame;

diff --git a/sdnr/wt/odlux/framework/src/views/home.tsx b/sdnr/wt/odlux/framework/src/views/home.tsx
index e20c46aa4..4a4084e88 100644
--- a/sdnr/wt/odlux/framework/src/views/home.tsx
+++ b/sdnr/wt/odlux/framework/src/views/home.tsx
@@ -15,14 +15,13 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-import * as React from 'react';

-

-export const Home = (props: React.Props<any>) => {

-  return (

-    <div>

-      <h1>Welcome to ODLUX.</h1>

-    </div>

-  )

-}

-

+import * as React from 'react';
+
+export const Home = (props: React.Props<any>) => {
+  return (
+    <div>
+      <h1>Welcome to ODLUX.</h1>
+    </div>
+  )
+}
 export default Home;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/views/login.tsx b/sdnr/wt/odlux/framework/src/views/login.tsx
index 9b69ecd7e..3f6ef6134 100644
--- a/sdnr/wt/odlux/framework/src/views/login.tsx
+++ b/sdnr/wt/odlux/framework/src/views/login.tsx
@@ -45,31 +45,31 @@ const styles = (theme: Theme) => createStyles({
   layout: {
     width: 'auto',
     display: 'block', // Fix IE11 issue.
-    marginLeft: theme.spacing.unit * 3,
-    marginRight: theme.spacing.unit * 3,
-    [theme.breakpoints.up(400 + theme.spacing.unit * 3 * 2)]: {
+    marginLeft: theme.spacing(3),
+    marginRight: theme.spacing(3),
+    [theme.breakpoints.up(400 + theme.spacing(3) * 2)]: {
       width: 400,
       marginLeft: 'auto',
       marginRight: 'auto',
     },
   },
   paper: {
-    marginTop: theme.spacing.unit * 8,
+    marginTop: theme.spacing(8),
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',
-    padding: `${theme.spacing.unit * 2}px ${theme.spacing.unit * 3}px ${theme.spacing.unit * 3}px`,
+    padding: `${theme.spacing(2)}px ${theme.spacing(3)}px ${theme.spacing(3)}px`,
   },
   avatar: {
-    margin: theme.spacing.unit,
+    margin: theme.spacing(1),
     backgroundColor: theme.palette.secondary.main,
   },
   form: {
     width: '100%', // Fix IE11 issue.
-    marginTop: theme.spacing.unit,
+    marginTop: theme.spacing(1),
   },
   submit: {
-    marginTop: theme.spacing.unit * 3,
+    marginTop: theme.spacing(3),
   },
 });
 
@@ -87,7 +87,7 @@ interface ILoginState {
 // todo: ggf. redirect to einbauen
 class LoginComponent extends React.Component<LoginProps, ILoginState> {
 
-  constructor (props: LoginProps) {
+  constructor(props: LoginProps) {
     super(props);
 
     this.state = {
@@ -142,13 +142,13 @@ class LoginComponent extends React.Component<LoginProps, ILoginState> {
                 />
               </FormControl>
               <FormControlLabel
-                control={<Checkbox value="remember" color="primary" />}
+                control={<Checkbox value="remember" color="secondary" />}
                 label="Remember me"
               />
               <Button
                 type="submit"
                 fullWidth
-                variant="raised"
+                variant="contained"
                 color="primary"
                 disabled={this.state.busy}
                 className={classes.submit}
diff --git a/sdnr/wt/odlux/framework/webpack.config.js b/sdnr/wt/odlux/framework/webpack.config.js
index c82e3928e..578a0ae44 100644
--- a/sdnr/wt/odlux/framework/webpack.config.js
+++ b/sdnr/wt/odlux/framework/webpack.config.js
@@ -1,20 +1,20 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
- */
+/**

+ * ============LICENSE_START========================================================================

+ * ONAP : ccsdk feature sdnr wt odlux

+ * =================================================================================================

+ * Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================

+ */

 /**

  * Webpack 4 configuration file

  * see https://webpack.js.org/configuration/

@@ -98,8 +98,8 @@ module.exports = (env) => {
       minimize: env === "release",

       minimizer: env !== "release" ? [] : [new TerserPlugin({

         terserOptions: {

-          mangle:{

-            reserved:["./app.tsx"]

+          mangle: {

+            reserved: ["./app.tsx"]

           },

           warnings: false, // false, true, "verbose"

           compress: {

@@ -191,7 +191,7 @@ module.exports = (env) => {
       },

       proxy: {

         "/oauth2/**/*": {

-          target: "http://localhost:3000",

+          target: "http://10.20.6.29:48181",

           secure: false

         }

       }

diff --git a/sdnr/wt/odlux/framework/yarn.lock b/sdnr/wt/odlux/framework/yarn.lock
deleted file mode 100644
index 3925ea677..000000000
--- a/sdnr/wt/odlux/framework/yarn.lock
+++ /dev/null
@@ -1,7000 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/core@7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04"
-  integrity sha512-9EWmD0cQAbcXSc+31RIoYgEHx3KQ2CCSMDBhnXrShWvo45TMw+3/55KVxlhkG53kw9tl87DqINgHDgFVhZJV/Q==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helpers" "^7.1.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    convert-source-map "^1.1.0"
-    debug "^3.1.0"
-    json5 "^0.5.0"
-    lodash "^4.17.10"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
-  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-react-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
-  integrity sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    esutils "^2.0.0"
-
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
-
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
-  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-member-expression-to-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
-  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
-  integrity sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
-
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
-
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
-  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
-  dependencies:
-    lodash "^4.17.10"
-
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
-  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-replace-supers@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
-  integrity sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
-  dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-wrap-function@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
-  integrity sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helpers@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.0.tgz#429bf0f0020be56a4242883432084e3d70a8a141"
-  integrity sha512-V1jXUTNdTpBn37wqqN73U+eBpzlLHmxA4aDaghJBggmzly/FpIJMHXse9lgdzQQT4gs5jZ5NmYxOL8G3ROc29g==
-  dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e"
-  integrity sha512-SmjnXCuPAlai75AFtzv+KCBcJ3sDDWbIn+WytKw1k+wAtEy6phqI2RqKh/zAnw53i1NR8su3Ep/UoqaKcimuLg==
-
-"@babel/plugin-proposal-async-generator-functions@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
-  integrity sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
-
-"@babel/plugin-proposal-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
-  integrity sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.0.0"
-
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
-  integrity sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
-  integrity sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
-  integrity sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
-
-"@babel/plugin-syntax-async-generators@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
-  integrity sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
-  integrity sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
-  integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
-  integrity sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
-  integrity sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
-  integrity sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
-  integrity sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
-  integrity sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
-  integrity sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
-
-"@babel/plugin-transform-classes@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
-  integrity sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
-  integrity sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a"
-  integrity sha512-Fr2GtF8YJSXGTyFPakPFB4ODaEKGU04bPsAllAIabwoXdFrPxL0LVXQX5dQWoxOjjgozarJcC9eWGsj0fD6Zsg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-dotall-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
-  integrity sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
-
-"@babel/plugin-transform-duplicate-keys@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
-  integrity sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
-  integrity sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-for-of@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
-  integrity sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
-  integrity sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
-  integrity sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-amd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
-  integrity sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
-  integrity sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4"
-  integrity sha512-8EDKMAsitLkiF/D4Zhe9CHEE2XLh4bfLbb9/Zf3FgXYQOZyZYyg7EAel/aT2A7bHv62jwHf09q2KU/oEexr83g==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-umd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
-  integrity sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
-  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-object-super@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
-  integrity sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-
-"@babel/plugin-transform-parameters@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
-  integrity sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==
-  dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz#93759e6c023782e52c2da3b75eca60d4f10533ee"
-  integrity sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0.tgz#a84bb70fea302d915ea81d9809e628266bb0bc11"
-  integrity sha512-pymy+AK12WO4safW1HmBpwagUQRl9cevNX+82AIAtU1pIdugqcH+nuYP03Ja6B+N4gliAaKWAegIBL/ymALPHA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz#28e00584f9598c0dd279f6280eee213fa0121c3c"
-  integrity sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz#524379e4eca5363cd10c4446ba163f093da75f3e"
-  integrity sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==
-  dependencies:
-    "@babel/helper-builder-react-jsx" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-
-"@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
-  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
-  dependencies:
-    regenerator-transform "^0.13.3"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
-  integrity sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
-  integrity sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
-  integrity sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-
-"@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
-  integrity sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
-  integrity sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
-  integrity sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
-
-"@babel/polyfill@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.0.0.tgz#c8ff65c9ec3be6a1ba10113ebd40e8750fb90bff"
-  integrity sha512-dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==
-  dependencies:
-    core-js "^2.5.7"
-    regenerator-runtime "^0.11.1"
-
-"@babel/preset-env@7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11"
-  integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.1.0"
-    "@babel/plugin-proposal-json-strings" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.0.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.1.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.1.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-dotall-regex" "^7.0.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.1.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.1.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-amd" "^7.1.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.1.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.0.0"
-    "@babel/plugin-transform-modules-umd" "^7.1.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.1.0"
-    "@babel/plugin-transform-parameters" "^7.1.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.0.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    browserslist "^4.1.0"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.3.0"
-
-"@babel/preset-react@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
-  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-
-"@babel/runtime@7.0.0", "@babel/runtime@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
-  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/template@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22"
-  integrity sha512-yZ948B/pJrwWGY6VxG6XRFsVTee3IQ7bihq9zFpM00Vydu6z5Xwg0C3J644kxI9WOTzd+62xcIsQ+AT1MGhqhA==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/traverse@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
-  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
-
-"@babel/types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
-  integrity sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
-
-"@fortawesome/fontawesome-common-types@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.4.tgz#7c560ff732c6c7c7c179ae25227ce5449e6f6d65"
-  integrity sha512-0qbIVm+MzkxMwKDx8V0C7w/6Nk+ZfBseOn2R1YK0f2DQP5pBcOQbu9NmaVaLzbJK6VJb1TuyTf0ZF97rc6iWJQ==
-
-"@fortawesome/fontawesome-svg-core@1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.4.tgz#2e40c65e66c7ad5aabc179a2d7c5827b1599905c"
-  integrity sha512-oGtnwcdhJomoDxbJcy6S0JxK6ItDhJLNOujm+qILPqajJ2a0P/YRomzBbixFjAPquCoyPUlA9g9ejA22P7TKNA==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.4"
-
-"@fortawesome/free-solid-svg-icons@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.3.1.tgz#9660bece3c4850d58f1653e26c1693487ff74b08"
-  integrity sha512-NkiLBFoiHtJ89cPJdM+W6cLvTVKkLh3j9t3MxkXyip0ncdD3lhCunSuzvFcrTHWeETEyoClGd8ZIWrr3HFZ3BA==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.4"
-
-"@fortawesome/react-fontawesome@0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.3.tgz#266b4047892c3d10498af1075d89252f74015b11"
-  integrity sha512-tc689l67rPZ7+ynZVUgOXY80rAt5KxvuH1qjPpJcbyJzJHzk5yhrD993BjsSEdPBLTtPqmvwynsO/XrAQqHbtg==
-  dependencies:
-    humps "^2.0.1"
-    prop-types "^15.5.10"
-
-"@material-ui/core@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.1.1.tgz#377b406fd26b88df6626c1697eef3f488fddb553"
-  integrity sha512-AFAKrldoG8GrP6w+9uzHdbm9GQC+cuggKhv8yG2FcUcXoyAzyLZQww1tgTj+hXNMEuOs2l55oFBo2RNNFoGwWQ==
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    "@types/jss" "^9.5.3"
-    "@types/react-transition-group" "^2.0.8"
-    brcast "^3.0.1"
-    classnames "^2.2.5"
-    csstype "^2.5.2"
-    debounce "^1.1.0"
-    deepmerge "^2.0.1"
-    dom-helpers "^3.2.1"
-    hoist-non-react-statics "^2.5.0"
-    is-plain-object "^2.0.4"
-    jss "^9.3.3"
-    jss-camel-case "^6.0.0"
-    jss-default-unit "^8.0.2"
-    jss-global "^3.0.0"
-    jss-nested "^6.0.1"
-    jss-props-sort "^6.0.0"
-    jss-vendor-prefixer "^7.0.0"
-    keycode "^2.1.9"
-    normalize-scroll-left "^0.1.2"
-    popper.js "^1.14.1"
-    prop-types "^15.6.0"
-    react-event-listener "^0.6.2"
-    react-jss "^8.1.0"
-    react-transition-group "^2.2.1"
-    recompose "0.28.0 - 0.30.0"
-    warning "^4.0.1"
-
-"@material-ui/icons@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-3.0.1.tgz#671fb3d04dcaf9351dbbd2bf82ae2ae72e3d93cd"
-  integrity sha512-1kNcxYiIT1x8iDPEAlgmKrfRTIV8UyK6fLVcZ9kMHIKGWft9I451V5mvSrbCjbf7MX1TbLWzZjph0aVCRf9MqQ==
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    recompose "^0.29.0"
-
-"@types/classnames@2.2.6":
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.6.tgz#dbe8a666156d556ed018e15a4c65f08937c3f628"
-  integrity sha512-XHcYvVdbtAxVstjKxuULYqYaWIzHR15yr1pZj4fnGChuBVJlIAp9StJna0ZJNSgxPh4Nac2FL4JM3M11Tm6fqQ==
-
-"@types/fbemitter@*":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
-  integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
-
-"@types/flux@3.1.8":
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.8.tgz#987fbf0220d98aa23276c9635a8ef1e505f7c4a4"
-  integrity sha512-U7DS78cK1svrisTa920BM2AEsWnfgnxQmVn+1kju1XgjcDN/iU1Uiyy0pQNaG8s9P1X5Lj3pMaIfVuCjXAlSCA==
-  dependencies:
-    "@types/fbemitter" "*"
-    "@types/react" "*"
-
-"@types/history@*":
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.0.tgz#2fac51050c68f7d6f96c5aafc631132522f4aa3f"
-  integrity sha512-1A/RUAX4VtmGzNTGLSfmiPxQ3XwUSe/1YN4lW9GRa+j307oFK6MPjhlvw6jEHDodUBIvSvrA7/iHDchr5LS+0Q==
-
-"@types/jquery@3.3.10":
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.10.tgz#d0afaec7ee55f591992e74c607df5dc7cd9c76ab"
-  integrity sha512-W2bE8pGh9Tsg8mxh+B6BSH8lTG6ZV7K2ZMAlEwSTqKFU1wMI5HShyRKSp3DngnxCmDu35tW3RAC4mxBFYRsTuw==
-
-"@types/jsonwebtoken@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-7.2.8.tgz#8d199dab4ddb5bba3234f8311b804d2027af2b3a"
-  integrity sha512-XENN3YzEB8D6TiUww0O8SRznzy1v+77lH7UmuN54xq/IHIsyWjWOzZuFFTtoiRuaE782uAoRwBe/wwow+vQXZw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/jss@^9.5.3":
-  version "9.5.6"
-  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.6.tgz#96e1d246ddfbccc4867494077c714773cf29acde"
-  integrity sha512-7TWmR5y1jYG4ka4wTZt65RR0kw4WgALFUWktQIWbLnDd6/z/0SQZ/4+UeH0rhdp+HEdIfmzPBH0VwE/4Z9Evzw==
-  dependencies:
-    csstype "^2.0.0"
-    indefinite-observable "^1.0.1"
-
-"@types/node@*":
-  version "10.11.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.1.tgz#adc48781dd50b2635a8a7854d99c759a26ede840"
-  integrity sha512-Mash7eQv0HOs/fBVywUGR7NLSXyMl3XHkIo/kcWBgD9ppwPYOp8UDFxZfKy9hWeVHT2p+69vgXTPbPpoeqoM8w==
-
-"@types/prop-types@*":
-  version "15.5.6"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
-  integrity sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ==
-
-"@types/react-dom@16.0.8":
-  version "16.0.8"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.8.tgz#6e1366ed629cadf55860cbfcc25db533f5d2fa7d"
-  integrity sha512-WF/KAOia7pskV+J8f+UlNuFeCRkJuJAkyyeYPPtNe6suw0y7cWyUP/DPdPXsGUwQEkv2qlLVSrgVaoCm/PmO0Q==
-  dependencies:
-    "@types/node" "*"
-    "@types/react" "*"
-
-"@types/react-router-dom@4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
-  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
-"@types/react-router@*":
-  version "4.0.31"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.0.31.tgz#416bac49d746800810886c7b8582a622ed9604fc"
-  integrity sha512-57Tqu1EDMgDzHhmIEjjQZHrc/N7/+GGv6CtH1wRTLmMIy3UMxX69vQoeEz0AmK0/zkf5ecfEW1ZX8DLVQ6Gl7Q==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-
-"@types/react-transition-group@^2.0.8":
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.14.tgz#afd0cd785a97f070b55765e9f9d76ff568269001"
-  integrity sha512-pa7qB0/mkhwWMBFoXhX8BcntK8G4eQl4sIfSrJCxnivTYRQWjOWf2ClR9bWdm0EUFBDHzMbKYS+QYfDtBzkY4w==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@16.4.14":
-  version "16.4.14"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.14.tgz#47c604c8e46ed674bbdf4aabf82b34b9041c6a04"
-  integrity sha512-Gh8irag2dbZ2K6vPn+S8+LNrULuG3zlCgJjVUrvuiUK7waw9d9CFk2A/tZFyGhcMDUyO7tznbx1ZasqlAGjHxA==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^2.2.0"
-
-"@webassemblyjs/ast@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
-  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
-  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
-
-"@webassemblyjs/helper-api-error@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
-  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
-
-"@webassemblyjs/helper-buffer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
-  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
-
-"@webassemblyjs/helper-code-frame@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
-  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.8"
-
-"@webassemblyjs/helper-fsm@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
-  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
-
-"@webassemblyjs/helper-module-context@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
-  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
-  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
-  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-
-"@webassemblyjs/ieee754@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
-  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
-  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
-  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
-
-"@webassemblyjs/wasm-edit@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
-  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/helper-wasm-section" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-opt" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-    "@webassemblyjs/wast-printer" "1.7.8"
-
-"@webassemblyjs/wasm-gen@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
-  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
-
-"@webassemblyjs/wasm-opt@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
-  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-
-"@webassemblyjs/wasm-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
-  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
-
-"@webassemblyjs/wast-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
-  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-code-frame" "1.7.8"
-    "@webassemblyjs/helper-fsm" "1.7.8"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
-  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
-    "@xtuc/long" "4.2.1"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
-  dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
-
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
-
-acorn@^5.0.0, acorn@^5.6.2:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-
-ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
-
-ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
-
-ajv@^5.1.0, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-ansi-colors@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.6.tgz#a0b9e00e8c1cc6685b1c3130dbeb9abed03ca6a4"
-  integrity sha512-rY3B55KSBMMARmGXtzaG5o+kqnCrEF99rngBq5fV+cbwJepVGhDT8eB7UhSDwsJxNsMzSQDLQAyWmgi9pfzssQ==
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
-  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
-  dependencies:
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
-
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-async@^2.4.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
-  dependencies:
-    lodash "^4.17.10"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-autoprefixer@9.1.5:
-  version "9.1.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
-  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
-  dependencies:
-    browserslist "^4.1.0"
-    caniuse-lite "^1.0.30000884"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.2"
-    postcss-value-parser "^3.2.3"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.6.0, aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
-
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-loader@8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6"
-  integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==
-  dependencies:
-    find-cache-dir "^1.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-    util.promisify "^1.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
-binary-extensions@^1.0.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
-  integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-bluebird@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
-boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^2.3.0, braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-brcast@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
-  integrity sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==
-
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
-  dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
-
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
-  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    figgy-pudding "^3.1.0"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.3"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^6.0.0"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-
-caniuse-lite@^1.0.30000884:
-  version "1.0.30000888"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000888.tgz#22edb50d91dd70612b5898e3b36f460600c6492f"
-  integrity sha512-vftg+5p/lPsQGpnhSo/yBuYL36ai/cyjLvU3dOPJY1kkKrekLWIy8SLm+wzjX0hpCUdFTasC4/ZT7uqw4rKOnQ==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    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"
-
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-change-emitter@^0.1.2:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
-  integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
-
-chokidar@^2.0.0, chokidar@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
-  optionalDependencies:
-    fsevents "^1.2.2"
-
-chownr@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
-chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
-  dependencies:
-    tslib "^1.9.0"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-classnames@^2.2.5:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
-
-clean-css@4.2.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
-  dependencies:
-    source-map "~0.6.0"
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
-
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-colour@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
-
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.5, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.17.x, commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-compressible@~2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
-  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
-  dependencies:
-    mime-db ">= 1.36.0 < 2"
-
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.14"
-    debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-connect-history-api-fallback@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
-  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.1.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    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"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-webpack-plugin@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
-  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
-    minimatch "^3.0.4"
-    p-limit "^1.0.0"
-    serialize-javascript "^1.4.0"
-
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
-
-core-js@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
-create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.2.0"
-  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.7"
-  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-css-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.0.tgz#9f46aaa5ca41dbe31860e3b62b8e23c42916bf56"
-  integrity sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==
-  dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
-
-css-select@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-vendor@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa"
-  integrity sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=
-  dependencies:
-    is-in-browser "^1.0.2"
-
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-  integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
-
-csstype@^2.0.0, csstype@^2.2.0, csstype@^2.5.2:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff"
-  integrity sha512-Nt5VDyOTIIV4/nRFswoCKps1R5CD1hkiyjBE9/thNaNZILLEviVw9yWQw15+O+CpNjQKB/uvdcxFFOrSflY3Yw==
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
-debounce@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
-  integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
-  integrity sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.1.1, decamelize@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deepmerge@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
-  integrity sha512-urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w==
-
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
-  dependencies:
-    execa "^0.10.0"
-    ip-regex "^2.1.0"
-
-define-properties@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-  integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=
-
-depd@~1.1.1, depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
-detect-node@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-dir-glob@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
-
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "http://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
-  integrity sha1-pF71cnuJDJv/5tfIduexnLDhfzs=
-  dependencies:
-    utila "~0.3"
-
-dom-helpers@^3.2.1, dom-helpers@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
-  integrity sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg==
-
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  integrity sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=
-  dependencies:
-    domelementtype "1"
-
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
-  integrity sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ecdsa-sig-formatter@1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3"
-  integrity sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.3.62:
-  version "1.3.72"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.72.tgz#b69683081d5b7eee6e1ea07b2f5fa30b3c72252d"
-  integrity sha512-OFbXEC01Lq7A66e3UywkvWYNN00HO1I9MAPereGe0NIXrt2MeaovL1bbY+951HKG0euUdPBe0L7yfKxgqxBMMw==
-
-elliptic@^6.0.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
-
-errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.2.0, error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.5.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
-  dependencies:
-    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@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  integrity sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-esutils@^2.0.0, esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-
-eventsource@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
-  dependencies:
-    original ">=0.0.5"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    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"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-express@^4.16.2:
-  version "4.16.3"
-  resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM=
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@~3.0.1, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extract-text-webpack-plugin@next:
-  version "4.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz#f7361d7ff430b42961f8d1321ba8c1757b5d4c42"
-  integrity sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==
-  dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
-    webpack-sources "^1.1.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fbjs@^0.8.1:
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
-  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
-
-figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-file-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.0"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
-find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-flush-write-stream@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
-
-follow-redirects@^1.0.0:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
-  integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==
-  dependencies:
-    debug "=3.1.0"
-
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.1, form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
-  dependencies:
-    minipass "^2.2.1"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    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"
-
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    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-modules-path@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc"
-  integrity sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==
-
-globals@^11.1.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "^2.0.0"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-globule@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
-graceful-fs@4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.4.tgz#ef089d2880f033b011823ce5c8fae798da775dbd"
-  integrity sha1-7widKIDwM7ARgjzlyPrnmNp3Xb0=
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-handle-thing@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
-  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-he@1.1.x:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-history@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
-  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
-  dependencies:
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
-    resolve-pathname "^2.2.0"
-    value-equal "^0.4.0"
-    warning "^3.0.0"
-
-hmac-drbg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
-  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
-
-hosted-git-info@^2.1.4:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
-
-html-minifier@^3.2.3:
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
-  integrity sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.1.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-html-webpack-include-assets-plugin@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/html-webpack-include-assets-plugin/-/html-webpack-include-assets-plugin-1.0.5.tgz#12770c227290451633351b5ed72dda8ce8c0642e"
-  integrity sha512-YkkzE+QfYAuEq8/yEnfTcpCeSLyJ8XmB2LlQzY1GV7/ovDxavcCIKSMF4kIMRrWmFMPU8qog/zvBaQ1RJFFw/g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    slash "^2.0.0"
-
-html-webpack-plugin@3.2.0:
-  version "3.2.0"
-  resolved "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
-  dependencies:
-    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"
-
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
-  integrity sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=
-  dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
-  integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
-
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
-  dependencies:
-    http-proxy "^1.16.2"
-    is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
-
-http-proxy@^1.16.2:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
-  dependencies:
-    eventemitter3 "^3.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-humps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
-  integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
-
-hyphenate-style-name@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
-  integrity sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=
-
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
-
-iconv-lite@^0.4.4, iconv-lite@~0.4.13:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
-  dependencies:
-    postcss "^6.0.1"
-
-ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
-
-indefinite-observable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-1.0.1.tgz#09915423cc8d6f7eb1cb7882ad134633c9a6edc3"
-  integrity sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=
-  dependencies:
-    symbol-observable "1.0.4"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
-  dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
-
-interpret@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
-
-invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
-
-ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-function@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
-  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-in-browser@^1.0.2, is-in-browser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-symbol@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
-  dependencies:
-    has-symbols "^1.0.0"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jquery@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
-
-js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
-  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
-
-js-levenshtein@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
-  integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
-js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-jsonwebtoken@8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz#056c90eee9a65ed6e6c72ddb0a1d325109aaf643"
-  integrity sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag==
-  dependencies:
-    jws "^3.1.5"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
-    ms "^2.1.1"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-jss-camel-case@^6.0.0, jss-camel-case@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44"
-  integrity sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==
-  dependencies:
-    hyphenate-style-name "^1.0.2"
-
-jss-compose@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484"
-  integrity sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==
-  dependencies:
-    warning "^3.0.0"
-
-jss-default-unit@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6"
-  integrity sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==
-
-jss-expand@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-5.3.0.tgz#02be076efe650125c842f5bb6fb68786fe441ed6"
-  integrity sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==
-
-jss-extend@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-6.2.0.tgz#4af09d0b72fb98ee229970f8ca852fec1ca2a8dc"
-  integrity sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==
-  dependencies:
-    warning "^3.0.0"
-
-jss-global@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2"
-  integrity sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==
-
-jss-nested@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca"
-  integrity sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==
-  dependencies:
-    warning "^3.0.0"
-
-jss-preset-default@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.5.0.tgz#d3a457012ccd7a551312014e394c23c4b301cadd"
-  integrity sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==
-  dependencies:
-    jss-camel-case "^6.1.0"
-    jss-compose "^5.0.0"
-    jss-default-unit "^8.0.2"
-    jss-expand "^5.3.0"
-    jss-extend "^6.2.0"
-    jss-global "^3.0.0"
-    jss-nested "^6.0.1"
-    jss-props-sort "^6.0.0"
-    jss-template "^1.0.1"
-    jss-vendor-prefixer "^7.0.0"
-
-jss-props-sort@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323"
-  integrity sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==
-
-jss-template@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a"
-  integrity sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==
-  dependencies:
-    warning "^3.0.0"
-
-jss-vendor-prefixer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71"
-  integrity sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==
-  dependencies:
-    css-vendor "^0.3.8"
-
-jss@^9.3.3, jss@^9.7.0:
-  version "9.8.7"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05"
-  integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==
-  dependencies:
-    is-in-browser "^1.1.3"
-    symbol-observable "^1.1.0"
-    warning "^3.0.0"
-
-jwa@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
-  integrity sha512-tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.10"
-    safe-buffer "^5.0.1"
-
-jws@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f"
-  integrity sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==
-  dependencies:
-    jwa "^1.1.5"
-    safe-buffer "^5.0.1"
-
-keycode@^2.1.9:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
-
-killable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-less-loader@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
-  dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^3.0.0"
-
-less@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
-  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
-  dependencies:
-    clone "^2.1.2"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.4.1"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.83.0"
-    source-map "~0.6.0"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-loader-runner@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
-  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
-
-loader-utils@0.2.16:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
-  integrity sha1-8IYyBm7YKCg13/iN+1JwR2Wt7m0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^0.2.16:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.clonedeep@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
-
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
-
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
-
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
-map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
-
-memory-fs@^0.4.0, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
-  dependencies:
-    mime-db "~1.36.0"
-
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.0.3, mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
-
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@^3.0.4, minimatch@~3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
-  dependencies:
-    minipass "^2.2.1"
-
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    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 "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    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"
-
-mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
-  version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    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"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-nan@^2.10.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
-  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
-
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
-  integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
-
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
-node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^1.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
-
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-node-releases@^1.0.0-alpha.11:
-  version "1.0.0-alpha.12"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
-  integrity sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==
-  dependencies:
-    semver "^5.3.0"
-
-node-sass@4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "2.87.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-scroll-left@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.1.2.tgz#6b79691ba79eb5fb107fa5edfbdc06b55caee2aa"
-  integrity sha512-F9YMRls0zCF6BFIE2YnXDRpHPpfd91nOIaNdDgrx5YMoPLo8Wqj+6jNXHQsYBavJeXP4ww8HCt0xQAKc5qk2Fg==
-
-npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
-
-npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
-  dependencies:
-    boolbase "~1.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-obuf@^1.0.0, obuf@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-opn@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
-  dependencies:
-    is-wsl "^1.1.0"
-
-original@>=0.0.5:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
-
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
-  dependencies:
-    execa "^0.10.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@0, osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
-
-p-limit@^1.0.0, p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
-p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
-
-pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
-
-parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
-  dependencies:
-    cyclist "~0.2.2"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
-parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
-path-to-regexp@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
-  dependencies:
-    isarray "0.0.1"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
-pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-popper.js@^1.14.1:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
-  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
-
-portfinder@^1.0.9:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
-  dependencies:
-    cosmiconfig "^4.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
-
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-  integrity sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
-  dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
-
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
-
-postcss@^6.0.1, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.4.tgz#b5a059597d2c1a8a9916cb6efb0b294f70b4f309"
-  integrity sha512-Bg1BrMZGKNOI0mkn8NtjJrOrZKgoHrl+geKJ45mTOkeY4WCsYq/mjd1BUWRgRvydHP/lA07Ys2n9m6Va5FsEsw==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.5.0"
-
-pretty-error@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
-  integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
-  dependencies:
-    renderkid "^2.0.1"
-    utila "~0.4"
-
-private@^0.1.6:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
-  dependencies:
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-proxy-addr@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
-public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
-  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-
-pump@^2.0.0, pump@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
-qs@~6.5.1, qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
-  integrity sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
-
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-react-dom@16.5.2:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
-  integrity sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    schedule "^0.5.0"
-
-react-event-listener@^0.6.2:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.4.tgz#d0ea5ed897da1a796616c44b5a8758898140f203"
-  integrity sha512-t7VSjIuUFmN+GeyKb+wm025YLeojVB85kJL6sSs0wEBJddfmKBEQz+CNBZ2zBLKVWkPy/fZXM6U5yvojjYBVYQ==
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    prop-types "^15.6.0"
-    warning "^4.0.1"
-
-react-jss@^8.1.0:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252"
-  integrity sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==
-  dependencies:
-    hoist-non-react-statics "^2.5.0"
-    jss "^9.7.0"
-    jss-preset-default "^4.3.0"
-    prop-types "^15.6.0"
-    theming "^1.3.0"
-
-react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-
-react-router-dom@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
-  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
-  dependencies:
-    history "^4.7.2"
-    invariant "^2.2.4"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.1"
-    react-router "^4.3.1"
-    warning "^4.0.1"
-
-react-router@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
-  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
-  dependencies:
-    history "^4.7.2"
-    hoist-non-react-statics "^2.5.0"
-    invariant "^2.2.4"
-    loose-envify "^1.3.1"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.1"
-    warning "^4.0.1"
-
-react-transition-group@^2.2.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.0.tgz#70bca0e3546102c4dc5cf3f5f57f73447cce6874"
-  integrity sha512-qYB3JBF+9Y4sE4/Mg/9O6WFpdoYjeeYqx0AFb64PTazVy8RPMiE3A47CG9QmM4WJ/mzDiZYslV+Uly6O1Erlgw==
-  dependencies:
-    dom-helpers "^3.3.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
-
-react@16.5.2:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
-  integrity sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    schedule "^0.5.0"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6:
-  version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    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"
-
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readdirp@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-"recompose@0.28.0 - 0.30.0":
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
-  integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^2.3.1"
-    react-lifecycles-compat "^3.0.2"
-    symbol-observable "^1.0.4"
-
-recompose@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.29.0.tgz#f1a4e20d5f24d6ef1440f83924e821de0b1bccef"
-  integrity sha512-J/qLXNU4W+AeHCDR70ajW8eMd1uroqZaECTj6qqDLPMILz3y0EzpYlvrnxKB9DnqcngWrtGwjXY9JeXaW9kS1A==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^2.3.1"
-    react-lifecycles-compat "^3.0.2"
-    symbol-observable "^1.0.4"
-
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
-  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.2.1, regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
-
-regenerator-runtime@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
-regenerator-transform@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
-  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
-  dependencies:
-    private "^0.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
-  integrity sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
-    regjsgen "^0.4.0"
-    regjsparser "^0.3.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
-
-regjsgen@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
-  integrity sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
-  dependencies:
-    jsesc "~0.5.0"
-
-regjsparser@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
-  integrity sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==
-  dependencies:
-    jsesc "~0.5.0"
-
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-renderkid@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
-  integrity sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=
-  dependencies:
-    css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
-    strip-ansi "^3.0.0"
-    utila "~0.3"
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
-request@2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.83.0, request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    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@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-requirejs-webpack-plugin@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/requirejs-webpack-plugin/-/requirejs-webpack-plugin-1.0.5.tgz#3bded42b2a9809898579019d6570732670416259"
-  integrity sha1-O97UKyqYCYmFeQGdZXBzJnBBYlk=
-  dependencies:
-    mkdirp "^0.5.1"
-
-requirejs@2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
-  integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-pathname@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
-  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.3.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
-  dependencies:
-    path-parse "^1.0.5"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-rimraf@2, rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
-sass-loader@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
-  dependencies:
-    clone-deep "^2.0.1"
-    loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
-    neo-async "^2.5.0"
-    pify "^3.0.0"
-    semver "^5.5.0"
-
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schedule@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8"
-  integrity sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==
-  dependencies:
-    object-assign "^4.1.1"
-
-schema-utils@^0.4.4, schema-utils@^0.4.5:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
-  integrity sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==
-  dependencies:
-    node-forge "0.7.5"
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
-
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
-serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
-
-serve-index@^1.7.2:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4, setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-  integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shallow-clone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-sockjs-client@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
-  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
-  dependencies:
-    debug "^2.6.6"
-    eventsource "0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.8"
-
-sockjs@0.3.19:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
-  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.0.1"
-
-source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
-
-source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
-  dependencies:
-    atob "^2.1.1"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-spdx-correct@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30"
-  integrity sha512-hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
-
-spdy-transport@^2.0.18:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
-  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
-  dependencies:
-    debug "^2.6.8"
-    detect-node "^2.0.3"
-    hpack.js "^2.1.6"
-    obuf "^1.1.1"
-    readable-stream "^2.2.9"
-    safe-buffer "^5.0.1"
-    wbuf "^1.7.2"
-
-spdy@^3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
-  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
-  dependencies:
-    debug "^2.6.8"
-    handle-thing "^1.2.5"
-    http-deceiver "^1.2.7"
-    safe-buffer "^5.0.1"
-    select-hose "^2.0.0"
-    spdy-transport "^2.0.18"
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
-ssri@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
-  integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-symbol-observable@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
-  integrity sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=
-
-symbol-observable@^1.0.4, symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
-tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
-
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-theming@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc"
-  integrity sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==
-  dependencies:
-    brcast "^3.0.1"
-    is-function "^1.0.1"
-    is-plain-object "^2.0.1"
-    prop-types "^15.5.8"
-
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-thunky@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
-  integrity sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=
-
-timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
-  dependencies:
-    setimmediate "^1.0.4"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-toposort@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
-  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
-
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
-
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
-
-ts-loader@5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.2.1.tgz#e6815c631dcafc24319ce8be6f8af94908749cf3"
-  integrity sha512-KC0cOvsFVyxBlg5h9jvaMlIL2tNsyQLvT2/OvIlO0AMUBJ4iXTtOfaDEqvmqv2lM/icekQfDsP2PsYBCDHpuOQ==
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^3.1.4"
-    semver "^5.0.1"
-
-tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-is@~1.6.15, type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.18"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typescript@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
-  integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==
-
-typings-for-css-modules-loader@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/typings-for-css-modules-loader/-/typings-for-css-modules-loader-1.7.0.tgz#a9b5c5a0e19b719d616edfc72855ab47dedd00ae"
-  integrity sha512-Mp7zDrcUmbUKl3JTLamTsMX+lntMotEm5I05j2RHB5EHb0WL1dAXlynpdlGR5Ye/QTvtL5w+RGB2jP32YoUpZw==
-  dependencies:
-    colour "0.7.1"
-    graceful-fs "4.1.4"
-    loader-utils "0.2.16"
-
-ua-parser-js@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
-  integrity sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==
-
-uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
-uglify-js@3.4.x, uglify-js@^3.0.0:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-
-uglifyjs-webpack-plugin@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.0.1.tgz#f346af53ed496ce72fef462517d417f62bec3010"
-  integrity sha512-1HhCHkOB6wRCcv7htcz1QRPVbWPEY074RP9vzt/X0LF4xXm9l4YGd0qja7z88abDixQlnVwBjXsTBs+Xsn/eeQ==
-  dependencies:
-    cacache "^11.2.0"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    uglify-js "^3.0.0"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    schema-utils "^0.4.5"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    uglify-es "^3.3.4"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
-
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
-
-union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^0.4.3"
-
-unique-filename@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-loader@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"
-  integrity sha512-vugEeXjyYFBCUOpX+ZuaunbK3QXMKaQ3zUnRfIpRBlGkY7QizCnzyyn2ASfcxsvyU3ef+CJppVywnl3Kgf13Gg==
-  dependencies:
-    loader-utils "^1.1.0"
-    mime "^2.0.3"
-    schema-utils "^1.0.0"
-
-url-parse@^1.1.8, url-parse@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
-  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util.promisify@1.0.0, util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
-  dependencies:
-    inherits "2.0.3"
-
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-  integrity sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=
-
-utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
-v8-compile-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
-  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-value-equal@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
-  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
-
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
-  dependencies:
-    loose-envify "^1.0.0"
-
-warning@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
-  integrity sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==
-  dependencies:
-    loose-envify "^1.0.0"
-
-watchpack@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
-  dependencies:
-    chokidar "^2.0.2"
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webpack-cli@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.1.tgz#92be3e324c1788208a301172139febb476566262"
-  integrity sha512-th5EUyVeGcAAVlFOcJg11fapD/xoLRE4j/eSfrmMAo3olPjvB7lgEPUtCbRP0OGmstvnQBl4VZP+zluXWDiBxg==
-  dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.1.0"
-    global-modules-path "^2.3.0"
-    import-local "^2.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.5.0"
-    v8-compile-cache "^2.0.2"
-    yargs "^12.0.2"
-
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.9.tgz#8b32167624d2faff40dcedc2cbce17ed1f34d3e0"
-  integrity sha512-fqPkuNalLuc/hRC2QMkVYJkgNmRvxZQo7ykA2e1XRg/tMJm3qY7ZaD6d89/Fqjxtj9bOrn5wZzLD2n84lJdvWg==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
-    import-local "^2.0.0"
-    internal-ip "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.1.5"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "3.4.0"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack@4.20.2:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.20.2.tgz#89f6486b6bb276a91b0823453d377501fc625b5a"
-  integrity sha512-75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/wasm-edit" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
-    tapable "^1.1.0"
-    uglifyjs-webpack-plugin "^1.2.4"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
-  dependencies:
-    http-parser-js ">=0.4.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
-
-whatwg-fetch@>=0.10.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1, which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
-  dependencies:
-    errno "~0.1.7"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
-xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
-
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
-  dependencies:
-    camelcase "^3.0.0"
-
-yargs@12.0.2, yargs@^12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
diff --git a/sdnr/wt/odlux/package.json b/sdnr/wt/odlux/package.json
index 609dc5ce2..5d4714dac 100644
--- a/sdnr/wt/odlux/package.json
+++ b/sdnr/wt/odlux/package.json
@@ -14,15 +14,15 @@
     "@fortawesome/fontawesome-svg-core": "1.2.12",
     "@fortawesome/free-solid-svg-icons": "5.6.3",
     "@fortawesome/react-fontawesome": "0.1.3",
-    "@material-ui/core": "3.8.3",
-    "@material-ui/icons": "3.0.2",
+    "@material-ui/core": "4.6.1",
+    "@material-ui/icons": "4.5.1",
     "@types/classnames": "2.2.6",
     "@types/flux": "3.1.8",
     "@types/jquery": "3.3.10",
     "@types/jsonwebtoken": "7.2.8",
     "@types/node": "11.11.6",
-    "@types/react": "16.4.14",
-    "@types/react-dom": "16.0.8",
+    "@types/react": "16.9.11",
+    "@types/react-dom": "16.9.4",
     "@types/react-router-dom": "4.3.1",
     "@types/react-transition-group": "2.0.15",
     "@types/x2js": "3.1.0",
@@ -30,12 +30,12 @@
     "jquery": "3.3.1",
     "jsonwebtoken": "8.3.0",
     "lerna": "3.13.1",
-    "notistack": "0.4.1",
-    "prop-types": "15.6.2",
-    "react": "16.5.2",
-    "react-dom": "16.5.2",
+    "notistack": "0.9.6",
+    "prop-types": "15.7.2",
+    "react": "16.11.0",
+    "react-dom": "16.11.0",
     "react-router-dom": "4.3.1",
-    "react-transition-group": "2.5.3",
+    "react-transition-group": "4.3.0",
     "x2js": "3.2.3"
   },
   "devDependencies": {
@@ -72,7 +72,7 @@
     "tslint-eslint-rules": "4.1.1",
     "tslint-react": "3.6.0",
     "tslint-react-recommended": "1.0.15",
-    "typescript": "3.2.2",
+    "typescript": "3.7.2",
     "typings-for-css-modules-loader": "1.7.0",
     "url-loader": "1.1.2",
     "webpack": "4.28.4",
diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml
index 74455ddf3..f88301bb0 100644
--- a/sdnr/wt/odlux/pom.xml
+++ b/sdnr/wt/odlux/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -8,13 +9,12 @@
         <relativePath/>
     </parent>
 
-
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>odlux-top</artifactId>
+    <artifactId>sdnr-wt-odlux-top</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>odlux</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
     <modules>
         <module>framework</module>
@@ -29,34 +29,34 @@
         <module>apps/maintenanceApp</module>
         <module>apps/minimumApp</module>
         <module>apps/performanceHistoryApp</module>
+        <module>apps/eventLogApp</module>
         <module>apps/configurationApp</module>
         <module>apps/app-feature</module>
         <module>apps/app-installer</module>
     </modules>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>exec-maven-plugin</artifactId>
-				<groupId>org.codehaus.mojo</groupId>
-				<executions>
-					<execution><!-- Run our version calculation script -->
-						<id>Clean node and node_modules</id>
-						<phase>package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>rm</executable>
-                                                        <arguments>
-								<argument>-r</argument>
-								<argument>node_modules</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution><!-- Run our version calculation script -->
+                        <id>Clean node and node_modules</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>rm</executable>
+                            <arguments>
+                                <argument>-r</argument>
+                                <argument>node_modules</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/odlux/yarn.lock b/sdnr/wt/odlux/yarn.lock
index dbe7edc31..9ce3e4baf 100644
--- a/sdnr/wt/odlux/yarn.lock
+++ b/sdnr/wt/odlux/yarn.lock
@@ -2,15 +2,17 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.5.5":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
+  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/core@7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04"
+  integrity sha512-9EWmD0cQAbcXSc+31RIoYgEHx3KQ2CCSMDBhnXrShWvo45TMw+3/55KVxlhkG53kw9tl87DqINgHDgFVhZJV/Q==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.0.0"
@@ -27,465 +29,538 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
+"@babel/generator@^7.0.0", "@babel/generator@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
+  integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.2"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
     source-map "^0.5.0"
-    trim-right "^1.0.1"
 
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e"
+  integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz#32dd9551d6ed3a5fc2edc50d6912852aa18274d9"
+  integrity sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-explode-assignable-expression" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-builder-react-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
+"@babel/helper-builder-react-jsx@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz#c6b8254d305bacd62beb648e4dea7d3ed79f352d"
+  integrity sha512-LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+"@babel/helper-call-delegate@^7.4.4":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz#df8942452c2c1a217335ca7e393b9afc67f668dc"
+  integrity sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+"@babel/helper-create-regexp-features-plugin@^7.7.0":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6"
+  integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.6.0"
 
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+"@babel/helper-define-map@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529"
+  integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    lodash "^4.17.13"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+"@babel/helper-explode-assignable-expression@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz#db2a6705555ae1f9f33b4b8212a546bc7f9dc3ef"
+  integrity sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+"@babel/helper-function-name@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3"
+  integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-get-function-arity" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+"@babel/helper-get-function-arity@^7.0.0", "@babel/helper-get-function-arity@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d"
+  integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-member-expression-to-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+"@babel/helper-hoist-variables@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81"
+  integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+"@babel/helper-member-expression-to-functions@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a"
+  integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d"
+  integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786"
+  integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-simple-access" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365"
+  integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==
+  dependencies:
+    "@babel/types" "^7.7.0"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
+  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+"@babel/helper-remap-async-to-generator@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7"
+  integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.0"
+    "@babel/helper-wrap-function" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-replace-supers@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
+"@babel/helper-replace-supers@^7.5.5", "@babel/helper-replace-supers@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512"
+  integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-member-expression-to-functions" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+"@babel/helper-simple-access@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d"
+  integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==
   dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+"@babel/helper-split-export-declaration@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300"
+  integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-wrap-function@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
+"@babel/helper-wrap-function@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74"
+  integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/helpers@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.0.tgz#429bf0f0020be56a4242883432084e3d70a8a141"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b"
+  integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==
   dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e"
+"@babel/parser@^7.1.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043"
+  integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz#83ef2d6044496b4c15d8b4904e2219e6dccc6971"
+  integrity sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
 
 "@babel/plugin-proposal-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
 
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
+  integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d"
+  integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
 
-"@babel/plugin-syntax-async-generators@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
+"@babel/plugin-syntax-async-generators@^7.0.0", "@babel/plugin-syntax-async-generators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
+"@babel/plugin-syntax-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
+"@babel/plugin-syntax-jsx@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
+  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
+"@babel/plugin-syntax-optional-catch-binding@^7.0.0", "@babel/plugin-syntax-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492"
+  integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-module-imports" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.0"
 
 "@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
+  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
 
 "@babel/plugin-transform-classes@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a"
+  integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.0"
+    "@babel/helper-define-map" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a"
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
+  integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-dotall-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b"
+  integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
 
 "@babel/plugin-transform-duplicate-keys@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
+  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-exponentiation-operator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-for-of@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
+  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz#0fa786f1eef52e3b7d4fc02e54b2129de8a04c2a"
+  integrity sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-function-name" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-amd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
+  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
 "@babel/plugin-transform-modules-commonjs@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3"
+  integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-simple-access" "^7.7.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
 "@babel/plugin-transform-modules-systemjs@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417"
+  integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
 "@babel/plugin-transform-modules-umd@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz#d62c7da16670908e1d8c68ca0b5d4c0097b69966"
+  integrity sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
+  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-object-super@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
+  integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/helper-replace-supers" "^7.5.5"
 
 "@babel/plugin-transform-parameters@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
+  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-call-delegate" "^7.4.4"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz#93759e6c023782e52c2da3b75eca60d4f10533ee"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
+  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0.tgz#a84bb70fea302d915ea81d9809e628266bb0bc11"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
+  integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz#28e00584f9598c0dd279f6280eee213fa0121c3c"
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz#583b10c49cf057e237085bcbd8cc960bd83bd96b"
+  integrity sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz#524379e4eca5363cd10c4446ba163f093da75f3e"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz#834b0723ba78cd4d24d7d629300c2270f516d0b7"
+  integrity sha512-mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.0.0"
+    "@babel/helper-builder-react-jsx" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
 "@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc"
+  integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==
   dependencies:
-    regenerator-transform "^0.13.3"
+    regenerator-transform "^0.14.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
+  integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
 "@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
+  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typeof-symbol@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3"
+  integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
 
 "@babel/polyfill@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.0.0.tgz#c8ff65c9ec3be6a1ba10113ebd40e8750fb90bff"
+  integrity sha512-dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==
   dependencies:
     core-js "^2.5.7"
     regenerator-runtime "^0.11.1"
@@ -493,6 +568,7 @@
 "@babel/preset-env@7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11"
+  integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -539,6 +615,7 @@
 "@babel/preset-react@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
+  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-react-display-name" "^7.0.0"
@@ -546,79 +623,74 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-"@babel/runtime@7.0.0", "@babel/runtime@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
+  integrity sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==
   dependencies:
-    regenerator-runtime "^0.12.0"
+    regenerator-runtime "^0.13.2"
 
-"@babel/runtime@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
-  integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
-  integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/template@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/traverse@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
+"@babel/template@^7.1.0", "@babel/template@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
+  integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/types" "^7.7.0"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.0":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
+  integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.2"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/parser" "^7.7.2"
+    "@babel/types" "^7.7.2"
+    debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
 
-"@babel/types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
+"@babel/types@^7.0.0", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
+  integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
   dependencies:
     esutils "^2.0.2"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@fimbul/bifrost@^0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.17.0.tgz#f0383ba7e40992e3193dc87e2ddfde2ad62a9cf4"
-  integrity sha512-gVTkJAOef5HtN6LPmrtt5fAUmBywwlgmObsU3FBhPoNeXPLaIl2zywXkJEtvvVLQnaFmtff3x+wIj5lHRCDE3Q==
+"@emotion/hash@^0.7.1":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz#a166882c81c0c6040975dd30df24fae8549bd96f"
+  integrity sha512-14ZVlsB9akwvydAdaEnVnvqu6J2P6ySv39hYyl/aoB6w/V+bXX0tay8cF6paqbgZsN2n5Xh15uF4pE+GvE+itw==
+
+"@fimbul/bifrost@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
+  integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
   dependencies:
-    "@fimbul/ymir" "^0.17.0"
+    "@fimbul/ymir" "^0.21.0"
     get-caller-file "^2.0.0"
     tslib "^1.8.1"
     tsutils "^3.5.0"
 
-"@fimbul/ymir@^0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.17.0.tgz#4f28389b9f804d1cd202e11983af1743488b7815"
-  integrity sha512-xMXM9KTXRLHLVS6dnX1JhHNEkmWHcAVCQ/4+DA1KKwC/AFnGHzu/7QfQttEPgw3xplT+ILf9e3i64jrFwB3JtA==
+"@fimbul/ymir@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
+  integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
   dependencies:
     inversify "^5.0.0"
     reflect-metadata "^0.1.12"
     tslib "^1.8.1"
 
 "@fortawesome/fontawesome-common-types@^0.2.12":
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.12.tgz#42baa71f97ca06faeb0b6718fa5ed20c5eefdf07"
-  integrity sha512-ISLNpEx6fhJTYYkvBeo/4DHeL5EIA+VybJoOOnH67m6uXt6V6VFizdEN4qchHagNIeZfzI0LnA22gk0wbVPv/g==
+  version "0.2.25"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz#6df015905081f2762e5cfddeb7a20d2e9b16c786"
+  integrity sha512-3RuZPDuuPELd7RXtUqTCfed14fcny9UiPOkdr2i+cYxBoTOfQgxcDoq77fHiiHcgWuo1LoBUpvGxFF1H/y7s3Q==
 
 "@fortawesome/fontawesome-svg-core@1.2.12":
   version "1.2.12"
@@ -637,6 +709,7 @@
 "@fortawesome/react-fontawesome@0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.3.tgz#266b4047892c3d10498af1075d89252f74015b11"
+  integrity sha512-tc689l67rPZ7+ynZVUgOXY80rAt5KxvuH1qjPpJcbyJzJHzk5yhrD993BjsSEdPBLTtPqmvwynsO/XrAQqHbtg==
   dependencies:
     humps "^2.0.1"
     prop-types "^15.5.10"
@@ -1261,66 +1334,78 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
-"@material-ui/core@3.8.3":
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.8.3.tgz#5173ceb114e781b01d239a02d851ff6ffbdbc0b0"
-  integrity sha512-jgWx5uwpo+mCj+Y6JdygFRji8ZHDYZdbylqCXvpK42c2n6m/jsr4Y5Y7RnlgllkIqftKFGNnik/rd1gTLaF+Ig==
-  dependencies:
-    "@babel/runtime" "^7.2.0"
-    "@material-ui/system" "^3.0.0-alpha.0"
-    "@material-ui/utils" "^3.0.0-alpha.2"
-    "@types/jss" "^9.5.6"
-    "@types/react-transition-group" "^2.0.8"
-    brcast "^3.0.1"
-    classnames "^2.2.5"
-    csstype "^2.5.2"
-    debounce "^1.1.0"
-    deepmerge "^3.0.0"
-    dom-helpers "^3.2.1"
+"@material-ui/core@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.6.1.tgz#039f97443547a88c41d290deabfb4a044c6031ec"
+  integrity sha512-TljDMCJmi1zh7JhAFTp8qjIlbkVACiNftrcitzJJ+hAqpuP9PTO4euEkkAuYjISfUFZl3Z4kaOrBwN1HDrhIOQ==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    "@material-ui/styles" "^4.6.0"
+    "@material-ui/system" "^4.5.2"
+    "@material-ui/types" "^4.1.1"
+    "@material-ui/utils" "^4.5.2"
+    "@types/react-transition-group" "^4.2.0"
+    clsx "^1.0.2"
+    convert-css-length "^2.0.1"
     hoist-non-react-statics "^3.2.1"
-    is-plain-object "^2.0.4"
-    jss "^9.8.7"
-    jss-camel-case "^6.0.0"
-    jss-default-unit "^8.0.2"
-    jss-global "^3.0.0"
-    jss-nested "^6.0.1"
-    jss-props-sort "^6.0.0"
-    jss-vendor-prefixer "^7.0.0"
-    keycode "^2.1.9"
-    normalize-scroll-left "^0.1.2"
+    normalize-scroll-left "^0.2.0"
     popper.js "^1.14.1"
-    prop-types "^15.6.0"
-    react-event-listener "^0.6.2"
-    react-transition-group "^2.2.1"
-    recompose "0.28.0 - 0.30.0"
-    warning "^4.0.1"
+    prop-types "^15.7.2"
+    react-transition-group "^4.3.0"
 
-"@material-ui/icons@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-3.0.2.tgz#d67a6dd1ec8312d3a88ec97944a63daeef24fe10"
-  integrity sha512-QY/3gJnObZQ3O/e6WjH+0ah2M3MOgLOzCy8HTUoUx9B6dDrS18vP7Ycw3qrDEKlB6q1KNxy6CZHm5FCauWGy2g==
+"@material-ui/icons@4.5.1":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz#6963bad139e938702ece85ca43067688018f04f8"
+  integrity sha512-YZ/BgJbXX4a0gOuKWb30mBaHaoXRqPanlePam83JQPZ/y4kl+3aW0Wv9tlR70hB5EGAkEJGW5m4ktJwMgxQAeA==
   dependencies:
-    "@babel/runtime" "^7.2.0"
-    recompose "0.28.0 - 0.30.0"
+    "@babel/runtime" "^7.4.4"
 
-"@material-ui/system@^3.0.0-alpha.0":
-  version "3.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-3.0.0-alpha.1.tgz#9309e79a88dc069323b4adbf42e844a2facaf93b"
-  integrity sha512-5EihYa6Ct5mA/shfFSjWO8e/whV+otbXAduYfiL34GH+Mh4vZs+wjcy0P80XA/cDIwSgkQ7vTvvY1x04AgIz4w==
+"@material-ui/styles@^4.6.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.6.0.tgz#15679fab6dcbe0cc2416f01a22966f3ea26607c5"
+  integrity sha512-lqqh4UEMdIYcU1Yth4pQyMTah02uAkg3NOT3MirN9FUexdL8pNA6zCHigEgDSfwmvnXyxHhxTkphfy0DRfnt9w==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    "@emotion/hash" "^0.7.1"
+    "@material-ui/types" "^4.1.1"
+    "@material-ui/utils" "^4.5.2"
+    clsx "^1.0.2"
+    csstype "^2.5.2"
+    hoist-non-react-statics "^3.2.1"
+    jss "^10.0.0"
+    jss-plugin-camel-case "^10.0.0"
+    jss-plugin-default-unit "^10.0.0"
+    jss-plugin-global "^10.0.0"
+    jss-plugin-nested "^10.0.0"
+    jss-plugin-props-sort "^10.0.0"
+    jss-plugin-rule-value-function "^10.0.0"
+    jss-plugin-vendor-prefixer "^10.0.0"
+    prop-types "^15.7.2"
+
+"@material-ui/system@^4.5.2":
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.5.2.tgz#7143bd8422a3f33f435c23f378136254004bbd60"
+  integrity sha512-h9RWvdM9XKlHHqwiuhyvWdobptQkHli+m2jJFs7i1AI/hmGsIc4reDmS7fInhETgt/Txx7uiAIznfRNIIVHmQw==
   dependencies:
-    "@babel/runtime" "7.1.2"
-    deepmerge "^2.0.1"
-    prop-types "^15.6.0"
-    warning "^4.0.1"
+    "@babel/runtime" "^7.4.4"
+    "@material-ui/utils" "^4.5.2"
+    prop-types "^15.7.2"
 
-"@material-ui/utils@^3.0.0-alpha.2":
-  version "3.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz#836c62ea46f5ffc6f0b5ea05ab814704a86908b1"
-  integrity sha512-rwMdMZptX0DivkqBuC+Jdq7BYTXwqKai5G5ejPpuEDKpWzi1Oxp+LygGw329FrKpuKeiqpcymlqJTjmy+quWng==
+"@material-ui/types@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz#b65e002d926089970a3271213a3ad7a21b17f02b"
+  integrity sha512-AN+GZNXytX9yxGi0JOfxHrRTbhFybjUJ05rnsBVjcB+16e466Z0Xe5IxawuOayVZgTBNDxmPKo5j4V6OnMtaSQ==
   dependencies:
-    "@babel/runtime" "^7.2.0"
-    prop-types "^15.6.0"
-    react-is "^16.6.3"
+    "@types/react" "*"
+
+"@material-ui/utils@^4.5.2":
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.5.2.tgz#4c2fb531d357cf0da8cece53b588dff9b0bde934"
+  integrity sha512-zhbNfHd1gLa8At6RPDG7uMZubHxbY+LtM6IkSfeWi6Lo4Ax80l62YaN1QmUpO1IvGCkn/j62tQX3yObiQZrJsQ==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    prop-types "^15.7.2"
+    react-is "^16.8.6"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1335,15 +1420,14 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@octokit/endpoint@^5.1.0":
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.3.2.tgz#2deda2d869cac9ba7f370287d55667be2a808d4b"
-  integrity sha512-gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw==
+"@octokit/endpoint@^5.5.0":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.5.1.tgz#2eea81e110ca754ff2de11c79154ccab4ae16b3f"
+  integrity sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==
   dependencies:
-    deepmerge "4.0.0"
+    "@octokit/types" "^2.0.0"
     is-plain-object "^3.0.0"
-    universal-user-agent "^3.0.0"
-    url-template "^2.0.8"
+    universal-user-agent "^4.0.0"
 
 "@octokit/plugin-enterprise-rest@^2.1.1":
   version "2.2.2"
@@ -1351,32 +1435,34 @@
   integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw==
 
 "@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.0.4.tgz#15e1dc22123ba4a9a4391914d80ec1e5303a23be"
-  integrity sha512-L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.0.tgz#a64d2a9d7a13555570cd79722de4a4d76371baaa"
+  integrity sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==
   dependencies:
+    "@octokit/types" "^2.0.0"
     deprecation "^2.0.0"
     once "^1.4.0"
 
-"@octokit/request@^5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.0.2.tgz#59a920451f24811c016ddc507adcc41aafb2dca5"
-  integrity sha512-z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A==
+"@octokit/request@^5.2.0":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.1.tgz#3a1ace45e6f88b1be4749c5da963b3a3b4a2f120"
+  integrity sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==
   dependencies:
-    "@octokit/endpoint" "^5.1.0"
+    "@octokit/endpoint" "^5.5.0"
     "@octokit/request-error" "^1.0.1"
+    "@octokit/types" "^2.0.0"
     deprecation "^2.0.0"
     is-plain-object "^3.0.0"
     node-fetch "^2.3.0"
     once "^1.4.0"
-    universal-user-agent "^3.0.0"
+    universal-user-agent "^4.0.0"
 
 "@octokit/rest@^16.16.0":
-  version "16.28.7"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.7.tgz#a2c2db5b318da84144beba82d19c1a9dbdb1a1fa"
-  integrity sha512-cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA==
+  version "16.35.0"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.35.0.tgz#7ccc1f802f407d5b8eb21768c6deca44e7b4c0d8"
+  integrity sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w==
   dependencies:
-    "@octokit/request" "^5.0.0"
+    "@octokit/request" "^5.2.0"
     "@octokit/request-error" "^1.0.2"
     atob-lite "^2.0.0"
     before-after-hook "^2.0.0"
@@ -1387,20 +1473,29 @@
     lodash.uniq "^4.5.0"
     octokit-pagination-methods "^1.1.0"
     once "^1.4.0"
-    universal-user-agent "^3.0.0"
-    url-template "^2.0.8"
+    universal-user-agent "^4.0.0"
+
+"@octokit/types@^2.0.0":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.0.2.tgz#0888497f5a664e28b0449731d5e88e19b2a74f90"
+  integrity sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ==
+  dependencies:
+    "@types/node" ">= 8"
 
 "@types/classnames@2.2.6":
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.6.tgz#dbe8a666156d556ed018e15a4c65f08937c3f628"
+  integrity sha512-XHcYvVdbtAxVstjKxuULYqYaWIzHR15yr1pZj4fnGChuBVJlIAp9StJna0ZJNSgxPh4Nac2FL4JM3M11Tm6fqQ==
 
 "@types/fbemitter@*":
   version "2.0.32"
   resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
+  integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
 
 "@types/flux@3.1.8":
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.8.tgz#987fbf0220d98aa23276c9635a8ef1e505f7c4a4"
+  integrity sha512-U7DS78cK1svrisTa920BM2AEsWnfgnxQmVn+1kju1XgjcDN/iU1Uiyy0pQNaG8s9P1X5Lj3pMaIfVuCjXAlSCA==
   dependencies:
     "@types/fbemitter" "*"
     "@types/react" "*"
@@ -1411,8 +1506,9 @@
   integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
 
 "@types/history@*":
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.0.tgz#2fac51050c68f7d6f96c5aafc631132522f4aa3f"
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a"
+  integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==
 
 "@types/jest@23.3.12":
   version "23.3.12"
@@ -1422,57 +1518,60 @@
 "@types/jquery@3.3.10":
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.10.tgz#d0afaec7ee55f591992e74c607df5dc7cd9c76ab"
+  integrity sha512-W2bE8pGh9Tsg8mxh+B6BSH8lTG6ZV7K2ZMAlEwSTqKFU1wMI5HShyRKSp3DngnxCmDu35tW3RAC4mxBFYRsTuw==
 
 "@types/jsonwebtoken@7.2.8":
   version "7.2.8"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-7.2.8.tgz#8d199dab4ddb5bba3234f8311b804d2027af2b3a"
+  integrity sha512-XENN3YzEB8D6TiUww0O8SRznzy1v+77lH7UmuN54xq/IHIsyWjWOzZuFFTtoiRuaE782uAoRwBe/wwow+vQXZw==
   dependencies:
     "@types/node" "*"
 
-"@types/jss@^9.5.6":
-  version "9.5.7"
-  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.7.tgz#fa57a6d0b38a3abef8a425e3eb6a53495cb9d5a0"
-  integrity sha512-OZimStu2QdDMtZ0h72JXqvLVbWUjXd5ZLk8vxLmfuC/nM1AabRyyGoxSufnzixrbpEcVcyy/JV5qeQu2JnjVZw==
-  dependencies:
-    csstype "^2.0.0"
-    indefinite-observable "^1.0.1"
-
 "@types/marked@0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.6.0.tgz#e4ac316144a84afda5c2474488d7b9fef3ab9995"
   integrity sha512-TxwhgR9VsIfRDJ3WwFokG8Xu+ea0nYGDRHdI783WJ983uffatz0ytIeUEIBOwPvRy241KRSNVyywQltuTqDh0w==
 
 "@types/node@*":
-  version "10.11.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.1.tgz#adc48781dd50b2635a8a7854d99c759a26ede840"
+  version "12.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.7.tgz#01e4ea724d9e3bd50d90c11fd5980ba317d8fa11"
+  integrity sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w==
 
 "@types/node@11.11.6":
   version "11.11.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a"
   integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
 
+"@types/node@>= 8":
+  version "12.12.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.17.tgz#191b71e7f4c325ee0fb23bc4a996477d92b8c39b"
+  integrity sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==
+
 "@types/prop-types@*":
-  version "15.5.6"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
-"@types/react-dom@16.0.8":
-  version "16.0.8"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.8.tgz#6e1366ed629cadf55860cbfcc25db533f5d2fa7d"
+"@types/react-dom@16.9.4":
+  version "16.9.4"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
+  integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
   dependencies:
-    "@types/node" "*"
     "@types/react" "*"
 
 "@types/react-router-dom@4.3.1":
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.1.tgz#71fe2918f8f60474a891520def40a63997dafe04"
+  integrity sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
     "@types/react-router" "*"
 
 "@types/react-router@*":
-  version "4.0.31"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.0.31.tgz#416bac49d746800810886c7b8582a622ed9604fc"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.3.tgz#7c7ca717399af64d8733d8cb338dd43641b96f2d"
+  integrity sha512-0gGhmerBqN8CzlnDmSgGNun3tuZFXerUclWkqEhozdLaJtfcJRUTGkKaEKk+/MpHd1KDS1+o2zb/3PkBUiv2qQ==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -1484,15 +1583,17 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-transition-group@^2.0.8":
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.14.tgz#afd0cd785a97f070b55765e9f9d76ff568269001"
+"@types/react-transition-group@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.3.tgz#4924133f7268694058e415bf7aea2d4c21131470"
+  integrity sha512-Hk8jiuT7iLOHrcjKP/ZVSyCNXK73wJAUz60xm0mVhiRujrdiI++j4duLiL282VGxwAgxetHQFfqA29LgEeSkFA==
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16.4.14":
-  version "16.4.14"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.14.tgz#47c604c8e46ed674bbdf4aabf82b34b9041c6a04"
+"@types/react@*", "@types/react@16.9.11":
+  version "16.9.11"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.11.tgz#70e0b7ad79058a7842f25ccf2999807076ada120"
+  integrity sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -1500,6 +1601,7 @@
 "@types/x2js@3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/x2js/-/x2js-3.1.0.tgz#d809ef1ace1a8b55b3e8cb6a1a0b282af66475be"
+  integrity sha1-2AnvGs4ai1Wz6MtqGgsoKvZkdb4=
   dependencies:
     x2js "*"
 
@@ -1649,10 +1751,12 @@
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
 JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.5"
@@ -1663,48 +1767,52 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
     through ">=2.2.7 <3"
 
 abab@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
-  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
     acorn "^5.0.0"
 
 acorn-globals@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
-  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
 acorn-walk@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
-  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 acorn@^6.0.1:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
-  integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
+  integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
@@ -1728,25 +1836,29 @@ agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.1.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1756,34 +1868,32 @@ ajv@^6.1.0:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 ansi-colors@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.6.tgz#a0b9e00e8c1cc6685b1c3130dbeb9abed03ca6a4"
-
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz#4dccdb846c3eee10f6d64dea66273eab90c37228"
-  integrity sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==
-  dependencies:
-    type-fest "^0.5.2"
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-regex@^4.1.0:
   version "4.1.0"
@@ -1793,16 +1903,19 @@ ansi-regex@^4.1.0:
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -1817,6 +1930,7 @@ append-transform@^0.4.0:
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 aproba@^2.0.0:
   version "2.0.0"
@@ -1826,6 +1940,7 @@ aproba@^2.0.0:
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -1833,6 +1948,7 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -1846,14 +1962,17 @@ arr-diff@^2.0.0:
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
@@ -1868,14 +1987,17 @@ array-equal@^1.0.0:
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-ify@^1.0.0:
   version "1.0.0"
@@ -1885,12 +2007,14 @@ array-ify@^1.0.0:
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
@@ -1900,18 +2024,22 @@ array-unique@^0.2.1:
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1920,54 +2048,59 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
+    object-assign "^4.1.1"
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
-
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.1.4, async@^2.4.1, async@^2.5.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+async@^2.1.4, async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.14"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob-lite@^2.0.0:
   version "2.0.0"
@@ -1977,10 +2110,12 @@ atob-lite@^2.0.0:
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@9.1.5:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
+  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
   dependencies:
     browserslist "^4.1.0"
     caniuse-lite "^1.0.30000884"
@@ -1992,14 +2127,17 @@ autoprefixer@9.1.5:
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -2063,6 +2201,7 @@ babel-jest@^23.6.0:
 babel-loader@8.0.4:
   version "8.0.4"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6"
+  integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -2076,6 +2215,13 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
+  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+  dependencies:
+    object.assign "^4.1.0"
+
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
@@ -2169,14 +2315,17 @@ babylon@^6.18.0:
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -2189,10 +2338,12 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -2204,53 +2355,60 @@ before-after-hook@^2.0.0:
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+bluebird@^3.5.1, bluebird@^3.5.5:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
+  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
 
 bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
-
-bluebird@^3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
   dependencies:
-    bytes "3.0.0"
+    bytes "3.1.0"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
 
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -2262,10 +2420,12 @@ bonjour@^3.5.0:
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -2279,9 +2439,10 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0, braces@^2.3.1:
+braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -2294,13 +2455,10 @@ braces@^2.3.0, braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-brcast@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-process-hrtime@^0.1.2:
   version "0.1.3"
@@ -2316,7 +2474,8 @@ browser-resolve@^1.11.3:
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -2328,6 +2487,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -2336,6 +2496,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -2344,7 +2505,8 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -2352,6 +2514,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -2364,16 +2527,18 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"
+  integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==
   dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
+    caniuse-lite "^1.0.30001004"
+    electron-to-chromium "^1.3.295"
+    node-releases "^1.1.38"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -2383,9 +2548,9 @@ bs-logger@0.x:
     fast-json-stable-stringify "2.x"
 
 bser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
@@ -2397,34 +2562,41 @@ btoa-lite@^1.0.0:
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
 buffer-from@1.x, buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
-  version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
@@ -2444,10 +2616,17 @@ byte-size@^4.0.3:
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -2463,27 +2642,7 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.0.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
-  dependencies:
-    bluebird "^3.5.3"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    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.2"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cacache@^11.3.3:
+cacache@^11.0.2, cacache@^11.3.3:
   version "11.3.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
   integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
@@ -2504,9 +2663,9 @@ cacache@^11.3.3:
     y18n "^4.0.0"
 
 cacache@^12.0.0, cacache@^12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c"
-  integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
+  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
   dependencies:
     bluebird "^3.5.5"
     chownr "^1.1.1"
@@ -2527,6 +2686,7 @@ cacache@^12.0.0, cacache@^12.0.2:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -2565,6 +2725,7 @@ callsites@^2.0.0:
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
   dependencies:
     no-case "^2.2.0"
     upper-case "^1.1.1"
@@ -2572,6 +2733,7 @@ camel-case@3.0.x:
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -2588,23 +2750,27 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30000884:
-  version "1.0.30000888"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000888.tgz#22edb50d91dd70612b5898e3b36f460600c6492f"
+caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30001004:
+  version "1.0.30001010"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001010.tgz#397a14034d384260453cc81994f494626d34b938"
+  integrity sha512-RA5GH9YjFNea4ZQszdWgh2SC+dpLiRAg4VDQS2b5JRI45OxmbGrYocYHTa9x0bKMQUE7uvHkNPNffUr+pCxSGw==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -2616,10 +2782,12 @@ capture-exit@^1.2.0:
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -2627,15 +2795,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2644,10 +2804,6 @@ chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-change-emitter@^0.1.2:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2669,39 +2825,41 @@ chartjs-color-string@^0.6.0:
     color-name "^1.0.0"
 
 chartjs-color@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
-  integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
   dependencies:
     chartjs-color-string "^0.6.0"
-    color-convert "^0.5.3"
+    color-convert "^1.9.3"
 
 chokidar@^2.0.0, chokidar@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
     glob-parent "^3.1.0"
-    inherits "^2.0.1"
+    inherits "^2.0.3"
     is-binary-path "^1.0.0"
     is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
+    normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
   optionalDependencies:
-    fsevents "^1.2.2"
+    fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
 
 chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -2713,6 +2871,7 @@ ci-info@^1.5.0:
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2720,28 +2879,31 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@2.2.6, classnames@^2.2.5:
+classnames@2.2.6, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
 clean-css@4.2.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
-    restore-cursor "^3.1.0"
+    restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
@@ -2751,6 +2913,7 @@ cli-width@^2.0.0:
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -2759,6 +2922,7 @@ cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -2767,6 +2931,7 @@ cliui@^4.0.0:
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
   dependencies:
     for-own "^1.0.0"
     is-plain-object "^2.0.4"
@@ -2781,11 +2946,17 @@ clone@^1.0.2:
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+clsx@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.0.4.tgz#0c0171f6d5cb2fe83848463c15fcc26b4df8c2ec"
+  integrity sha512-1mQ557MIZTrL/140j+JVdRM6e31/OA4vTYxXgqIIZlndyfjHpyawKZia1Im05Vp9BWmImkcNrNtFYQMyFcgJDg==
 
 cmd-shim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  integrity sha1-b8vamUg6j9FdfTChlspp1oii79s=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.1.0.tgz#e59a08d4248dda3bb502044083a4db4ac890579a"
+  integrity sha512-A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw==
   dependencies:
     graceful-fs "^4.1.2"
     mkdirp "~0.5.0"
@@ -2793,32 +2964,32 @@ cmd-shim@^2.0.2:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
-  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
-
-color-convert@^1.9.0:
+color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-name@^1.0.0:
   version "1.1.4"
@@ -2833,6 +3004,7 @@ colors@1.0.3:
 colour@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 columnify@^1.5.4:
   version "1.5.4"
@@ -2842,23 +3014,24 @@ columnify@^1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.5, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.17.x, commander@~2.17.1:
+commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^2.12.1:
+commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2866,6 +3039,7 @@ commander@^2.12.1:
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
@@ -2876,34 +3050,39 @@ compare-func@^1.3.1:
     dot-prop "^3.0.0"
 
 component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compressible@~2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+compressible@~2.0.16:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
   dependencies:
-    mime-db ">= 1.36.0 < 2"
+    mime-db ">= 1.40.0 < 2"
 
 compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -2929,35 +3108,41 @@ config-chain@^1.1.11:
     proto-list "~1.2.1"
 
 connect-history-api-fallback@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0"
-  integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz#269540c624553aded809c29a3508fdc2b544c059"
+  integrity sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2982,22 +3167,22 @@ conventional-changelog-core@^3.1.6:
     through2 "^3.0.0"
 
 conventional-changelog-preset-loader@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz#571e2b3d7b53d65587bea9eedf6e37faa5db4fcc"
-  integrity sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz#580fa8ab02cef22c24294d25e52d7ccd247a9a6a"
+  integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==
 
 conventional-changelog-writer@^4.0.6:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.7.tgz#e4b7d9cbea902394ad671f67108a71fa90c7095f"
-  integrity sha512-p/wzs9eYaxhFbrmX/mCJNwJuvvHR+j4Fd0SQa2xyAhYed6KBiZ780LvoqUUvsayP4R1DtC27czalGUhKV2oabw==
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz#9f56d2122d20c96eb48baae0bf1deffaed1edba4"
+  integrity sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
-    handlebars "^4.1.2"
+    handlebars "^4.4.0"
     json-stringify-safe "^5.0.1"
-    lodash "^4.2.1"
-    meow "^4.0.0"
+    lodash "^4.17.15"
+    meow "^5.0.0"
     semver "^6.0.0"
     split "^1.0.0"
     through2 "^3.0.0"
@@ -3011,14 +3196,14 @@ conventional-commits-filter@^2.0.2:
     modify-values "^1.0.0"
 
 conventional-commits-parser@^3.0.2, conventional-commits-parser@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d"
-  integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz#23310a9bda6c93c874224375e72b09fb275fe710"
+  integrity sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==
   dependencies:
     JSONStream "^1.0.4"
-    is-text-path "^2.0.0"
-    lodash "^4.2.1"
-    meow "^4.0.0"
+    is-text-path "^1.0.1"
+    lodash "^4.17.15"
+    meow "^5.0.0"
     split2 "^2.0.0"
     through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
@@ -3037,23 +3222,32 @@ conventional-recommended-bump@^4.0.4:
     meow "^4.0.0"
     q "^1.5.1"
 
+convert-css-length@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/convert-css-length/-/convert-css-length-2.0.1.tgz#90a76bde5bfd24d72881a5b45d02249b2c1d257c"
+  integrity sha512-iGpbcvhLPRKUbBc0Quxx7w/bV14AC3ItuBEGMahA5WTYqB8lq9jH0kTXFheCBASsYnqeMFZhiTruNxr1N59Axg==
+
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -3065,10 +3259,12 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
+  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -3079,38 +3275,22 @@ copy-webpack-plugin@4.5.2:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.2.tgz#267988d7268323b349e20b4588211655f0e83944"
-  integrity sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==
-
-core-js@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
+  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 corser@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
   integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
-cosmiconfig@^5.1.0:
+cosmiconfig@^5.0.0, cosmiconfig@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
   integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
@@ -3123,13 +3303,15 @@ cosmiconfig@^5.1.0:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -3139,7 +3321,8 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
-  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -3151,22 +3334,15 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -3177,6 +3353,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -3193,6 +3370,7 @@ crypto-browserify@^3.11.0:
 css-loader@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.0.tgz#9f46aaa5ca41dbe31860e3b62b8e23c42916bf56"
+  integrity sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -3210,6 +3388,7 @@ css-loader@1.0.0:
 css-select@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -3217,52 +3396,60 @@ css-select@^1.1.0:
     nth-check "~1.0.1"
 
 css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
-css-vendor@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa"
+css-vendor@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz#4e6d53d953c187981576d6a542acc9fb57174bda"
+  integrity sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==
   dependencies:
+    "@babel/runtime" "^7.6.2"
     is-in-browser "^1.0.2"
 
 css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
-  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssstyle@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
-  integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
   dependencies:
     cssom "0.3.x"
 
-csstype@^2.0.0, csstype@^2.2.0, csstype@^2.5.2:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff"
+csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5"
+  integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
 dargs@^4.0.1:
   version "4.1.0"
@@ -3274,6 +3461,7 @@ dargs@^4.0.1:
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
@@ -3286,38 +3474,26 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debounce@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@=3.1.0:
+debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
-  dependencies:
-    ms "^2.1.1"
-
-debug@^3.2.5:
+debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3347,16 +3523,19 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -3364,35 +3543,31 @@ dedent@^0.7.0:
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deepmerge@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09"
-  integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==
-
-deepmerge@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
-
-deepmerge@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.0.0.tgz#ca7903b34bfa1f8c2eab6779280775a411bfc6ba"
-  integrity sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==
-
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
   dependencies:
     execa "^0.10.0"
     ip-regex "^2.1.0"
@@ -3411,27 +3586,31 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -3439,6 +3618,7 @@ define-property@^2.0.2:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -3450,18 +3630,17 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 deprecation@^2.0.0:
   version "2.3.1"
@@ -3469,8 +3648,9 @@ deprecation@^2.0.0:
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
 des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -3478,6 +3658,7 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -3499,6 +3680,7 @@ detect-indent@^5.0.0:
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-newline@^2.1.0:
   version "2.1.0"
@@ -3525,26 +3707,37 @@ diff@^3.2.0:
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
-  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@2.0.0, dir-glob@^2.0.0:
+dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dir-glob@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -3552,6 +3745,7 @@ dns-packet@^1.3.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
@@ -3563,34 +3757,43 @@ doctrine@0.7.2, doctrine@^0.7.2:
     esutils "^1.1.6"
     isarray "0.0.1"
 
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "http://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+dom-converter@^0.2:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
   dependencies:
-    utila "~0.3"
+    utila "~0.4"
 
-dom-helpers@^3.2.1, dom-helpers@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
+dom-helpers@^5.0.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
+  integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+  dependencies:
+    "@babel/runtime" "^7.6.3"
+    csstype "^2.6.7"
 
 dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+domelementtype@1, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+domelementtype@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
+  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -3599,21 +3802,25 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
-
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3638,8 +3845,9 @@ duplexer@^0.1.1:
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3649,20 +3857,22 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-ecdsa-sig-formatter@1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3"
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
   dependencies:
     safe-buffer "^5.0.1"
 
 ecstatic@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.0.tgz#91cd417d152abf85b37b1ab3ebf3bd25cdc64e80"
-  integrity sha512-EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.2.tgz#6d1dd49814d00594682c652adb66076a69d46c48"
+  integrity sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==
   dependencies:
     he "^1.1.1"
     mime "^1.6.0"
@@ -3672,14 +3882,17 @@ ecstatic@^3.0.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.62:
-  version "1.3.72"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.72.tgz#b69683081d5b7eee6e1ea07b2f5fa30b3c72252d"
+electron-to-chromium@^1.3.295:
+  version "1.3.306"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946"
+  integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A==
 
 elliptic@^6.0.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
+  integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3689,42 +3902,48 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
   dependencies:
     graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
+    memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
+  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -3734,32 +3953,41 @@ err-code@^1.0.0:
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.5.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
+  integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
   dependencies:
-    es-to-primitive "^1.1.1"
+    es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
+    has "^1.0.3"
+    has-symbols "^1.0.0"
+    is-callable "^1.1.4"
     is-regex "^1.0.4"
+    object-inspect "^1.6.0"
+    object-keys "^1.1.1"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
 
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+es-to-primitive@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
-    is-callable "^1.1.1"
+    is-callable "^1.1.4"
     is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
+    is-symbol "^1.0.2"
 
 es6-promise@^4.0.3:
   version "4.2.8"
@@ -3776,15 +4004,17 @@ es6-promisify@^5.0.0:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -3794,8 +4024,9 @@ escodegen@^1.9.1:
     source-map "~0.6.1"
 
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3808,16 +4039,19 @@ esprima@^3.1.3:
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 esutils@^1.1.6:
   version "1.1.6"
@@ -3825,20 +4059,24 @@ esutils@^1.1.6:
   integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
 
 esutils@^2.0.0, esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -3850,6 +4088,7 @@ eventsource@^1.0.7:
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -3864,6 +4103,7 @@ exec-sh@^0.2.0:
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -3873,19 +4113,6 @@ execa@^0.10.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    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"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -3914,6 +4141,7 @@ expand-brackets@^0.1.4:
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3950,49 +4178,52 @@ expect@^23.6.0:
     jest-regex-util "^23.3.0"
 
 express@^4.16.2:
-  version "4.16.3"
-  resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
-    accepts "~1.3.5"
+    accepts "~1.3.7"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
     content-type "~1.0.4"
-    cookie "0.3.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~1.1.2"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.1.1"
+    finalhandler "~1.1.2"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -4000,6 +4231,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.3:
   version "3.1.0"
@@ -4020,6 +4252,7 @@ extglob@^0.3.1:
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4033,6 +4266,7 @@ extglob@^2.0.4:
 extract-text-webpack-plugin@next:
   version "4.0.0-beta.0"
   resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz#f7361d7ff430b42961f8d1321ba8c1757b5d4c42"
+  integrity sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==
   dependencies:
     async "^2.4.1"
     loader-utils "^1.1.0"
@@ -4042,18 +4276,22 @@ extract-text-webpack-plugin@next:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-glob@^2.0.2:
   version "2.2.7"
@@ -4070,26 +4308,29 @@ fast-glob@^2.0.2:
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
 faye-websocket@~0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -4100,32 +4341,22 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.1:
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
-
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
-figures@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"
-  integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-loader@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
+  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -4157,43 +4388,48 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -4201,12 +4437,14 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
@@ -4221,25 +4459,29 @@ findup-sync@^2.0.0:
     resolve-dir "^1.0.1"
 
 flush-write-stream@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f"
+  integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==
   dependencies:
-    debug "=3.1.0"
+    debug "^3.0.0"
 
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
@@ -4251,38 +4493,45 @@ for-own@^0.1.4:
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.3.1, form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -4297,14 +4546,16 @@ fs-extra@^7.0.0:
     universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.6.0"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -4314,25 +4565,20 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fsevents@^1.2.3:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.6.tgz#d3a1864a71876a2eb9b244e3bd8f606eb09568c0"
-  integrity sha512-BalK54tfK0pMC0jQFb2oHn1nz7JNQD/2ex5pBnCHgBi2xG7VV0cAOGy2RS2VbCqUXx5/6obMrMcQTJ8yjcGzbg==
+fsevents@^1.2.3, fsevents@^1.2.7:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fstream@^1.0.0, fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -4342,10 +4588,12 @@ fstream@^1.0.0, fstream@^1.0.2:
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -4359,6 +4607,7 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
@@ -4370,11 +4619,12 @@ genfun@^5.0.0:
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
@@ -4395,10 +4645,12 @@ get-port@^3.2.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
@@ -4410,10 +4662,12 @@ get-stream@^4.0.0, get-stream@^4.1.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
@@ -4489,6 +4743,7 @@ glob-parent@^2.0.0:
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -4498,21 +4753,10 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  dependencies:
-    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"
-
-glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4522,8 +4766,9 @@ glob@^7.1.4:
     path-is-absolute "^1.0.0"
 
 global-modules-path@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931"
+  integrity sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==
 
 global-modules@^1.0.0:
   version "1.0.0"
@@ -4546,8 +4791,9 @@ global-prefix@^1.0.1:
     which "^1.2.14"
 
 globals@^11.1.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4557,6 +4803,7 @@ globals@^9.18.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -4567,6 +4814,7 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -4591,6 +4839,7 @@ globby@^8.0.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -4599,20 +4848,12 @@ globule@^1.0.0:
 graceful-fs@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.4.tgz#ef089d2880f033b011823ce5c8fae798da775dbd"
+  integrity sha1-7widKIDwM7ARgjzlyPrnmNp3Xb0=
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-graceful-fs@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-graceful-fs@^4.1.6:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.1.tgz#1c1f0c364882c868f5bff6512146328336a11b1d"
-  integrity sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4625,20 +4866,20 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.3:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.2.tgz#5a4eb92ab5962ca3415ac188c86dc7f784f76a0f"
+  integrity sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+handlebars@^4.4.0:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -4649,24 +4890,28 @@ handlebars@^4.1.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
 har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -4678,18 +4923,22 @@ has-flag@^1.0.0:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -4698,6 +4947,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -4706,39 +4956,40 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
+has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.1.x:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
-he@^1.1.1:
+he@1.2.x, he@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -4749,33 +5000,37 @@ highlight.js@9.13.1:
   integrity sha512-Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A==
 
 history@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
+  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
   dependencies:
-    invariant "^2.2.1"
+    "@babel/runtime" "^7.1.2"
     loose-envify "^1.2.0"
-    resolve-pathname "^2.2.0"
-    value-equal "^0.4.0"
-    warning "^3.0.0"
+    resolve-pathname "^3.0.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
+    value-equal "^1.0.1"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e"
-  integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==
+hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
-    react-is "^16.3.2"
+    react-is "^16.7.0"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
@@ -4786,26 +5041,21 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-
-hosted-git-info@^2.6.0:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.2.tgz#a35c3f355ac1249f1093c0c2a542ace8818c171a"
-  integrity sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==
-  dependencies:
-    lru-cache "^5.1.1"
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -4822,15 +5072,17 @@ html-encoding-sniffer@^1.0.2:
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 html-minifier@^3.2.3:
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
   dependencies:
     camel-case "3.0.x"
     clean-css "4.2.x"
     commander "2.17.x"
-    he "1.1.x"
+    he "1.2.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.4.x"
@@ -4838,6 +5090,7 @@ html-minifier@^3.2.3:
 html-webpack-include-assets-plugin@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/html-webpack-include-assets-plugin/-/html-webpack-include-assets-plugin-1.0.5.tgz#12770c227290451633351b5ed72dda8ce8c0642e"
+  integrity sha512-YkkzE+QfYAuEq8/yEnfTcpCeSLyJ8XmB2LlQzY1GV7/ovDxavcCIKSMF4kIMRrWmFMPU8qog/zvBaQ1RJFFw/g==
   dependencies:
     glob "^7.1.3"
     minimatch "^3.0.4"
@@ -4845,7 +5098,8 @@ html-webpack-include-assets-plugin@1.0.5:
 
 html-webpack-plugin@3.2.0:
   version "3.2.0"
-  resolved "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
   dependencies:
     html-minifier "^3.2.3"
     loader-utils "^0.2.16"
@@ -4855,14 +5109,17 @@ html-webpack-plugin@3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+htmlparser2@^3.3.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
+    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"
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
@@ -4872,28 +5129,44 @@ http-cache-semantics@^3.8.1:
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
   dependencies:
-    depd "1.1.1"
+    depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
 http-errors@~1.6.2:
   version "1.6.3"
-  resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -4905,7 +5178,8 @@ http-proxy-agent@^2.1.0:
 
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
-  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -4913,10 +5187,11 @@ http-proxy-middleware@~0.18.0:
     micromatch "^3.1.9"
 
 http-proxy@^1.16.2, http-proxy@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
   dependencies:
-    eventemitter3 "^3.0.0"
+    eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
@@ -4937,6 +5212,7 @@ http-server@^0.11.1:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -4945,11 +5221,12 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
-  integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
+https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
     agent-base "^4.3.0"
     debug "^3.1.0"
@@ -4964,56 +5241,63 @@ humanize-ms@^1.2.1:
 humps@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
+  integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
 
-hyphenate-style-name@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
-
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+hyphenate-style-name@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
+  integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
 icss-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
   dependencies:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
   dependencies:
     import-from "^2.1.0"
 
@@ -5028,6 +5312,7 @@ import-fresh@^2.0.0:
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
   dependencies:
     resolve-from "^3.0.0"
 
@@ -5042,6 +5327,7 @@ import-local@^1.0.0:
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
@@ -5049,20 +5335,17 @@ import-local@^2.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
-indefinite-observable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-1.0.1.tgz#09915423cc8d6f7eb1cb7882ad134633c9a6edc3"
-  dependencies:
-    symbol-observable "1.0.4"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
@@ -5071,10 +5354,6 @@ indent-string@^3.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
   integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -5083,21 +5362,30 @@ infer-owner@^1.0.3, infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 init-package-json@^1.10.3:
   version "1.10.3"
@@ -5114,38 +5402,41 @@ init-package-json@^1.10.3:
     validate-npm-package-name "^3.0.0"
 
 inquirer@^6.2.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42"
-  integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
-    ansi-escapes "^4.2.1"
+    ansi-escapes "^3.2.0"
     chalk "^2.4.2"
-    cli-cursor "^3.1.0"
+    cli-cursor "^2.1.0"
     cli-width "^2.0.0"
     external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
     run-async "^2.2.0"
     rxjs "^6.4.0"
-    string-width "^4.1.0"
+    string-width "^2.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
 internal-ip@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
 interpret@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
@@ -5157,67 +5448,73 @@ inversify@^5.0.0:
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-3.0.0.tgz#0a934694b4066558c46294244a23cc33116bf732"
-  integrity sha512-T8wDtjy+Qf2TAPDQmBp0eGKJ8GavlWlUnamr3wRn6vvdZlKVuJXXMlSncYFRYgVHOM3If5NR1H4+OvVQU9Idvg==
-
-ip@^1.1.0, ip@^1.1.5:
+ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+ipaddr.js@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
 ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.1, is-callable@^1.1.3:
+is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^1.0.10:
   version "1.2.1"
@@ -5229,22 +5526,26 @@ is-ci@^1.0.10:
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -5253,6 +5554,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -5261,6 +5563,7 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
@@ -5277,10 +5580,12 @@ is-equal-shallow@^0.1.3:
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
@@ -5292,27 +5597,26 @@ is-extglob@^1.0.0:
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
@@ -5329,18 +5633,21 @@ is-glob@^2.0.0, is-glob@^2.0.1:
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
+  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
 is-number@^2.1.0:
   version "2.1.0"
@@ -5352,6 +5659,7 @@ is-number@^2.1.0:
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
@@ -5368,16 +5676,19 @@ is-obj@^1.0.0:
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
@@ -5386,9 +5697,10 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
@@ -5417,6 +5729,7 @@ is-promise@^2.1.0:
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
@@ -5427,76 +5740,81 @@ is-ssh@^1.3.0:
   dependencies:
     protocols "^1.1.0"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-symbol@^1.0.1:
+is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
   dependencies:
     has-symbols "^1.0.0"
 
-is-text-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636"
-  integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==
+is-text-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
-    text-extensions "^2.0.0"
+    text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isobject@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
   integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^1.3.1:
   version "1.3.7"
@@ -5888,24 +6206,29 @@ jest@23.6.0:
 jquery@3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 
 js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
 js-levenshtein@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
+  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.1:
+js-yaml@^3.13.1, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -5913,24 +6236,10 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.7.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^11.5.1:
   version "11.12.0"
@@ -5970,47 +6279,63 @@ jsesc@^1.3.0:
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
 json5@2.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
+  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
   dependencies:
     minimist "^1.2.0"
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -6027,6 +6352,7 @@ jsonparse@^1.2.0:
 jsonwebtoken@8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz#056c90eee9a65ed6e6c72ddb0a1d325109aaf643"
+  integrity sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag==
   dependencies:
     jws "^3.1.5"
     lodash.includes "^4.3.0"
@@ -6041,93 +6367,127 @@ jsonwebtoken@8.3.0:
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-jss-camel-case@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44"
+jss-plugin-camel-case@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0.tgz#d601bae2e8e2041cc526add289dcd7062db0a248"
+  integrity sha512-yALDL00+pPR4FJh+k07A8FeDvfoPPuXU48HLy63enAubcVd3DnS+2rgqPXglHDGixIDVkCSXecl/l5GAMjzIbA==
   dependencies:
-    hyphenate-style-name "^1.0.2"
+    "@babel/runtime" "^7.3.1"
+    hyphenate-style-name "^1.0.3"
+    jss "10.0.0"
 
-jss-default-unit@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6"
+jss-plugin-default-unit@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0.tgz#601caf5f576fc0c66986fbe8a9aa37307a3a3ea3"
+  integrity sha512-sURozIOdCtGg9ap18erQ+ijndAfEGtTaetxfU3H4qwC18Bi+fdvjlY/ahKbuu0ASs7R/+WKCP7UaRZOjUDMcdQ==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.0.0"
 
-jss-global@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2"
+jss-plugin-global@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.0.tgz#0fed1b6461e0d57d6e394f877529009bc1cb3cb6"
+  integrity sha512-80ofWKSQUo62bxLtRoTNe0kFPtHgUbAJeOeR36WEGgWIBEsXLyXOnD5KNnjPqG4heuEkz9eSLccjYST50JnI7Q==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.0.0"
 
-jss-nested@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca"
+jss-plugin-nested@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.0.tgz#d37ecc013c3b0d0e4acc2b48f6b62da6ae53948b"
+  integrity sha512-waxxwl/po1hN3azTyixKnr8ReEqUv5WK7WsO+5AWB0bFndML5Yqnt8ARZ90HEg8/P6WlqE/AB2413TkCRZE8bA==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.0.0"
+    tiny-warning "^1.0.2"
+
+jss-plugin-props-sort@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0.tgz#38a13407384c2a4a7c026659488350669b953b18"
+  integrity sha512-41mf22CImjwNdtOG3r+cdC8+RhwNm616sjHx5YlqTwtSJLyLFinbQC/a4PIFk8xqf1qpFH1kEAIw+yx9HaqZ3g==
   dependencies:
-    warning "^3.0.0"
+    "@babel/runtime" "^7.3.1"
+    jss "10.0.0"
 
-jss-props-sort@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323"
+jss-plugin-rule-value-function@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0.tgz#3ec1b781b7c86080136dbef6c36e91f20244b72e"
+  integrity sha512-Jw+BZ8JIw1f12V0SERqGlBT1JEPWax3vuZpMym54NAXpPb7R1LYHiCTIlaJUyqvIfEy3kiHMtgI+r2whGgRIxQ==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.0.0"
 
-jss-vendor-prefixer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71"
+jss-plugin-vendor-prefixer@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0.tgz#400280535b0f483a9c78105afe4eee61b70018eb"
+  integrity sha512-qslqvL0MUbWuzXJWdUxpj6mdNUX8jr4FFTo3aZnAT65nmzWL7g8oTr9ZxmTXXgdp7ANhS1QWE7036/Q2isFBpw==
   dependencies:
-    css-vendor "^0.3.8"
+    "@babel/runtime" "^7.3.1"
+    css-vendor "^2.0.6"
+    jss "10.0.0"
 
-jss@^9.8.7:
-  version "9.8.7"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05"
-  integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==
+jss@10.0.0, jss@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.0.0.tgz#998d5026c02accae15708de83bd6ba57bac977d2"
+  integrity sha512-TPpDFsiBjuERiL+dFDq8QCdiF9oDasPcNqCKLGCo/qED3fNYOQ8PX2lZhknyTiAt3tZrfOFbb0lbQ9lTjPZxsQ==
   dependencies:
+    "@babel/runtime" "^7.3.1"
+    csstype "^2.6.5"
     is-in-browser "^1.1.3"
-    symbol-observable "^1.1.0"
-    warning "^3.0.0"
+    tiny-warning "^1.0.2"
 
-jwa@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
   dependencies:
     buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.10"
+    ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
 jws@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
   dependencies:
-    jwa "^1.1.5"
+    jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-keycode@^2.1.9:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-
 killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kleur@^2.0.1:
   version "2.0.2"
@@ -6137,12 +6497,14 @@ kleur@^2.0.1:
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
     invert-kv "^2.0.0"
 
@@ -6177,6 +6539,7 @@ lerna@3.13.1:
 less-loader@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
@@ -6185,6 +6548,7 @@ less-loader@4.1.0:
 less@3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
+  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
   dependencies:
     clone "^2.1.2"
   optionalDependencies:
@@ -6221,9 +6585,9 @@ libnpmaccess@^3.0.1:
     npm-registry-fetch "^4.0.0"
 
 libnpmpublish@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.2.tgz#4201cfc4a69c44e6f454ec548fa1cd90f10df0a0"
-  integrity sha512-2yIwaXrhTTcF7bkJKIKmaCV9wZOALf/gsTDxVSu/Gu/6wiG3fA8ce8YKstiWKTxSFNC0R7isPUb6tXTVFZHt2g==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.3.tgz#e3782796722d79eef1a0a22944c117e0c4ca4280"
+  integrity sha512-/3LsYqVc52cHXBmu26+J8Ed7sLs/hgGVFMH1mwYpL7Qaynb9RenpKqIKu0sJ130FB9PMkpMlWjlbtU8A4m7CQw==
   dependencies:
     aproba "^2.0.0"
     figgy-pudding "^3.5.1"
@@ -6242,7 +6606,8 @@ lightercollective@^0.1.0:
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6261,12 +6626,14 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
 loader-utils@0.2.16:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
+  integrity sha1-8IYyBm7YKCg13/iN+1JwR2Wt7m0=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -6276,6 +6643,7 @@ loader-utils@0.2.16:
 loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -6283,16 +6651,18 @@ loader-utils@^0.2.16:
     object-assign "^4.0.1"
 
 loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
   dependencies:
-    big.js "^3.1.3"
+    big.js "^5.2.2"
     emojis-list "^2.0.0"
-    json5 "^0.5.0"
+    json5 "^1.0.1"
 
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -6300,6 +6670,7 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -6312,18 +6683,17 @@ lodash._reinterpolate@^3.0.0:
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.get@^4.4.2:
   version "4.4.2"
@@ -6333,14 +6703,17 @@ lodash.get@^4.4.2:
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
 
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
 
 lodash.ismatch@^4.4.0:
   version "4.4.0"
@@ -6350,22 +6723,27 @@ lodash.ismatch@^4.4.0:
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
 lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
 lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
 lodash.set@^4.3.2:
   version "4.3.2"
@@ -6380,6 +6758,7 @@ lodash.sortby@^4.7.0:
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.5.0"
@@ -6401,28 +6780,27 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-
-lodash@^4.17.15, lodash@^4.2.1:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
+  integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -6430,10 +6808,12 @@ loud-rejection@^1.0.0:
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
 lru-cache@^4.0.1, lru-cache@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -6453,9 +6833,18 @@ macos-release@^2.2.0:
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@1.x:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -6479,15 +6868,15 @@ make-fetch-happen@^4.0.2:
     ssri "^6.0.0"
 
 make-fetch-happen@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d"
-  integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
+  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
   dependencies:
     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.1"
+    https-proxy-agent "^2.2.3"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     node-fetch-npm "^2.0.2"
@@ -6503,18 +6892,21 @@ makeerror@1.0.x:
     tmpl "1.0.x"
 
 map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
   dependencies:
     p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
@@ -6524,6 +6916,7 @@ map-obj@^2.0.0:
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
@@ -6538,34 +6931,40 @@ math-random@^1.0.1:
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -6573,6 +6972,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
 meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -6600,9 +7000,25 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
+meow@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
+  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+    yargs-parser "^10.0.0"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-stream@^1.0.1:
   version "1.0.1"
@@ -6612,9 +7028,9 @@ merge-stream@^1.0.1:
     readable-stream "^2.0.1"
 
 merge2@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
-  integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
 merge@^1.2.0:
   version "1.2.1"
@@ -6624,6 +7040,7 @@ merge@^1.2.0:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^2.3.11:
   version "2.3.11"
@@ -6647,6 +7064,7 @@ micromatch@^2.3.11:
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6665,37 +7083,39 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, mic
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+mime-db@1.42.0, "mime-db@>= 1.40.0 < 2":
+  version "1.42.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
+  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.25"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
+  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
   dependencies:
-    mime-db "~1.36.0"
-
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+    mime-db "1.42.0"
 
-mime@^1.4.1, mime@^1.6.0:
+mime@1.6.0, mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.0.3, mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
+  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.1.0:
+mimic-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -6703,14 +7123,17 @@ mimic-fn@^2.1.0:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -6724,48 +7147,38 @@ minimist-options@^3.0.1:
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.9.0"
 
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -6781,6 +7194,7 @@ mississippi@^2.0.0:
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -6794,8 +7208,9 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -6803,13 +7218,15 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.x, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
@@ -6826,6 +7243,7 @@ moment@^2.10.2:
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -6837,23 +7255,27 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0:
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
@@ -6868,18 +7290,25 @@ multimatch@^2.1.0:
     arrify "^1.0.0"
     minimatch "^3.0.0"
 
-mute-stream@0.0.8, mute-stream@~0.0.4:
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.10.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+nan@^2.10.0, nan@^2.12.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6899,22 +7328,20 @@ natural-compare@^1.4.0:
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
   dependencies:
-    debug "^2.1.2"
+    debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.6.0:
+neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -6922,10 +7349,12 @@ neo-async@^2.6.0:
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
   dependencies:
     lower-case "^1.1.1"
 
@@ -6938,25 +7367,20 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-fetch@^2.3.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+node-forge@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
+  integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -6994,8 +7418,9 @@ node-int64@^0.4.0:
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -7004,10 +7429,10 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
-    path-browserify "0.0.0"
+    path-browserify "0.0.1"
     process "^0.11.10"
     punycode "^1.2.4"
     querystring-es3 "^0.2.0"
@@ -7018,22 +7443,24 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
 
 node-notifier@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.3.0.tgz#c77a4a7b84038733d5fb351aafd8a268bfe19a01"
-  integrity sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
   dependencies:
     growly "^1.3.0"
+    is-wsl "^1.1.0"
     semver "^5.5.0"
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -7046,15 +7473,17 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11:
-  version "1.0.0-alpha.12"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
+node-releases@^1.1.38:
+  version "1.1.40"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a"
+  integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==
   dependencies:
-    semver "^5.3.0"
+    semver "^6.3.0"
 
 node-sass@4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -7079,17 +7508,19 @@ node-sass@4.9.3:
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7099,42 +7530,47 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-scroll-left@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.1.2.tgz#6b79691ba79eb5fb107fa5edfbdc06b55caee2aa"
+normalize-scroll-left@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz#9445d74275f303cc661e113329aefa492f58114c"
+  integrity sha512-t5oCENZJl8TGusJKoCJm7+asaSsPuNmK6+iEjrZ5TyBj2f02brCRsd4c83hwtu+e5d4LCSBZ0uoDlMjBo+A8yA==
 
 normalize-url@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-notistack@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/notistack/-/notistack-0.4.1.tgz#1f1367a0f4d9542641aed300dd332985a1d0047a"
-  integrity sha512-o+cU7jGZW6fKtW0LRD9jHloC1h4heRgG0BIaWeWZ2nvZLbQVGKrpYmZmvdwATjUzu+bdMW+O3yaOrYTKHBL9hA==
+notistack@0.9.6:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-0.9.6.tgz#a9b2589e2379096eac292139306f486d4ed5697a"
+  integrity sha512-vo1zOwhQBxwWiMxwVjeSDXNzJuaM/nfkayv4uRo+9ON9CAtaPSNt15QHeELKkbOSLH29fb7zmoZl4AlkCqhGsA==
+  dependencies:
+    classnames "^2.2.6"
+    hoist-non-react-statics "^3.3.0"
+    prop-types "^15.7.2"
+    react-is "^16.8.6"
 
 npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
 npm-lifecycle@^2.1.0:
   version "2.1.1"
@@ -7150,35 +7586,41 @@ npm-lifecycle@^2.1.0:
     umask "^1.1.0"
     which "^1.3.1"
 
+npm-normalize-package-bin@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
 "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
   dependencies:
-    hosted-git-info "^2.6.0"
+    hosted-git-info "^2.7.1"
     osenv "^0.1.5"
-    semver "^5.5.0"
+    semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
 npm-packlist@^1.1.12, npm-packlist@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
-  integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
+  integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
 npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4"
+  integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
-  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
+npm-pick-manifest@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
@@ -7197,9 +7639,9 @@ npm-registry-fetch@^3.9.0:
     npm-package-arg "^6.1.0"
 
 npm-registry-fetch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#5ef75845b605855c7964472542c25da172af8677"
-  integrity sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz#2b1434f93ccbe6b6385f8e45f45db93e16921d7a"
+  integrity sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -7207,16 +7649,19 @@ npm-registry-fetch@^4.0.0:
     lru-cache "^5.1.1"
     make-fetch-happen "^5.0.0"
     npm-package-arg "^6.1.0"
+    safe-buffer "^5.2.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -7224,57 +7669,87 @@ npm-run-path@^2.0.0:
     set-blocking "~2.0.0"
 
 nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
-  integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
 oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+object-inspect@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-is@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -7290,12 +7765,14 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 octokit-pagination-methods@^1.1.0:
   version "1.1.0"
@@ -7305,25 +7782,28 @@ octokit-pagination-methods@^1.1.0:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
-    mimic-fn "^2.1.0"
+    mimic-fn "^1.0.0"
 
 opener@~1.4.0:
   version "1.4.3"
@@ -7331,8 +7811,9 @@ opener@~1.4.0:
   integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
 
 opn@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7345,16 +7826,16 @@ optimist@0.6.x, optimist@^0.6.1:
     wordwrap "~0.0.2"
 
 optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
 original@^1.0.0:
   version "1.0.2"
@@ -7366,35 +7847,30 @@ original@^1.0.0:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+os-locale@^3.0.0, os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-name@^3.0.0:
+os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
   integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
@@ -7405,10 +7881,12 @@ os-name@^3.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7416,36 +7894,43 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
@@ -7459,6 +7944,7 @@ p-map-series@^1.0.0:
 p-map@^1.1.1, p-map@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-pipe@^1.2.0:
   version "1.2.0"
@@ -7473,10 +7959,12 @@ p-reduce@^1.0.0:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 p-waterfall@^1.0.0:
   version "1.0.0"
@@ -7486,12 +7974,13 @@ p-waterfall@^1.0.0:
     p-reduce "^1.0.0"
 
 pacote@^9.5.0:
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.5.tgz#63355a393614c3424e735820c3731e2cbbedaeeb"
-  integrity sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==
+  version "9.5.11"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.11.tgz#524152077cb392c47b1fbe198aa28f778bef7ee1"
+  integrity sha512-DMDPvFKCjCg6zMS4IfzZyvT57O/bX8XGG00eEoy4K/S4Wj+qiN8KbnmKpsTvfS6OL9r5TAicxMKWbj1yV2Yh4g==
   dependencies:
     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"
@@ -7503,9 +7992,10 @@ pacote@^9.5.0:
     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 "^2.2.3"
+    npm-pick-manifest "^3.0.0"
     npm-registry-fetch "^4.0.0"
     osenv "^0.1.5"
     promise-inflight "^1.0.1"
@@ -7515,37 +8005,42 @@ pacote@^9.5.0:
     safe-buffer "^5.1.2"
     semver "^5.6.0"
     ssri "^6.0.1"
-    tar "^4.4.8"
+    tar "^4.4.10"
     unique-filename "^1.1.1"
     which "^1.3.1"
 
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    cyclist "~0.2.2"
+    cyclist "^1.0.1"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
 param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
   dependencies:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
@@ -7565,12 +8060,14 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -7603,61 +8100,74 @@ parse5@4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
   dependencies:
     isarray "0.0.1"
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -7666,12 +8176,14 @@ path-type@^1.0.0:
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7682,34 +8194,46 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
@@ -7719,40 +8243,36 @@ pn@^1.1.0:
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 popper.js@^1.14.1:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
-
-portfinder@^1.0.13:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz#2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3"
+  integrity sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==
 
-portfinder@^1.0.9:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+portfinder@^1.0.13, portfinder@^1.0.9:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
   dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
+  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
   dependencies:
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
 
 postcss-loader@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
     loader-utils "^1.1.0"
     postcss "^7.0.0"
@@ -7760,14 +8280,16 @@ postcss-loader@3.0.0:
     schema-utils "^1.0.0"
 
 postcss-modules-extract-imports@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
+  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
   dependencies:
     postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -7775,6 +8297,7 @@ postcss-modules-local-by-default@^1.2.0:
 postcss-modules-scope@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -7782,29 +8305,33 @@ postcss-modules-scope@^1.1.0:
 postcss-modules-values@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
 postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss@^6.0.1, postcss@^6.0.23:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
 postcss@^7.0.0, postcss@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.4.tgz#b5a059597d2c1a8a9916cb6efb0b294f70b4f309"
+  version "7.0.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
   dependencies:
-    chalk "^2.4.1"
+    chalk "^2.4.2"
     source-map "^0.6.1"
-    supports-color "^5.5.0"
+    supports-color "^6.1.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -7819,6 +8346,7 @@ preserve@^0.2.0:
 pretty-error@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+  integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
@@ -7834,18 +8362,22 @@ pretty-format@^23.6.0:
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
@@ -7858,6 +8390,7 @@ promise-retry@^1.1.1:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
@@ -7876,14 +8409,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@15.6.2, prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  dependencies:
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prop-types@^15.5.8:
+prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7909,43 +8435,45 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-proxy-addr@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
+    ipaddr.js "1.9.0"
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-
-psl@^1.1.28:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+psl@^1.1.24, psl@^1.1.28:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"
+  integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7953,6 +8481,7 @@ pump@^2.0.0, pump@^2.0.1:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7960,6 +8489,7 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -7968,23 +8498,27 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@~2.3.3:
   version "2.3.3"
@@ -7994,18 +8528,22 @@ qs@~2.3.3:
 qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+querystringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -8022,34 +8560,39 @@ randomatic@^3.0.0:
     math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+range-parser@^1.0.3, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
   dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     unpipe "1.0.0"
 
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -8064,40 +8607,25 @@ react-chartjs-2@2.7.6:
     lodash "^4.17.4"
     prop-types "^15.5.8"
 
-react-dom@16.5.2:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
+react-dom@16.11.0:
+  version "16.11.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5"
+  integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    schedule "^0.5.0"
+    scheduler "^0.17.0"
 
-react-event-listener@^0.6.2:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.4.tgz#d0ea5ed897da1a796616c44b5a8758898140f203"
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    prop-types "^15.6.0"
-    warning "^4.0.1"
-
-react-is@^16.3.2, react-is@^16.6.3:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa"
-  integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==
-
-react-is@^16.8.1:
-  version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
-  integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
-
-react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
+  version "16.11.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
+  integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
 
 react-router-dom@4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
+  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
   dependencies:
     history "^4.7.2"
     invariant "^2.2.4"
@@ -8109,6 +8637,7 @@ react-router-dom@4.3.1:
 react-router@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
+  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
   dependencies:
     history "^4.7.2"
     hoist-non-react-statics "^2.5.0"
@@ -8118,50 +8647,41 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-transition-group@2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.3.tgz#26de363cab19e5c88ae5dbae105c706cf953bb92"
-  integrity sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==
-  dependencies:
-    dom-helpers "^3.3.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
-
-react-transition-group@^2.2.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.0.tgz#70bca0e3546102c4dc5cf3f5f57f73447cce6874"
+react-transition-group@4.3.0, react-transition-group@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
+  integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
   dependencies:
-    dom-helpers "^3.3.1"
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
 
-react@16.5.2:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
+react@16.11.0:
+  version "16.11.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb"
+  integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    schedule "^0.5.0"
 
 read-cmd-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
-  integrity sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
+  integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
   dependencies:
     graceful-fs "^4.1.2"
 
 "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
-  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1"
+  integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
     normalize-package-data "^2.0.0"
-    slash "^1.0.0"
+    npm-normalize-package-bin "^1.0.0"
   optionalDependencies:
     graceful-fs "^4.1.2"
 
@@ -8177,6 +8697,7 @@ read-package-tree@^5.1.6:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -8192,6 +8713,7 @@ read-pkg-up@^3.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -8213,9 +8735,10 @@ read@1, read@~1.0.1:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8225,16 +8748,7 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-"readable-stream@2 || 3", readable-stream@^3.0.2:
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
   integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
@@ -8243,15 +8757,6 @@ readable-stream@1.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdir-scoped-modules@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
@@ -8262,35 +8767,26 @@ readdir-scoped-modules@^1.0.0:
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
-readdirp@^2.0.0:
+readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
 realpath-native@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
-  integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
   dependencies:
     util.promisify "^1.0.0"
 
-"recompose@0.28.0 - 0.30.0":
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^2.3.1"
-    react-lifecycles-compat "^3.0.2"
-    symbol-observable "^1.0.4"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -8308,27 +8804,32 @@ reflect-metadata@^0.1.12:
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+regenerate-unicode-properties@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
+  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
   dependencies:
     regenerate "^1.4.0"
 
 regenerate@^1.2.1, regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-
-regenerator-transform@^0.13.3:
+regenerator-runtime@^0.13.2:
   version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
+  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+
+regenerator-transform@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
+  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
   dependencies:
     private "^0.1.6"
 
@@ -8342,100 +8843,121 @@ regex-cache@^0.4.2:
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  dependencies:
+    define-properties "^1.1.2"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
+regexpu-core@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
-    regjsgen "^0.4.0"
-    regjsparser "^0.3.0"
+    regenerate-unicode-properties "^8.1.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
-regjsgen@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+regjsgen@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
   dependencies:
     jsesc "~0.5.0"
 
 relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 renderkid@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+  integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
   dependencies:
     css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
+    dom-converter "^0.2"
+    htmlparser2 "^3.3.0"
     strip-ansi "^3.0.0"
-    utila "~0.3"
+    utila "^0.4.0"
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
-request-promise-core@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
-  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.13.1"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
-  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.1"
-    stealthy-require "^1.1.0"
-    tough-cookie ">=2.3.3"
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
 
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -8461,6 +8983,7 @@ request@2.87.0:
 request@^2.83.0, request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -8486,32 +9009,34 @@ request@^2.83.0, request@^2.87.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 requirejs-webpack-plugin@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/requirejs-webpack-plugin/-/requirejs-webpack-plugin-1.0.5.tgz#3bded42b2a9809898579019d6570732670416259"
+  integrity sha1-O97UKyqYCYmFeQGdZXBzJnBBYlk=
   dependencies:
     mkdirp "^0.5.1"
 
 requirejs@2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
+  integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
@@ -8526,78 +9051,71 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-pathname@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
+resolve-pathname@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
+  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@1.x:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
-  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.10.0:
+resolve@1.x, resolve@^1.10.0, resolve@^1.3.2:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.3.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
-    onetime "^5.1.0"
+    onetime "^2.0.0"
     signal-exit "^3.0.2"
 
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rimraf@2, rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -8617,33 +9135,38 @@ run-async@^2.2.0:
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@^6.4.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^2.0.0:
   version "2.5.2"
@@ -8664,6 +9187,7 @@ sane@^2.0.0:
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -8673,6 +9197,7 @@ sass-graph@^2.2.4:
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
   dependencies:
     clone-deep "^2.0.1"
     loader-utils "^1.0.1"
@@ -8684,16 +9209,20 @@ sass-loader@7.1.0:
 sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-schedule@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8"
+scheduler@^0.17.0:
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe"
+  integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==
   dependencies:
+    loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
 schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -8701,6 +9230,7 @@ schema-utils@^0.4.4, schema-utils@^0.4.5:
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
     ajv "^6.1.0"
     ajv-errors "^1.0.0"
@@ -8709,6 +9239,7 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -8716,28 +9247,21 @@ scss-tokenizer@^0.2.3:
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
+  integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==
   dependencies:
-    node-forge "0.7.5"
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+    node-forge "0.9.0"
 
-"semver@2.x || 3.x || 4 || 5", semver@^5.5.1:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^5.5, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-semver@^6.0.0:
+semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8745,10 +9269,12 @@ semver@^6.0.0:
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -8757,20 +9283,22 @@ send@0.16.2:
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
     on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
 
-serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
 
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -8780,52 +9308,50 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.4, setimmediate@^1.0.5:
+setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
-  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -8833,6 +9359,7 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^5.0.0"
@@ -8841,12 +9368,14 @@ shallow-clone@^1.0.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shellwords@^0.1.1:
   version "0.1.1"
@@ -8856,6 +9385,7 @@ shellwords@^0.1.1:
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 sisteransi@^0.1.1:
   version "0.1.1"
@@ -8865,24 +9395,27 @@ sisteransi@^0.1.1:
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
 slide@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
-smart-buffer@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
-  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -8891,12 +9424,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -8922,6 +9457,7 @@ sockjs-client@1.3.0:
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
@@ -8935,12 +9471,12 @@ socks-proxy-agent@^4.0.0:
     socks "~2.3.2"
 
 socks@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
-  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
   dependencies:
-    ip "^1.1.5"
-    smart-buffer "4.0.2"
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
 
 sort-keys@^2.0.0:
   version "2.0.0"
@@ -8950,12 +9486,14 @@ sort-keys@^2.0.0:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -8970,10 +9508,10 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.6, source-map-support@~0.5.6:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+source-map-support@^0.5.6, source-map-support@~0.5.10, source-map-support@~0.5.12:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8981,42 +9519,50 @@ source-map-support@^0.5.6, source-map-support@~0.5.6:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 spdx-correct@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
+  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -9031,9 +9577,9 @@ spdy-transport@^3.0.0:
     wbuf "^1.7.3"
 
 spdy@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
-  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
+  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
   dependencies:
     debug "^4.1.0"
     handle-thing "^2.0.0"
@@ -9044,6 +9590,7 @@ spdy@^4.0.0:
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
@@ -9064,31 +9611,34 @@ split@^1.0.0:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     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@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -9100,32 +9650,32 @@ stack-utils@^1.0.1:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
-stealthy-require@^1.1.0:
+stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -9133,6 +9683,7 @@ stream-browserify@^2.0.1:
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -9140,6 +9691,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -9150,6 +9702,7 @@ stream-http@^2.7.2:
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 string-length@^2.0.0:
   version "2.0.0"
@@ -9162,57 +9715,65 @@ string-length@^2.0.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
-  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+string.prototype.trimleft@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
   dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^5.2.0"
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+string.prototype.trimright@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
   dependencies:
-    safe-buffer "~5.1.0"
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
 
-string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
-    safe-buffer "~5.1.0"
+    safe-buffer "~5.2.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -9227,16 +9788,19 @@ strip-bom@3.0.0, strip-bom@^3.0.0:
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
@@ -9248,6 +9812,7 @@ strip-indent@^2.0.0:
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 strong-log-transformer@^2.0.0:
   version "2.1.0"
@@ -9261,6 +9826,7 @@ strong-log-transformer@^2.0.0:
 style-loader@0.23.0:
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
+  integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
@@ -9268,6 +9834,7 @@ style-loader@0.23.0:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.2:
   version "3.2.3"
@@ -9279,54 +9846,44 @@ supports-color@^3.1.2:
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
-
-symbol-observable@^1.0.4, symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
 
 symbol-tree@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
     block-stream "*"
-    fstream "^1.0.2"
+    fstream "^1.0.12"
     inherits "2"
 
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-tar@^4.4.8:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+tar@^4, tar@^4.4.10, tar@^4.4.8:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.5"
+    minipass "^2.8.6"
     minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
@@ -9349,7 +9906,7 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-terser-webpack-plugin@1.2.1, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
   integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
@@ -9363,14 +9920,38 @@ terser-webpack-plugin@1.2.1, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser-webpack-plugin@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
+  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.7.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
 terser@^3.8.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz#cc4764014af570bc79c79742358bd46926018a32"
-  integrity sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
   dependencies:
-    commander "~2.17.1"
+    commander "^2.19.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.6"
+    source-map-support "~0.5.10"
+
+terser@^4.1.2:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3"
+  integrity sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
 
 test-exclude@^4.2.1:
   version "4.2.3"
@@ -9383,24 +9964,17 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6"
-  integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==
+text-extensions@^1.0.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
+  integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through2@^2.0.2:
+through2@^2.0.0, through2@^2.0.2:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -9421,15 +9995,27 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunky@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
 timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-invariant@^1.0.2:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz#b3f9b38835e36a41c843a3b0907a5a7b3755de73"
+  integrity sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA==
+
+tiny-warning@^1.0.0, tiny-warning@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
+  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -9445,6 +10031,7 @@ tmpl@1.0.x:
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
@@ -9454,16 +10041,19 @@ to-fast-properties@^1.0.3:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9471,26 +10061,24 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 toposort@^1.0.0:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@>=2.3.3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.0.tgz#d2bceddebde633153ff20a52fa844a0dc71dacef"
-  integrity sha512-LHMvg+RBP/mAVNqVbOX8t+iJ+tqhBA/t49DuI7+IDAWHrASnesqSu1vWbKB7UrE2yk+HMFUBMadRGMkB4VCfog==
-  dependencies:
-    ip-regex "^3.0.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@^2.3.4:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -9501,12 +10089,14 @@ tough-cookie@^2.3.4:
 tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -9521,6 +10111,7 @@ tr46@^1.0.1:
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
@@ -9535,10 +10126,12 @@ trim-off-newlines@^1.0.0:
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
@@ -9560,6 +10153,7 @@ ts-jest@23.10.5:
 ts-loader@5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.2.1.tgz#e6815c631dcafc24319ce8be6f8af94908749cf3"
+  integrity sha512-KC0cOvsFVyxBlg5h9jvaMlIL2tNsyQLvT2/OvIlO0AMUBJ4iXTtOfaDEqvmqv2lM/icekQfDsP2PsYBCDHpuOQ==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -9573,8 +10167,9 @@ tslib@1.9.0:
   integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
 tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tslint-config-airbnb-base@0.2.0:
   version "0.2.0"
@@ -9599,11 +10194,11 @@ tslint-config-prettier@1.17.0:
   integrity sha512-NKWNkThwqE4Snn4Cm6SZB7lV5RMDDFsBwz6fWUkTxOKGjMx8ycOHnjIbhn7dZd5XmssW3CwqUjlANR6EhP9YQw==
 
 tslint-consistent-codestyle@^1.13.2, tslint-consistent-codestyle@^1.14.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.15.0.tgz#a3acf8d0a3ca0dc7d1285705102ba1fe4a17c4cb"
-  integrity sha512-6BNDBbZh2K0ibRXe70Mkl9gfVttxQ3t3hqV1BRDfpIcjrUoOgD946iH4SrXp+IggDgeMs3dJORjD5tqL5j4jXg==
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
+  integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
   dependencies:
-    "@fimbul/bifrost" "^0.17.0"
+    "@fimbul/bifrost" "^0.21.0"
     tslib "^1.7.1"
     tsutils "^2.29.0"
 
@@ -9682,25 +10277,28 @@ tsutils@^2.13.1, tsutils@^2.27.2, tsutils@^2.29.0:
     tslib "^1.8.1"
 
 tsutils@^3.0.0, tsutils@^3.5.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.7.0.tgz#f97bdd2f109070bd1865467183e015b25734b477"
-  integrity sha512-n+e+3q7Jx2kfZw7tjfI9axEIWBY0sFMOlC+1K70X0SeXpO/UYSB+PN+E9tIJNqViB7oiXQdqD7dNchnvoneZew==
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
@@ -9709,43 +10307,47 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-fest@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2"
-  integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==
-
-type-is@~1.6.15, type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
+typescript@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
+  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
 
 typings-for-css-modules-loader@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/typings-for-css-modules-loader/-/typings-for-css-modules-loader-1.7.0.tgz#a9b5c5a0e19b719d616edfc72855ab47dedd00ae"
+  integrity sha512-Mp7zDrcUmbUKl3JTLamTsMX+lntMotEm5I05j2RHB5EHb0WL1dAXlynpdlGR5Ye/QTvtL5w+RGB2jP32YoUpZw==
   dependencies:
     colour "0.7.1"
     graceful-fs "4.1.4"
     loader-utils "0.2.16"
 
-ua-parser-js@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
 
-uglify-js@3.4.x, uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+uglify-js@^3.1.4:
+  version "3.6.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.9.tgz#85d353edb6ddfb62a9d798f36e91792249320611"
+  integrity sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
 uid-number@0.0.6:
@@ -9761,30 +10363,35 @@ umask@^1.1.0:
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
   dependencies:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+unicode-match-property-value-ecmascript@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
+  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
 
 unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
+  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 union@~0.4.3:
   version "0.4.6"
@@ -9796,21 +10403,23 @@ union@~0.4.3:
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
-universal-user-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9"
-  integrity sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==
+universal-user-agent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.0.tgz#27da2ec87e32769619f68a14996465ea1cb9df16"
+  integrity sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==
   dependencies:
-    os-name "^3.0.0"
+    os-name "^3.1.0"
 
 universalify@^0.1.0:
   version "0.1.2"
@@ -9820,31 +10429,37 @@ universalify@^0.1.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-join@^2.0.5:
   version "2.0.5"
@@ -9861,20 +10476,17 @@ url-loader@1.1.2:
     schema-utils "^1.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
   dependencies:
-    querystringify "^2.0.0"
+    querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-url-template@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -9882,10 +10494,12 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-promisify@^2.1.0:
   version "2.1.0"
@@ -9897,6 +10511,7 @@ util-promisify@^2.1.0:
 util.promisify@1.0.0, util.promisify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
@@ -9904,38 +10519,41 @@ util.promisify@1.0.0, util.promisify@^1.0.0:
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-
-utila@~0.4:
+utila@^0.4.0, utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
 v8-compile-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
+  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -9947,27 +10565,29 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-value-equal@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
+value-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
+  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  dependencies:
-    indexof "0.0.1"
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -9983,15 +10603,10 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  dependencies:
-    loose-envify "^1.0.0"
-
 warning@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
   dependencies:
     loose-envify "^1.0.0"
 
@@ -10006,6 +10621,7 @@ watch@~0.18.0:
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -10014,6 +10630,7 @@ watchpack@^1.5.0:
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
@@ -10051,6 +10668,7 @@ webpack-cli@3.2.1:
 webpack-dev-middleware@3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"
@@ -10096,13 +10714,15 @@ webpack-dev-server@3.1.14:
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -10138,15 +10758,18 @@ webpack@4.28.4:
     webpack-sources "^1.3.0"
 
 websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
   dependencies:
-    http-parser-js ">=0.4.0"
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
@@ -10155,10 +10778,6 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@>=0.10.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
@@ -10174,9 +10793,9 @@ whatwg-url@^6.4.1:
     webidl-conversions "^4.0.2"
 
 whatwg-url@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
-  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -10185,20 +10804,24 @@ whatwg-url@^7.0.0:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
@@ -10209,25 +10832,27 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+worker-farm@^1.5.2, worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
   dependencies:
     errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -10235,8 +10860,9 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
   integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
@@ -10245,15 +10871,6 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
 write-json-file@^2.2.0, write-json-file@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
@@ -10281,9 +10898,17 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-x2js@*, x2js@3.2.3:
+x2js@*:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/x2js/-/x2js-3.3.1.tgz#185d0cb19511d150f38db87d02da7e34b07aa49e"
+  integrity sha512-UruP3F9pgFlGbgm/8i28AiNSLN4jlcu8GMBbzuqLqAzV3O49WQDtmJeLefYy8hmBnTEtQEUvPQG8EDFCDDyP6g==
+  dependencies:
+    xmldom "^0.1.19"
+
+x2js@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/x2js/-/x2js-3.2.3.tgz#b59c0c5f18d36c7391b8a1db068e2bc10132c960"
+  integrity sha512-LJNWWp+WFOdsrp2nfTuC6+erPjZSNfeHsrdWPGpesj5g0gj2WwsedsqbN33wZWf/3loQA0jIR58jrx5Cyj7G/Q==
   dependencies:
     xmldom "^0.1.19"
 
@@ -10295,39 +10920,42 @@ xml-name-validator@^3.0.0:
 xmldom@^0.1.19:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-
-yallist@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yargs-parser@10.x, yargs-parser@^10.1.0:
+yargs-parser@10.x, yargs-parser@^10.0.0, yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
@@ -10342,6 +10970,7 @@ yargs-parser@^11.1.1:
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
@@ -10355,6 +10984,7 @@ yargs-parser@^9.0.2:
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
     decamelize "^2.0.0"
@@ -10370,15 +11000,15 @@ yargs@12.0.2:
     yargs-parser "^10.1.0"
 
 yargs@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
     find-up "^2.1.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
@@ -10408,6 +11038,7 @@ yargs@^12.0.1, yargs@^12.0.4:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml
index 94fa46e75..185b4becb 100644
--- a/sdnr/wt/pom.xml
+++ b/sdnr/wt/pom.xml
@@ -21,28 +21,33 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-        <parent>
-                <groupId>org.onap.ccsdk.parent</groupId>
-                <artifactId>odlparent-lite</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-                <relativePath/>
-        </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>ccsdk-sdnr-wireless transport :: micro-services</name>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <description>SDN-R wireless transport micro-services</description>
 
     <modules>
-      <module>common</module>
-      <module>apigateway</module>
-      <module>devicemodel</module>
-      <module>websocketmanager2</module>
-      <module>helpserver</module>
-      <module>devicemanager</module>
-      <module>odlux</module>
-      <module>featureaggregator</module>
+        <module>common</module>
+        <module>apigateway</module>
+        <module>websocketmanager2</module>
+        <module>helpserver</module>
+        <module>data-provider</module>
+        <module>netconfnode-state-service</module>
+        <module>devicemanager</module>
+        <module>devicemanager-onf</module>
+        <module>devicemanager-oran</module>
+        <module>devicemanager-gran</module>
+        <module>odlux</module>
+        <module>featureaggregator</module>
     </modules>
 </project>
diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml
index 7e90d069d..25dff3427 100644
--- a/sdnr/wt/readthedocs/pom.xml
+++ b/sdnr/wt/readthedocs/pom.xml
@@ -1,86 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-readthedocs-installer</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-readthedocs-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-apigateway</application.name>
-    <include.transitive.dependencies>false</include.transitive.dependencies>
-  </properties>
-  <build>
-    <plugins>
-    	<plugin>
-			<artifactId>exec-maven-plugin</artifactId>
-			<groupId>org.codehaus.mojo</groupId>
-			<executions>
-				<execution><!-- Run our version calculation script -->
-						<id>generate readthedocs files from helpserver markdowns</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>convert.sh</executable>
-            			</configuration>
-					</execution>
-				</executions>
-			</plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <!-- here the phase you need -->
-            <!-- <phase>validate</phase> -->
-              <phase>prepare-package</phase>
-          <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/assembly/docs/</outputDirectory>
-              <resources>          
-                <resource>
-                  <directory>../../../docs/</directory>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>              
-            </configuration>            
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <properties>
+        <application.name>sdnr-wt-apigateway</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <executions>
+                    <execution><!-- Run our version calculation script -->
+                        <id>generate readthedocs files from helpserver markdowns</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>convert.sh</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <!-- here the phase you need -->
+                        <!-- <phase>validate</phase> -->
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly/docs/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../../docs/</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml
index e86a46814..c0023aa0b 100644
--- a/sdnr/wt/websocketmanager2/feature/pom.xml
+++ b/sdnr/wt/websocketmanager2/feature/pom.xml
@@ -22,44 +22,43 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-websocketmanager2-feature</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-websocketmanager2-feature</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-  <dependencyManagement>
+    <name>ccsdk-features :: ${project.artifactId}</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-      
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-websocketmanager2-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-websocketmanager2-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml
index e363be323..b17065a89 100755
--- a/sdnr/wt/websocketmanager2/installer/pom.xml
+++ b/sdnr/wt/websocketmanager2/installer/pom.xml
@@ -22,111 +22,112 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-websocketmanager2-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-websocketmanager2-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-websocketmanager2</application.name>
-    <include.transitive.dependencies>false</include.transitive.dependencies>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-feature</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <properties>
+        <application.name>sdnr-wt-websocketmanager2</application.name>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-<!--           <execution> -->
-<!--             <id>copy-dependencies</id> -->
-<!--             <goals> -->
-<!--               <goal>copy-dependencies</goal> -->
-<!--             </goals> -->
-<!--             <phase>prepare-package</phase> -->
-<!--             <configuration> -->
-<!--               <transitive>false</transitive> -->
-<!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-<!--               <overWriteReleases>false</overWriteReleases> -->
-<!--               <overWriteSnapshots>true</overWriteSnapshots> -->
-<!--               <overWriteIfNewer>true</overWriteIfNewer> -->
-<!--               <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--               <addParentPoms>false</addParentPoms> -->
-<!--               <copyPom>false</copyPom> -->
-<!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
-<!--               <scope>provided</scope> -->
-<!--             </configuration> -->
-<!--           </execution> -->
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!--           <execution> -->
+                    <!--             <id>copy-dependencies</id> -->
+                    <!--             <goals> -->
+                    <!--               <goal>copy-dependencies</goal> -->
+                    <!--             </goals> -->
+                    <!--             <phase>prepare-package</phase> -->
+                    <!--             <configuration> -->
+                    <!--               <transitive>false</transitive> -->
+                    <!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
+                    <!--               <overWriteReleases>false</overWriteReleases> -->
+                    <!--               <overWriteSnapshots>true</overWriteSnapshots> -->
+                    <!--               <overWriteIfNewer>true</overWriteIfNewer> -->
+                    <!--               <useRepositoryLayout>true</useRepositoryLayout> -->
+                    <!--               <addParentPoms>false</addParentPoms> -->
+                    <!--               <copyPom>false</copyPom> -->
+                    <!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
+                    <!--               <scope>provided</scope> -->
+                    <!--             </configuration> -->
+                    <!--           </execution> -->
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml
index fed8b2e54..2d04ad1bb 100644
--- a/sdnr/wt/websocketmanager2/model/pom.xml
+++ b/sdnr/wt/websocketmanager2/model/pom.xml
@@ -22,16 +22,19 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
 </project>
diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml
index f02ce1177..f6fec3c43 100755
--- a/sdnr/wt/websocketmanager2/pom.xml
+++ b/sdnr/wt/websocketmanager2/pom.xml
@@ -22,30 +22,30 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-    	<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-	<artifactId>sdnr-wt-websocketmanager2-top</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-websocketmanager2-top</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<properties>
-		<feature-name>sdnr-wt-websocketmanager2</feature-name>
-	</properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-	<modules>
-		<module>model</module>
-		<module>provider</module>
-		<module>feature</module>
-		<module>installer</module>
-	</modules>
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>feature</module>
+        <module>installer</module>
+    </modules>
 
+    <properties>
+        <feature-name>sdnr-wt-websocketmanager2</feature-name>
+    </properties>
 </project>
diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml
index 11d212f3f..894be09e9 100644
--- a/sdnr/wt/websocketmanager2/provider/pom.xml
+++ b/sdnr/wt/websocketmanager2/provider/pom.xml
@@ -11,116 +11,120 @@
     OF ANY KIND, either express or implied. See the License for the specific
     language governing permissions and limitations under the License. ============LICENSE_END========================================================= -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-websocketmanager2-provider</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-  <properties>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
-    <checkstyle.skip>true</checkstyle.skip>
-  </properties>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-<!--     <dependencyManagement> -->
-<!--         <dependencies> -->
-<!--             <dependency> -->
-<!--                 <groupId>org.opendaylight.controller</groupId> -->
-<!--                 <artifactId>mdsal-artifacts</artifactId> -->
-<!--                 <version>1.6.1</version> -->
-<!--                 <type>pom</type> -->
-<!--                 <scope>import</scope> -->
-<!--             </dependency> -->
-<!--         </dependencies> -->
-<!--     </dependencyManagement> -->
+    <modelVersion>4.0.0</modelVersion>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-websocketmanager2-provider</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>ccsdk-features :: ${project.artifactId}</name>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <checkstyle.skip>true</checkstyle.skip>
+    </properties>
+
+    <!--     <dependencyManagement> -->
+    <!--         <dependencies> -->
+    <!--             <dependency> -->
+    <!--                 <groupId>org.opendaylight.controller</groupId> -->
+    <!--                 <artifactId>mdsal-artifacts</artifactId> -->
+    <!--                 <version>1.6.1</version> -->
+    <!--                 <type>pom</type> -->
+    <!--                 <scope>import</scope> -->
+    <!--             </dependency> -->
+    <!--         </dependencies> -->
+    <!--     </dependencyManagement> -->
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-websocketmanager2-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
             <!-- <version>${netty.version}</version> -->
-    </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_2.12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_2.12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.java-websocket</groupId>
-      <artifactId>Java-WebSocket</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-actor_2.12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-cluster_2.12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
             <!-- <version>2.23.4</version> -->
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <scope>test</scope>
-    </dependency>
-<!--     <dependency> -->
-<!--       <groupId>org.eclipse.jetty.websocket</groupId> -->
-<!--       <artifactId>websocket-api</artifactId> -->
-<!--       <version>9.3.24.v20180605</version> -->
-<!--     </dependency> -->
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--     <dependency> -->
+        <!--       <groupId>org.eclipse.jetty.websocket</groupId> -->
+        <!--       <artifactId>websocket-api</artifactId> -->
+        <!--       <version>9.3.24.v20180605</version> -->
+        <!--     </dependency> -->
         <!-- To run websockets in embedded server -->
         <!-- <dependency> -->
         <!-- <groupId>org.eclipse.jetty.websocket</groupId> -->
@@ -133,18 +137,18 @@
         <!-- <version>9.3.24.v20180605</version> -->
         <!-- <scope>test</scope> -->
         <!-- </dependency> -->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
+    </dependencies>
 
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java b/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java
index 2c54d2a78..881ee1a82 100644
--- a/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java
+++ b/sdnr/wt/websocketmanager2/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/WebSocketManagerProvider.java
@@ -17,16 +17,22 @@
  ******************************************************************************/
 package org.onap.ccsdk.features.sdnr.wt.websocketmanager2;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import javax.servlet.ServletException;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketEventOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketmanagerService;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.http.NamespaceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class WebSocketManagerProvider extends Blueprint {
+public class WebSocketManagerProvider extends Blueprint implements WebsocketmanagerService {
 
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketManagerProvider.class);
     private static final String APPLICATION_NAME = WebSocketManagerProvider.class.getName();
@@ -97,4 +103,14 @@ public class WebSocketManagerProvider extends Blueprint {
     public void setWsServlet(WebSocketManager wsServlet) {
         this.wsServlet = wsServlet;
     }
+
+    @Override
+    public ListenableFuture<RpcResult<WebsocketEventOutput>> websocketEvent(WebsocketEventInput input) {
+        if (wsServlet != null) {
+			return wsServlet.websocketEvent(input);
+		} else {
+            RpcResultBuilder<WebsocketEventOutput> result = RpcResultBuilder.failed();
+            return result.withError(ErrorType.APPLICATION, "Not intialized").buildFuture();
+        }
+    }
 }
diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
deleted file mode 100644
index 5e95b7b74..000000000
--- a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START========================================================================
-  ONAP : ccsdk feature sdnr wt
-  =================================================================================================
-  Copyright (C) 2019 highstreet technologies GmbH 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==========================================================================
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
-
-  <reference id="rpcProviderRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" odl:type="default" />
-
-  <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.websocketmanager2.WebSocketManagerProvider" init-method="init" destroy-method="close">
-    <property name="rpcProviderRegistry" ref="rpcProviderRegistry" />
-  </bean>
-
-  <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService">
-    <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService" />
-  </reference>
-
-</blueprint>
diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 5e95b7b74..32b19a646 100644
--- a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -30,4 +30,8 @@
     <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService" />
   </reference>
 
+  <service id="registerWebsocketmanagerService"
+           interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105.WebsocketmanagerService"
+           ref="provider" />
+
 </blueprint>