diff --git a/Makefile b/Makefile
index 8f51890..cba26bc 100644
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,13 @@
 	pyang -v || pip install pyang
 
 yang-lint: pyang
-	#pyang --lint ./config-models/*.x/files/yang/*.yang
 	pyang --lint ./config-models/aether-1.x/files/yang/*.yang
-	pyang --lint ./config-models/aether-2.0.x/files/yang/*.yang
+	pyang --lint --lint-ensure-hyphenated-names -W error ./config-models/aether-2.0.x/files/yang/*.yang -p ./config-models/aether-2.0.x/files/yang
 	pyang --lint ./config-models/aether-2.1.x/files/yang/*.yang
 	pyang --lint ./config-models/aether-2.2.x/files/yang/*.yang
 	pyang --lint ./config-models/aether-3.x/files/yang/*.yang
 	pyang --lint --lint-ensure-hyphenated-names -W error ./config-models/aether-4.x/files/yang/*.yang -p ./config-models/aether-4.x/files/yang
 	pyang --lint --lint-ensure-hyphenated-names -W error ./config-models/plproxy-1.x/files/yang/*.yang -p ./config-models/plproxy-1.x/files/yang
+
+reuse-lint:
+	reuse --root . lint
\ No newline at end of file
diff --git a/chronos-exporter/Chart.yaml b/chronos-exporter/Chart.yaml
index de0a16f..37eeca0 100644
--- a/chronos-exporter/Chart.yaml
+++ b/chronos-exporter/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.9
+version: 0.0.10
 appVersion: v0.0.8
 keywords:
   - aether
diff --git a/chronos-exporter/files/configs/demo-configuration.yaml b/chronos-exporter/files/configs/demo-configuration.yaml
index cb94a99..0fce178 100644
--- a/chronos-exporter/files/configs/demo-configuration.yaml
+++ b/chronos-exporter/files/configs/demo-configuration.yaml
@@ -126,9 +126,7 @@
       isometric: true
       origin: ORIGIN_TOP_LEFT
       layers:
-        - layer-id: Small-Cells
-        - layer-id: Beams
-        - layer-id: Devices
+        - layer-id: Structures
         - layer-id: Text
       site-plan-list:
         - id: floor-0
diff --git a/chronos-exporter/files/site-plans/freemont/floor-0.svg b/chronos-exporter/files/site-plans/freemont/floor-0.svg
index bf6e33a..a300d8d 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-0.svg
+++ b/chronos-exporter/files/site-plans/freemont/floor-0.svg
@@ -1,8 +1,6 @@
-<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
-
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
+<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -22,55 +20,7 @@
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="floor-0.svg">
   <title
-     id="title952">Floor Plan sample - floor-1</title>
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4711">
-      <stop
-         style="stop-color:#f61616;stop-opacity:0.86764705"
-         offset="0"
-         id="stop4707" />
-      <stop
-         style="stop-color:#9494ed;stop-opacity:0"
-         offset="1"
-         id="stop4709" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,-151.07922,-5.6639515)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-8"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,-1.7175641,-68.399635)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-7"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,27.374166,9.4661793)" />
-  </defs>
+     id="title952">Floor Plan sample - floor-0</title>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -82,7 +32,7 @@
      inkscape:cx="344.08776"
      inkscape:cy="410.25296"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer6"
+     inkscape:current-layer="layerStructure"
      showgrid="true"
      width="300mm"
      objecttolerance="10000"
@@ -116,8 +66,8 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Walls"
+     id="layerStructure"
+     inkscape:label="Structure"
      style="display:inline">
     <rect
        style="opacity:1;fill:none;fill-opacity:0.86764706;stroke:#000000;stroke-width:0.2763854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -186,55 +136,7 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SmallCells"
-     style="display:inline">
-    <circle
-       r="5.2916665"
-       cy="55.214973"
-       cx="160.36127"
-       id="circle4540-4"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="132.91795"
-       cx="189.02284"
-       id="circle4540-8"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="117.6014"
-       cx="10.83964"
-       id="circle4540"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:groupmode="layer"
-       id="layer5"
-       inkscape:label="Beam"
-       style="display:inline">
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9"
-         cx="10.522173"
-         cy="117.82392"
-         r="71.90329" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-8);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-7"
-         cx="159.8838"
-         cy="55.088234"
-         r="71.90329" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-7);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-3"
-         cx="188.97557"
-         cy="132.95406"
-         r="71.90329" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
+     id="layerText"
      inkscape:label="Text"
      style="display:inline">
     <text
@@ -353,170 +255,4 @@
          x="271.57532"
          y="139.47122">WC (F)</tspan></text>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Devices"
-     style="display:inline">
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8"
-       sodipodi:sides="5"
-       sodipodi:cx="23.780182"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 23.780182,75.140523 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-8"
-       sodipodi:sides="5"
-       sodipodi:cx="76.729164"
-       sodipodi:cy="120.625"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 76.729164,115.33333 1.555182,3.15115 3.477492,0.50531 -2.516337,2.45282 0.594027,3.46344 -3.110364,-1.63522 -3.110364,1.63522 0.594027,-3.46344 -2.516337,-2.45283 3.477492,-0.5053 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-3"
-       sodipodi:sides="5"
-       sodipodi:cx="125.90935"
-       sodipodi:cy="98.953024"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 125.90935,93.661358 1.55518,3.151142 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463439 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.463438 -2.51634,-2.452823 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-1"
-       sodipodi:sides="5"
-       sodipodi:cx="142.7455"
-       sodipodi:cy="98.640724"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 142.7455,93.349058 1.55518,3.151142 3.47749,0.505309 -2.51633,2.452823 0.59402,3.463438 -3.11036,-1.63521 -3.11036,1.63521 0.59402,-3.463438 -2.51634,-2.452823 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-89"
-       sodipodi:sides="5"
-       sodipodi:cx="104.74268"
-       sodipodi:cy="22.223858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 104.74268,16.932191 1.55519,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-6"
-       sodipodi:sides="5"
-       sodipodi:cx="206.5045"
-       sodipodi:cy="21.911558"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 206.5045,16.619892 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452823 0.59402,3.46344 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-4"
-       sodipodi:sides="5"
-       sodipodi:cx="230.317"
-       sodipodi:cy="21.911558"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 230.317,16.619892 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452823 0.59402,3.46344 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-33"
-       sodipodi:sides="5"
-       sodipodi:cx="230.317"
-       sodipodi:cy="85.41156"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 230.317,80.119894 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-38"
-       sodipodi:sides="5"
-       sodipodi:cx="193.14583"
-       sodipodi:cy="165.60417"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 193.14583,160.31251 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45282 0.59402,3.46344 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.4775,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-60"
-       sodipodi:sides="5"
-       sodipodi:cx="243.54616"
-       sodipodi:cy="178.01573"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 243.54616,172.72407 1.55518,3.15114 3.47749,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.4775,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-  </g>
 </svg>
diff --git a/chronos-exporter/files/site-plans/freemont/floor-1.svg b/chronos-exporter/files/site-plans/freemont/floor-1.svg
index 095ec36..1af7817 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-1.svg
+++ b/chronos-exporter/files/site-plans/freemont/floor-1.svg
@@ -1,8 +1,6 @@
-<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
-
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
+<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -93,7 +91,7 @@
      inkscape:cx="-52.379631"
      inkscape:cy="267.3414"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="layerStructure"
      showgrid="true"
      width="300mm"
      objecttolerance="10000"
@@ -126,9 +124,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Walls"
      inkscape:groupmode="layer"
-     id="layer1"
+     id="layerStructure"
+     inkscape:label="Structure"
      transform="translate(0,-97)"
      style="display:inline">
     <rect
@@ -199,7 +197,7 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer4"
+     id="layerText"
      inkscape:label="Text"
      style="display:inline">
     <text
@@ -310,214 +308,4 @@
          x="260.4614"
          y="185.50815">Stairs</tspan></text>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SmallCells"
-     style="display:inline">
-    <circle
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4538"
-       cx="142.875"
-       cy="189.41667"
-       r="5.2916665" />
-    <circle
-       r="5.2916665"
-       cy="117.6014"
-       cx="10.83964"
-       id="circle4540"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="circle4542"
-       cx="234.51427"
-       cy="111.24276"
-       r="5.2916665" />
-    <circle
-       r="5.2916665"
-       cy="84.686066"
-       cx="112.57793"
-       id="circle4544"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:groupmode="layer"
-       id="layer5"
-       inkscape:label="Beam"
-       style="display:inline">
-      <circle
-         style="display:inline;fill:url(#radialGradient4713);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694"
-         cx="112.18857"
-         cy="83.131912"
-         r="50.583138" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9"
-         cx="11.36376"
-         cy="116.42128"
-         r="50.583138" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-0);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-5"
-         cx="233.0773"
-         cy="112.26365"
-         r="50.583138" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-09);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-8"
-         cx="144.04884"
-         cy="186.97285"
-         r="50.583138" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Devices"
-     style="display:inline">
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4546"
-       sodipodi:sides="5"
-       sodipodi:cx="74.083328"
-       sodipodi:cy="20.083336"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 74.083328,14.791669 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594026,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       inkscape:transform-center-y="-0.50530945"
-       d="m 24.903153,69.848859 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.9424778"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:r2="2.6458333"
-       sodipodi:r1="5.2916665"
-       sodipodi:cy="75.140526"
-       sodipodi:cx="24.903152"
-       sodipodi:sides="5"
-       id="path4548"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550"
-       sodipodi:sides="5"
-       sodipodi:cx="50.40033"
-       sodipodi:cy="172.72406"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 50.40033,167.43239 1.555181,3.15115 3.477493,0.50531 -2.516337,2.45282 0.594026,3.46344 -3.110363,-1.63522 -3.110364,1.63522 0.594027,-3.46344 -2.516337,-2.45282 3.477492,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       inkscape:transform-center-y="-0.50530945"
-       d="m 121.96733,132.84356 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45282 0.59402,3.46344 -3.11036,-1.63521 -3.11036,1.63521 0.59402,-3.46344 -2.51633,-2.45282 3.47749,-0.50531 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.9424778"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:r2="2.6458333"
-       sodipodi:r1="5.2916665"
-       sodipodi:cy="138.13522"
-       sodipodi:cx="121.96733"
-       sodipodi:sides="5"
-       id="path4552"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4554"
-       sodipodi:sides="5"
-       sodipodi:cx="167.77815"
-       sodipodi:cy="69.848862"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 167.77815,64.557195 1.55518,3.151143 3.4775,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       inkscape:transform-center-y="-0.50530945"
-       d="m 231.27815,91.015523 1.55518,3.151143 3.4775,0.505309 -2.51634,2.452822 0.59403,3.463443 -3.11037,-1.635217 -3.11036,1.635217 0.59403,-3.463443 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.9424778"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:r2="2.6458333"
-       sodipodi:r1="5.2916665"
-       sodipodi:cy="96.30719"
-       sodipodi:cx="231.27815"
-       sodipodi:sides="5"
-       id="path4556"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4558"
-       sodipodi:sides="5"
-       sodipodi:cx="283.23367"
-       sodipodi:cy="140.97406"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 283.23367,135.68239 1.55518,3.15115 3.4775,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11037,-1.63522 -3.11036,1.63522 0.59403,-3.46344 -2.51634,-2.45282 3.47749,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       inkscape:transform-center-y="-0.50530945"
-       d="m 190.24101,148.71856 1.55518,3.15114 3.4775,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11037,-1.63521 -3.11036,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.47749,-0.50531 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.9424778"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:r2="2.6458333"
-       sodipodi:r1="5.2916665"
-       sodipodi:cy="154.01022"
-       sodipodi:cx="190.24101"
-       sodipodi:sides="5"
-       id="path4560"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4562"
-       sodipodi:sides="5"
-       sodipodi:cx="210.11148"
-       sodipodi:cy="154.51553"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 210.11148,149.22387 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45282 0.59402,3.46344 -3.11036,-1.63521 -3.11036,1.63521 0.59402,-3.46344 -2.51633,-2.45282 3.47749,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-  </g>
 </svg>
diff --git a/chronos-exporter/files/site-plans/freemont/floor-2.svg b/chronos-exporter/files/site-plans/freemont/floor-2.svg
index 912186b..c0ed637 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-2.svg
+++ b/chronos-exporter/files/site-plans/freemont/floor-2.svg
@@ -1,8 +1,6 @@
-<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
-
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
+<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -22,110 +20,7 @@
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="floor-2.svg">
   <title
-     id="title952">Floor Plan sample - floor-1</title>
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4711">
-      <stop
-         style="stop-color:#f61616;stop-opacity:0.86764705"
-         offset="0"
-         id="stop4707" />
-      <stop
-         style="stop-color:#9494ed;stop-opacity:0"
-         offset="1"
-         id="stop4709" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,-67.855512,57.931532)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-4"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,-57.360845,-35.356858)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-1"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,85.924336,-35.731489)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-6"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,51.926973,28.707334)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-8"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,108.12235,57.288294)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-18"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,195.16238,31.715878)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-3"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,43.95706,80.106242)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-89"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68943031,0,0,0.68943031,203.14527,92.289895)" />
-  </defs>
+     id="title952">Floor Plan sample - floor-2</title>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -137,7 +32,7 @@
      inkscape:cx="403.99272"
      inkscape:cy="367.84237"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layerStructure"
      showgrid="true"
      width="300mm"
      objecttolerance="10000"
@@ -171,8 +66,8 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Walls"
+     id="layerStructure"
+     inkscape:label="Structure"
      style="display:inline">
     <rect
        style="opacity:1;fill:none;fill-opacity:0.86764706;stroke:#000000;stroke-width:0.35681203;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -221,115 +116,7 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SmallCells"
-     style="display:inline">
-    <circle
-       r="5.2916665"
-       cy="24.867588"
-       cx="21.422974"
-       id="circle4540-3"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="88.396652"
-       cx="130.26799"
-       id="circle4540-9"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="23.97571"
-       cx="164.40714"
-       id="circle4540-4"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="91.928398"
-       cx="273.6597"
-       id="circle4540-8"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="117.58949"
-       cx="186.63705"
-       id="circle4540-1"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="152.68138"
-       cx="281.52643"
-       id="circle4540-2"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="140.45721"
-       cx="122.12409"
-       id="circle4540-93"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="117.6014"
-       cx="10.83964"
-       id="circle4540"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:groupmode="layer"
-       id="layer5"
-       inkscape:label="Beam"
-       style="display:inline">
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9"
-         cx="10.522173"
-         cy="117.82392"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-4);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-3"
-         cx="21.016838"
-         cy="24.535536"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-1);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-9"
-         cx="164.30202"
-         cy="24.1609"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-8);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-4"
-         cx="186.50006"
-         cy="117.18068"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-18);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-75"
-         cx="273.54007"
-         cy="91.608269"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-3);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-31"
-         cx="122.33474"
-         cy="139.99863"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-89);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-33"
-         cx="281.52295"
-         cy="152.18285"
-         r="34.873547" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-6);fill-opacity:1;stroke:none;stroke-width:0.34471515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-7"
-         cx="130.30467"
-         cy="88.599724"
-         r="34.873547" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
+     id="layerText"
      inkscape:label="Text"
      style="display:inline">
     <text
@@ -386,298 +173,4 @@
          x="260.46191"
          y="184.97888">Stairs</tspan></text>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Devices"
-     style="display:inline">
-    <path
-       sodipodi:type="star"
-       style="fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550"
-       sodipodi:sides="5"
-       sodipodi:cx="43.888515"
-       sodipodi:cy="138.64052"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 43.888516,133.34885 1.555181,3.15114 3.477492,0.50531 -2.516337,2.45283 0.594027,3.46344 -3.110364,-1.63522 -3.110363,1.63522 0.594027,-3.46344 -2.516337,-2.45283 3.477492,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8"
-       sodipodi:sides="5"
-       sodipodi:cx="23.780182"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 23.780182,75.140523 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-85"
-       sodipodi:sides="5"
-       sodipodi:cx="41.242683"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 41.242684,75.140523 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594026,-3.463441 -2.516336,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-0"
-       sodipodi:sides="5"
-       sodipodi:cx="56.653152"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 56.653153,75.140523 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-9"
-       sodipodi:sides="5"
-       sodipodi:cx="70.411484"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 70.411484,75.140523 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-3"
-       sodipodi:sides="5"
-       sodipodi:cx="23.78018"
-       sodipodi:cy="38.098858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 23.78018,32.807191 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-85-8"
-       sodipodi:sides="5"
-       sodipodi:cx="41.242683"
-       sodipodi:cy="38.098858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 41.242684,32.807191 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594026,-3.463441 -2.516336,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-0-5"
-       sodipodi:sides="5"
-       sodipodi:cx="56.653152"
-       sodipodi:cy="38.098858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 56.653153,32.807191 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-9-6"
-       sodipodi:sides="5"
-       sodipodi:cx="70.411491"
-       sodipodi:cy="38.098858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 70.411492,32.807191 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594026,-3.463441 -2.516336,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-1"
-       sodipodi:sides="5"
-       sodipodi:cx="216.92601"
-       sodipodi:cy="32.80719"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 216.92601,27.515523 1.55518,3.151143 3.47749,0.505309 -2.51633,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.463441 -2.51633,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-85-1"
-       sodipodi:sides="5"
-       sodipodi:cx="234.38852"
-       sodipodi:cy="32.80719"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 234.38852,27.515523 1.55518,3.151143 3.47749,0.505309 -2.51633,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.463441 -2.51633,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-0-59"
-       sodipodi:sides="5"
-       sodipodi:cx="249.799"
-       sodipodi:cy="32.80719"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 249.799,27.515523 1.55518,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11036,-1.635215 -3.11037,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-9-8"
-       sodipodi:sides="5"
-       sodipodi:cx="263.55731"
-       sodipodi:cy="32.80719"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 263.55731,27.515523 1.55518,3.151143 3.4775,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-4"
-       sodipodi:sides="5"
-       sodipodi:cx="218.14616"
-       sodipodi:cy="72.182396"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 218.14616,66.890729 1.55519,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-85-81"
-       sodipodi:sides="5"
-       sodipodi:cx="235.60866"
-       sodipodi:cy="72.182396"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 235.60866,66.890729 1.55518,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11036,-1.635215 -3.11037,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-0-0"
-       sodipodi:sides="5"
-       sodipodi:cx="251.01913"
-       sodipodi:cy="72.182396"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 251.01913,66.890729 1.55519,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-9-3"
-       sodipodi:sides="5"
-       sodipodi:cx="264.77747"
-       sodipodi:cy="72.182396"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 264.77747,66.890729 1.55518,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11036,-1.635215 -3.11037,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-7"
-       sodipodi:sides="5"
-       sodipodi:cx="280.58783"
-       sodipodi:cy="162.14073"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 280.58783,156.84907 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45282 0.59402,3.46344 -3.11036,-1.63521 -3.11036,1.63521 0.59402,-3.46344 -2.51633,-2.45282 3.47749,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-  </g>
 </svg>
diff --git a/chronos-exporter/files/site-plans/freemont/floor-3.svg b/chronos-exporter/files/site-plans/freemont/floor-3.svg
index 56c7225..cf1671e 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-3.svg
+++ b/chronos-exporter/files/site-plans/freemont/floor-3.svg
@@ -1,8 +1,6 @@
-<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
-
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
+<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -22,77 +20,7 @@
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="floor-3.svg">
   <title
-     id="title952">Floor Plan sample - floor-1</title>
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4711">
-      <stop
-         style="stop-color:#f61616;stop-opacity:0.86764705"
-         offset="0"
-         id="stop4707" />
-      <stop
-         style="stop-color:#9494ed;stop-opacity:0"
-         offset="1"
-         id="stop4709" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,-95.534438,-3.9170011)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-9"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1053719,0,0,1.1053719,-23.371088,-58.082591)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-5"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2273814,0,0,1.2273814,92.188476,-62.412977)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-59"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3382992,0,0,1.3382992,7.250671,64.364403)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-9-3"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1053719,0,0,1.1053719,33.218902,1.8737376)" />
-  </defs>
+     id="title952">Floor Plan sample - floor-3</title>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -104,7 +32,7 @@
      inkscape:cx="195.12056"
      inkscape:cy="406.0119"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer5"
+     inkscape:current-layer="layerStructure"
      showgrid="true"
      width="300mm"
      objecttolerance="10000"
@@ -138,8 +66,8 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Walls"
+     id="layerStructure"
+     inkscape:label="Structure"
      style="display:inline">
     <rect
        style="opacity:1;fill:none;fill-opacity:0.86764706;stroke:#000000;stroke-width:0.2763854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -188,79 +116,7 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SmallCells"
-     style="display:inline">
-    <circle
-       r="5.2916665"
-       cy="44.664021"
-       cx="231.61548"
-       id="circle4540-8"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="180.62567"
-       cx="159.73277"
-       id="circle4540-85"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="37.804306"
-       cx="102.57578"
-       id="circle4540-0"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="97.760635"
-       cx="159.16577"
-       id="circle4540-0-4"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="117.6014"
-       cx="65.873016"
-       id="circle4540"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:groupmode="layer"
-       id="layer5"
-       inkscape:label="Beam"
-       style="display:inline">
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9"
-         cx="66.06678"
-         cy="119.57087"
-         r="71.90329" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-9);fill-opacity:1;stroke:none;stroke-width:0.55268592;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-8"
-         cx="102.29282"
-         cy="37.943596"
-         r="55.913174" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-5);fill-opacity:1;stroke:none;stroke-width:0.61369067;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-1"
-         cx="231.7229"
-         cy="44.21246"
-         r="62.084801" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-59);fill-opacity:1;stroke:none;stroke-width:0.66914958;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-81"
-         cx="159.39481"
-         cy="180.62546"
-         r="67.695366" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-9-3);fill-opacity:1;stroke:none;stroke-width:0.55268592;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-8-4"
-         cx="158.88281"
-         cy="97.899925"
-         r="55.913174" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
+     id="layerText"
      inkscape:label="Text"
      style="display:inline">
     <text
@@ -332,170 +188,4 @@
          x="260.46249"
          y="185.50807">Stairs</tspan></text>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Devices"
-     style="display:inline">
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8"
-       sodipodi:sides="5"
-       sodipodi:cx="23.780182"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 23.780182,75.140523 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-6"
-       sodipodi:sides="5"
-       sodipodi:cx="80.465652"
-       sodipodi:cy="19.578024"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 80.465653,14.286357 1.555181,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594027,3.463441 -3.110364,-1.635215 -3.110363,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-3"
-       sodipodi:sides="5"
-       sodipodi:cx="108.34967"
-       sodipodi:cy="19.794893"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 108.34967,14.503227 1.55518,3.151142 3.47749,0.50531 -2.51633,2.452822 0.59402,3.46344 -3.11036,-1.635214 -3.11036,1.635214 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-9"
-       sodipodi:sides="5"
-       sodipodi:cx="122.79898"
-       sodipodi:cy="19.578024"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 122.79898,14.286357 1.55518,3.151143 3.47749,0.505309 -2.51633,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.463441 -2.51633,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-4"
-       sodipodi:sides="5"
-       sodipodi:cx="265.67398"
-       sodipodi:cy="93.661354"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 265.67398,88.369688 1.55518,3.151142 3.47749,0.505309 -2.51633,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-8"
-       sodipodi:sides="5"
-       sodipodi:cx="251.32178"
-       sodipodi:cy="93.661354"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 251.32178,88.369688 1.55518,3.151142 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11036,-1.635215 -3.11037,1.635215 0.59403,-3.46344 -2.51634,-2.452823 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-1"
-       sodipodi:sides="5"
-       sodipodi:cx="278.90314"
-       sodipodi:cy="186.26552"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 278.90314,180.97385 1.55518,3.15114 3.47749,0.50531 -2.51634,2.45283 0.59403,3.46344 -3.11036,-1.63522 -3.11037,1.63522 0.59403,-3.46344 -2.51634,-2.45283 3.4775,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-2"
-       sodipodi:sides="5"
-       sodipodi:cx="224.76634"
-       sodipodi:cy="185.95323"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 224.76634,180.66157 1.55518,3.15114 3.4775,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11037,-1.63521 -3.11036,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.47749,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-93"
-       sodipodi:sides="5"
-       sodipodi:cx="116.41667"
-       sodipodi:cy="184.125"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 116.41667,178.83333 1.55518,3.15115 3.4775,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11037,-1.63522 -3.11036,1.63522 0.59402,-3.46344 -2.51633,-2.45283 3.47749,-0.5053 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-90"
-       sodipodi:sides="5"
-       sodipodi:cx="103.058"
-       sodipodi:cy="183.83655"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 103.058,178.54488 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45283 0.59402,3.46344 -3.11036,-1.63522 -3.110365,1.63522 0.594025,-3.46344 -2.516335,-2.45283 3.477495,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-  </g>
 </svg>
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 9499c74..7aa0354 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.7
+version: 0.1.8
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,7 +29,7 @@
   - name: chronos-exporter
     condition: import.chronos-exporter.enabled
     repository: "file://../chronos-exporter"
-    version: 0.0.9
+    version: 0.0.10
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"