diff --git a/diagrams/SAREF4GRID examples.xml b/diagrams/SAREF4GRID examples.xml
index 76321952087830d93736a68db8d69b77cda7b689..3c32147d4719da3c2c8821b33026c6aabf956bbb 100644
--- a/diagrams/SAREF4GRID examples.xml	
+++ b/diagrams/SAREF4GRID examples.xml	
@@ -1,20 +1,20 @@
-<mxfile host="Electron" modified="2024-04-25T14:22:24.165Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.2.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="ZM4QyNHxlA8PAEae5ibZ" version="24.2.5" type="device" pages="12">
-  <diagram name="Porperty Value" id="6Hr9r65S9kmaSmDr5a-f">
-    <mxGraphModel dx="1420" dy="1922" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+<mxfile host="Electron" modified="2024-06-19T14:24:59.633Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.3 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="wWYv9nfujju0h85rApcd" version="24.5.3" type="device" pages="12">
+  <diagram name="Property Value" id="6Hr9r65S9kmaSmDr5a-f">
+    <mxGraphModel dx="1660" dy="1956" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="EovbIy0NGflAQaJYc6TK-1" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="110" y="-950" width="100" height="30" as="geometry" />
+          <mxGeometry x="83" y="-950" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-2" value="&lt;u&gt;ex:Meter1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="110" y="-920" width="100" height="30" as="geometry" />
+          <mxGeometry x="83" y="-920" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-3" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="370" y="-950" width="134" height="30" as="geometry" />
+        <mxCell id="EovbIy0NGflAQaJYc6TK-3" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
+          <mxGeometry x="343" y="-950" width="134" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-4" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex&lt;/u&gt;&lt;u&gt;:PropertyValue234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="370" y="-920" width="134" height="30" as="geometry" />
+          <mxGeometry x="343" y="-920" width="134" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-5" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="1033" y="-1010" width="120" height="30" as="geometry" />
@@ -28,14 +28,14 @@
         <mxCell id="EovbIy0NGflAQaJYc6TK-8" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;om:watt&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="650" y="-905" width="133" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-9" value="s4grid:hasPropertyValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-2" target="EovbIy0NGflAQaJYc6TK-4" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-9" value="saref:hasPropertyValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-2" target="EovbIy0NGflAQaJYc6TK-4" edge="1">
           <mxGeometry x="-0.0375" relative="1" as="geometry">
-            <mxPoint x="400" y="-710" as="sourcePoint" />
-            <mxPoint x="670" y="-830" as="targetPoint" />
+            <mxPoint x="373" y="-710" as="sourcePoint" />
+            <mxPoint x="643" y="-830" as="targetPoint" />
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-10" value="s4grid:hasProperty" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-12" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-10" value="saref:isValueOfProperty" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-12" edge="1">
           <mxGeometry x="0.3578" relative="1" as="geometry">
             <mxPoint x="350" y="-825" as="sourcePoint" />
             <mxPoint x="510" y="-895" as="targetPoint" />
@@ -46,7 +46,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-11" value="s4grid:hasUnit" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-8" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-11" value="saref:isMeasuredIn" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-8" edge="1">
           <mxGeometry x="0.2821" relative="1" as="geometry">
             <mxPoint x="620" y="-907" as="sourcePoint" />
             <mxPoint x="800" y="-955" as="targetPoint" />
@@ -86,7 +86,7 @@
         <mxCell id="EovbIy0NGflAQaJYc6TK-17" value="&quot;1200&quot;^^xsd:int" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
           <mxGeometry x="650" y="-850" width="190" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-18" value="s4grid:hasValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-17" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-18" value="saref:hasValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-4" target="EovbIy0NGflAQaJYc6TK-17" edge="1">
           <mxGeometry x="0.44" relative="1" as="geometry">
             <mxPoint x="755" y="-740" as="sourcePoint" />
             <mxPoint as="offset" />
@@ -96,11 +96,11 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-19" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="388" y="-601" width="135" height="30" as="geometry" />
+        <mxCell id="EovbIy0NGflAQaJYc6TK-19" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
+          <mxGeometry x="351" y="-601" width="135" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-20" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex&lt;/u&gt;&lt;u&gt;:PropertyValue678&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="388" y="-571" width="135" height="30" as="geometry" />
+          <mxGeometry x="351" y="-571" width="135" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-21" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="988" y="-661" width="140" height="30" as="geometry" />
@@ -108,14 +108,14 @@
         <mxCell id="EovbIy0NGflAQaJYc6TK-22" value="&lt;u&gt;s4grid:ScreenDisplay&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="988" y="-631" width="140" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-23" value="s4grid:hasProperty" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-20" target="EovbIy0NGflAQaJYc6TK-24" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-23" value="saref:isValueOfProperty" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-20" target="EovbIy0NGflAQaJYc6TK-24" edge="1">
           <mxGeometry x="0.3578" relative="1" as="geometry">
             <mxPoint x="368" y="-476" as="sourcePoint" />
             <mxPoint x="528" y="-546" as="targetPoint" />
             <mxPoint as="offset" />
             <Array as="points">
-              <mxPoint x="528" y="-556" />
-              <mxPoint x="528" y="-616" />
+              <mxPoint x="510" y="-556" />
+              <mxPoint x="510" y="-616" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -148,26 +148,26 @@
         <mxCell id="EovbIy0NGflAQaJYc6TK-29" value="&quot;A&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
           <mxGeometry x="648" y="-541" width="190" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-30" value="s4grid:hasValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-20" target="EovbIy0NGflAQaJYc6TK-29" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-30" value="saref:hasValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-20" target="EovbIy0NGflAQaJYc6TK-29" edge="1">
           <mxGeometry x="0.3444" y="-2" relative="1" as="geometry">
             <mxPoint x="773" y="-391" as="sourcePoint" />
             <mxPoint as="offset" />
             <Array as="points">
-              <mxPoint x="528" y="-556" />
-              <mxPoint x="528" y="-526" />
+              <mxPoint x="510" y="-556" />
+              <mxPoint x="510" y="-526" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-31" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="121" y="-598" width="100" height="30" as="geometry" />
+          <mxGeometry x="84" y="-598" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EovbIy0NGflAQaJYc6TK-32" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex&lt;/u&gt;&lt;u&gt;:Meter1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="121" y="-568" width="100" height="30" as="geometry" />
+          <mxGeometry x="84" y="-568" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-33" value="s4grid:hasPropertyValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-32" edge="1">
+        <mxCell id="EovbIy0NGflAQaJYc6TK-33" value="saref:hasPropertyValue" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="EovbIy0NGflAQaJYc6TK-32" edge="1">
           <mxGeometry x="-0.0806" relative="1" as="geometry">
-            <mxPoint x="418" y="-358" as="sourcePoint" />
-            <mxPoint x="388" y="-553" as="targetPoint" />
+            <mxPoint x="381" y="-358" as="sourcePoint" />
+            <mxPoint x="351" y="-553" as="targetPoint" />
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
@@ -321,142 +321,142 @@
     </mxGraphModel>
   </diagram>
   <diagram id="P9RxAFtGG_ub73rfMHYp" name="Clock">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="S0erdF2h65B93rT5bqcW-1" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="30" y="180" width="100" height="30" as="geometry" />
+          <mxGeometry x="9" y="180" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-2" value="&lt;u&gt;ex:Meter1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="30" y="210" width="100" height="30" as="geometry" />
+          <mxGeometry x="9" y="210" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-3" value="s4grid:Clock" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="270" y="180" width="100" height="30" as="geometry" />
+          <mxGeometry x="249" y="180" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-4" value="&lt;u&gt;ex:Clock1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="270" y="210" width="100" height="30" as="geometry" />
+          <mxGeometry x="249" y="210" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-5" value="s4grid:hasClock" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="S0erdF2h65B93rT5bqcW-2" target="S0erdF2h65B93rT5bqcW-4" edge="1">
           <mxGeometry x="-0.0024" relative="1" as="geometry">
-            <mxPoint x="160" y="470" as="sourcePoint" />
+            <mxPoint x="139" y="470" as="sourcePoint" />
             <mxPoint x="1" y="-1" as="offset" />
-            <mxPoint x="360" y="470" as="targetPoint" />
+            <mxPoint x="339" y="470" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-6" value="&quot;0-0:1.0.0.255&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="70" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="70" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-7" value="s4grid:hasObis" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-6" edge="1">
           <mxGeometry x="0.4085" relative="1" as="geometry">
-            <mxPoint x="370" y="515" as="sourcePoint" />
+            <mxPoint x="349" y="515" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="85" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="85" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-8" value="&quot;2023-05-30T09:00:00&quot;^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="110" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="110" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-9" value="s4grid:hasTime" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-8" edge="1">
           <mxGeometry x="0.276" relative="1" as="geometry">
-            <mxPoint x="360" y="275" as="sourcePoint" />
+            <mxPoint x="339" y="275" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="125" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="125" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-10" value="&quot;120&quot;^^xsd:long" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="150" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="150" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-11" value="s4grid:hasTimeZone" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-10" edge="1">
           <mxGeometry x="0.1697" y="-2" relative="1" as="geometry">
-            <mxPoint x="380" y="235" as="sourcePoint" />
+            <mxPoint x="359" y="235" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="165" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="165" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-12" value="&quot;1&quot;^^xsd:int" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="190" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="190" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-13" value="s4grid:hasStatus" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-12" edge="1">
           <mxGeometry x="0.2593" y="2" relative="1" as="geometry">
-            <mxPoint x="360" y="275" as="sourcePoint" />
+            <mxPoint x="339" y="275" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="205" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="205" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-14" value="&quot;2023-03-26T02:00:00&quot;^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="230" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="230" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-15" value="s4grid:hasDaylightSavingsBegin" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-14" edge="1">
           <mxGeometry x="0.1552" relative="1" as="geometry">
-            <mxPoint x="360" y="280" as="sourcePoint" />
+            <mxPoint x="339" y="280" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="245" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="245" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-16" value="&quot;2023-10-29T03:00:00&quot;^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="270" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="270" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-17" value="s4grid:hasDaylightSavingsEnd" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-16" edge="1">
           <mxGeometry x="0.2618" relative="1" as="geometry">
-            <mxPoint x="360" y="280" as="sourcePoint" />
+            <mxPoint x="339" y="280" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="285" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="285" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-18" value="&quot;60&quot;^^xsd:integer" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="310" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="310" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-19" value="s4grid:hasDaylightSavingsDeviation" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-18" edge="1">
           <mxGeometry x="0.3445" relative="1" as="geometry">
-            <mxPoint x="370" y="280" as="sourcePoint" />
+            <mxPoint x="349" y="280" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="325" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="325" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-20" value="&quot;True&quot;^^xsd:boolean" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="350" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="350" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-21" value="s4grid:hasDaylightSavingsEnabled" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-20" edge="1">
           <mxGeometry x="0.4106" relative="1" as="geometry">
-            <mxPoint x="370" y="280" as="sourcePoint" />
+            <mxPoint x="349" y="280" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="365" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="365" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-22" value="&quot;4&quot;^^xsd:int" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="627" y="390" width="213" height="30" as="geometry" />
+          <mxGeometry x="606" y="390" width="213" height="30" as="geometry" />
         </mxCell>
         <mxCell id="S0erdF2h65B93rT5bqcW-23" value="s4grid:hasClockBase" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="S0erdF2h65B93rT5bqcW-4" target="S0erdF2h65B93rT5bqcW-22" edge="1">
           <mxGeometry x="0.4645" relative="1" as="geometry">
-            <mxPoint x="380" y="235" as="sourcePoint" />
+            <mxPoint x="359" y="235" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="410" y="225" />
-              <mxPoint x="410" y="405" />
+              <mxPoint x="389" y="225" />
+              <mxPoint x="389" y="405" />
             </Array>
             <mxPoint as="offset" />
           </mxGeometry>
@@ -1038,33 +1038,33 @@
     </mxGraphModel>
   </diagram>
   <diagram id="E8k2KVbBWa5BwWXB3SHF" name="Measurements">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-1" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-1" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="307" y="90" width="331" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-2" value="&lt;u&gt;ex:TotalIncrementalActiveEnergyImportMeasurement123&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-2" value="&lt;u&gt;ex:TotalIncrementalActiveEnergyImportObservation123&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="307" y="120" width="331" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-3" value="saref:EnergyUnit" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="802" y="150" width="125" height="30" as="geometry" />
+          <mxGeometry x="1062" y="170" width="125" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-4" value="&lt;u&gt;om:wattHour&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="802" y="180" width="125" height="30" as="geometry" />
+          <mxGeometry x="1062" y="200" width="125" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-5" value="&quot;5&quot;^^xsd:unsignedLong" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="802" y="90" width="190" height="30" as="geometry" />
+          <mxGeometry x="1062" y="110" width="141" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-6" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="47" y="90" width="100" height="30" as="geometry" />
+          <mxGeometry x="68" y="90" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-7" value="&lt;u&gt;ex:Meter1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="47" y="120" width="100" height="30" as="geometry" />
+          <mxGeometry x="68" y="120" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-8" value="&quot;2023-10-20T21:01:10&quot;^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="802" y="30" width="220" height="30" as="geometry" />
+          <mxGeometry x="788" y="50" width="220" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-9" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="KFuXAu45WO3QxNMIKkzj-7" target="KFuXAu45WO3QxNMIKkzj-2" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -1072,7 +1072,7 @@
             <mxPoint x="187" y="-38" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-10" value="saref:makesMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-9" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-10" value="saref:madeExecution" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-9" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -1082,23 +1082,23 @@
             <mxPoint x="68" y="-115" as="sourcePoint" />
             <mxPoint x="217" y="-115" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="135" />
-              <mxPoint x="658" y="45" />
+              <mxPoint x="650" y="135" />
+              <mxPoint x="650" y="65" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-12" value="saref:hasTimestamp" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-11" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
-            <mxPoint x="69" as="offset" />
+            <mxPoint x="46" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-13" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="KFuXAu45WO3QxNMIKkzj-2" target="KFuXAu45WO3QxNMIKkzj-5" edge="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-13" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" target="KFuXAu45WO3QxNMIKkzj-5" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="78" y="-105" as="sourcePoint" />
-            <mxPoint x="227" y="-105" as="targetPoint" />
+            <mxPoint x="911" y="155" as="sourcePoint" />
+            <mxPoint x="500" y="-85" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="135" />
-              <mxPoint x="658" y="105" />
+              <mxPoint x="931" y="155" />
+              <mxPoint x="931" y="125" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1107,13 +1107,13 @@
             <mxPoint x="35" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-15" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="KFuXAu45WO3QxNMIKkzj-2" target="KFuXAu45WO3QxNMIKkzj-4" edge="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-15" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" target="KFuXAu45WO3QxNMIKkzj-4" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="88" y="-95" as="sourcePoint" />
-            <mxPoint x="237" y="-95" as="targetPoint" />
+            <mxPoint x="911" y="155" as="sourcePoint" />
+            <mxPoint x="510" y="-75" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="135" />
-              <mxPoint x="658" y="195" />
+              <mxPoint x="931" y="155" />
+              <mxPoint x="931" y="215" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1123,10 +1123,10 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-17" value="s4grid:PowerLine" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="802" y="240" width="180" height="30" as="geometry" />
+          <mxGeometry x="786" y="240" width="180" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-18" value="&lt;u&gt;ex:SubstationLine23&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="802" y="270" width="180" height="30" as="geometry" />
+          <mxGeometry x="786" y="270" width="180" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-19" value="saref:isPropertyOf" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;entryX=0;entryY=0.1;entryDx=0;entryDy=0;exitX=1;exitY=0.1;exitDx=0;exitDy=0;" parent="1" source="KFuXAu45WO3QxNMIKkzj-21" target="KFuXAu45WO3QxNMIKkzj-18" edge="1">
           <mxGeometry x="-0.0667" relative="1" as="geometry">
@@ -1154,7 +1154,7 @@
             <mxPoint x="217" y="-115" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-24" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-23" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-24" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint y="4" as="offset" />
           </mxGeometry>
@@ -1165,7 +1165,7 @@
             <mxPoint x="418" y="230" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-26" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-25" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-26" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-25" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-10" y="-14" as="offset" />
           </mxGeometry>
@@ -1212,29 +1212,29 @@
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-36" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-36" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="290" y="540" width="348" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-37" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex:MaximumDemandRegisterImportC1TP1Measurement136&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-37" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex:MaximumDemandRegisterImportC1TP1Observation136&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="290" y="570" width="348" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-38" value="saref:EnergyUnit" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="802" y="600" width="125" height="30" as="geometry" />
+          <mxGeometry x="1062" y="610" width="125" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-39" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;om:watt&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="802" y="630" width="125" height="30" as="geometry" />
+          <mxGeometry x="1062" y="640" width="125" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-40" value="&quot;5&quot;^^xsd:unsignedLong" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="802" y="540" width="190" height="30" as="geometry" />
+          <mxGeometry x="1062" y="550" width="139" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-41" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="30" y="540" width="100" height="30" as="geometry" />
+          <mxGeometry x="51" y="540" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-42" value="&lt;u&gt;ex:Meter1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="30" y="570" width="100" height="30" as="geometry" />
+          <mxGeometry x="51" y="570" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-43" value="&quot;2023-10-20T21:01:10&quot;^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
-          <mxGeometry x="802" y="480" width="220" height="30" as="geometry" />
+          <mxGeometry x="786" y="495" width="220" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-44" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="KFuXAu45WO3QxNMIKkzj-42" target="KFuXAu45WO3QxNMIKkzj-37" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -1242,7 +1242,7 @@
             <mxPoint x="187" y="412" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-45" value="saref:makesMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-44" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-45" value="saref:&amp;nbsp;madeExecution" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-44" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="4" as="offset" />
           </mxGeometry>
@@ -1252,23 +1252,23 @@
             <mxPoint x="68" y="335" as="sourcePoint" />
             <mxPoint x="217" y="335" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="585" />
-              <mxPoint x="658" y="495" />
+              <mxPoint x="650" y="585" />
+              <mxPoint x="650" y="510" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-47" value="saref:hasTimestamp" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-46" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
-            <mxPoint x="69" as="offset" />
+            <mxPoint x="58" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-48" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="KFuXAu45WO3QxNMIKkzj-37" target="KFuXAu45WO3QxNMIKkzj-40" edge="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-48" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" target="KFuXAu45WO3QxNMIKkzj-40" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="78" y="345" as="sourcePoint" />
-            <mxPoint x="227" y="345" as="targetPoint" />
+            <mxPoint x="911" y="595" as="sourcePoint" />
+            <mxPoint x="500" y="355" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="585" />
-              <mxPoint x="658" y="555" />
+              <mxPoint x="931" y="595" />
+              <mxPoint x="931" y="565" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1277,13 +1277,13 @@
             <mxPoint x="35" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-50" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="KFuXAu45WO3QxNMIKkzj-37" target="KFuXAu45WO3QxNMIKkzj-39" edge="1">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-50" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" target="KFuXAu45WO3QxNMIKkzj-39" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="88" y="355" as="sourcePoint" />
-            <mxPoint x="237" y="355" as="targetPoint" />
+            <mxPoint x="911" y="595" as="sourcePoint" />
+            <mxPoint x="510" y="365" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="658" y="585" />
-              <mxPoint x="658" y="645" />
+              <mxPoint x="931" y="595" />
+              <mxPoint x="931" y="655" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1293,10 +1293,10 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-52" value="s4grid:PowerLine" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="802" y="690" width="180" height="30" as="geometry" />
+          <mxGeometry x="787" y="690" width="180" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-53" value="&lt;u&gt;ex:SubstationLine23&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="802" y="720" width="180" height="30" as="geometry" />
+          <mxGeometry x="787" y="720" width="180" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KFuXAu45WO3QxNMIKkzj-54" value="saref:isPropertyOf" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;entryX=0;entryY=0.1;entryDx=0;entryDy=0;exitX=1;exitY=0.1;exitDx=0;exitDy=0;" parent="1" source="KFuXAu45WO3QxNMIKkzj-56" target="KFuXAu45WO3QxNMIKkzj-53" edge="1">
           <mxGeometry x="-0.0667" relative="1" as="geometry">
@@ -1324,7 +1324,7 @@
             <mxPoint x="217" y="335" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-59" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-58" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-59" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-58" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint y="4" as="offset" />
           </mxGeometry>
@@ -1335,7 +1335,7 @@
             <mxPoint x="418" y="680" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-61" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-60" vertex="1" connectable="0">
+        <mxCell id="KFuXAu45WO3QxNMIKkzj-61" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="KFuXAu45WO3QxNMIKkzj-60" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-10" y="-14" as="offset" />
           </mxGeometry>
@@ -1382,11 +1382,53 @@
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-1" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
+          <mxGeometry x="786" y="550" width="125" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-2" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex:5Watt&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" vertex="1" parent="1">
+          <mxGeometry x="786" y="580" width="125" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-3" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="KFuXAu45WO3QxNMIKkzj-37" target="p-K_Lkac51EqHVkFKMAf-2">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="648" y="595" as="sourcePoint" />
+            <mxPoint x="812" y="505" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="650" y="585" />
+              <mxPoint x="650" y="595" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-4" value="saref:hasResult" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="p-K_Lkac51EqHVkFKMAf-3">
+          <mxGeometry x="-0.1269" relative="1" as="geometry">
+            <mxPoint x="13" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-5" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
+          <mxGeometry x="786" y="110" width="125" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-6" value="&lt;u style=&quot;border-color: var(--border-color);&quot;&gt;ex:5WattHour&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" vertex="1" parent="1">
+          <mxGeometry x="786" y="140" width="125" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-7" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" target="p-K_Lkac51EqHVkFKMAf-6" source="KFuXAu45WO3QxNMIKkzj-2">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="1022" y="200" as="sourcePoint" />
+            <mxPoint x="1196" y="120" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="650" y="135" />
+              <mxPoint x="650" y="155" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="p-K_Lkac51EqHVkFKMAf-8" value="saref:hasResult" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="p-K_Lkac51EqHVkFKMAf-7">
+          <mxGeometry x="-0.1269" relative="1" as="geometry">
+            <mxPoint x="13" as="offset" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="buOlGK0-Hgljydil1Zkz" name="Profile Generic">
-    <mxGraphModel dx="1420" dy="1922" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="1956" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1408,45 +1450,45 @@
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-6" value="&quot;1-0:99.1.0.255&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
           <mxGeometry x="569" y="-1032" width="190" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-7" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-7" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="569" y="-922" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-8" value="&lt;u&gt;ex:PropertyValue1&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="569" y="-892" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-9" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-9" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="569" y="-850" width="129" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-10" value="&lt;u&gt;ex:Measurement1&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-10" value="&lt;u&gt;ex:Observation1&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="569" y="-820" width="129" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-11" value="s4gird:hasProperty" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5hJUQ4Lq3hfWGbKeNYC9-8" target="5hJUQ4Lq3hfWGbKeNYC9-14" edge="1">
-          <mxGeometry x="-0.0667" y="1" relative="1" as="geometry">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-11" value="saref:isValueOfProperty" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5hJUQ4Lq3hfWGbKeNYC9-8" target="5hJUQ4Lq3hfWGbKeNYC9-14" edge="1">
+          <mxGeometry x="0.0167" relative="1" as="geometry">
             <mxPoint x="709" y="-960" as="sourcePoint" />
             <mxPoint as="offset" />
             <mxPoint x="769" y="-920" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-12" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1169" y="-922" width="120" height="30" as="geometry" />
+          <mxGeometry x="1239" y="-922" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-13" value="&lt;u&gt;s4grid:ProfileStatus&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="1169" y="-892" width="120" height="30" as="geometry" />
+          <mxGeometry x="1239" y="-892" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-14" value="&lt;u&gt;ex:AMRStatusLoadProfilePeriod1-1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
-          <mxGeometry x="809" y="-892" width="240" height="30" as="geometry" />
+          <mxGeometry x="879" y="-892" width="240" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-15" value="skos:broader" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.1;exitDx=0;exitDy=0;fontSize=12;entryX=0;entryY=0.1;entryDx=0;entryDy=0;" parent="1" source="5hJUQ4Lq3hfWGbKeNYC9-14" target="5hJUQ4Lq3hfWGbKeNYC9-13" edge="1">
           <mxGeometry x="0.1111" relative="1" as="geometry">
-            <mxPoint x="1069" y="-745" as="sourcePoint" />
-            <mxPoint x="909" y="-745" as="targetPoint" />
+            <mxPoint x="1139" y="-745" as="sourcePoint" />
+            <mxPoint x="979" y="-745" as="targetPoint" />
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-16" value="skos:narrower" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.9;exitDx=0;exitDy=0;fontSize=12;entryX=1;entryY=0.9;entryDx=0;entryDy=0;" parent="1" source="5hJUQ4Lq3hfWGbKeNYC9-13" target="5hJUQ4Lq3hfWGbKeNYC9-14" edge="1">
           <mxGeometry x="0.1111" relative="1" as="geometry">
-            <mxPoint x="909" y="-721" as="sourcePoint" />
-            <mxPoint x="1069" y="-721" as="targetPoint" />
+            <mxPoint x="979" y="-721" as="sourcePoint" />
+            <mxPoint x="1139" y="-721" as="targetPoint" />
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
@@ -1470,7 +1512,7 @@
           <mxGeometry x="880" y="-850" width="270" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-22" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="809" y="-922" width="240" height="30" as="geometry" />
+          <mxGeometry x="879" y="-922" width="240" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-23" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="241" y="-1070" width="100" height="30" as="geometry" />
@@ -1544,7 +1586,7 @@
             <mxPoint x="379" y="-800" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-34" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-33" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-34" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-33" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1555,15 +1597,15 @@
             <mxPoint x="379" y="-800" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-36" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-35" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-36" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-35" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-37" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-37" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="568" y="-780" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-38" value="&lt;u&gt;ex:Measurement2&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-38" value="&lt;u&gt;ex:Observation2&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="568" y="-750" width="130" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-39" value="&lt;u&gt;ex:TotalIncrementalActiveEnergyExport1234&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
@@ -1572,28 +1614,28 @@
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-40" value="s4grid:EnergyAndPowerProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="880" y="-780" width="270" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-41" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-41" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="569" y="-710" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-42" value="&lt;u&gt;ex:Measurement3&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-42" value="&lt;u&gt;ex:Observation3&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="569" y="-680" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-43" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-43" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="568" y="-640" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-44" value="&lt;u&gt;ex:Measurement4&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-44" value="&lt;u&gt;ex:Observation4&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="568" y="-610" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-45" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-45" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="568" y="-570" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-46" value="&lt;u&gt;ex:Measurement5&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-46" value="&lt;u&gt;ex:Observation5&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="568" y="-540" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-47" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-47" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="568" y="-500" width="130" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-48" value="&lt;u&gt;ex:Measurement6&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-48" value="&lt;u&gt;ex:Observation6&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="568" y="-470" width="130" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-49" value="&lt;span&gt;ex:TotalIncrementalReactiveEnergy&lt;/span&gt;QI1234&lt;span&gt;&lt;br&gt;&lt;/span&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fontStyle=4" parent="1" vertex="1">
@@ -1626,7 +1668,7 @@
             <mxPoint x="880" y="-747.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-58" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-57" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-58" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-57" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1637,7 +1679,7 @@
             <mxPoint x="698" y="-723.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-60" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-59" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-60" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-59" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
@@ -1648,7 +1690,7 @@
             <mxPoint x="881" y="-677.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-62" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-61" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-62" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-61" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1659,7 +1701,7 @@
             <mxPoint x="699" y="-653.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-64" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-63" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-64" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-63" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
@@ -1670,7 +1712,7 @@
             <mxPoint x="881" y="-607.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-66" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-65" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-66" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-65" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1681,7 +1723,7 @@
             <mxPoint x="699" y="-583.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-68" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-67" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-68" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-67" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
@@ -1692,7 +1734,7 @@
             <mxPoint x="881" y="-537.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-70" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-69" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-70" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-69" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1703,7 +1745,7 @@
             <mxPoint x="699" y="-513.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-72" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-71" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-72" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-71" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
@@ -1714,7 +1756,7 @@
             <mxPoint x="880" y="-467.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-74" value="saref:relatesToProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-73" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-74" value="saref:observes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-73" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1725,7 +1767,7 @@
             <mxPoint x="698" y="-443.29" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-76" value="saref:relatesToMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-75" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-76" value="saref:isObservedBy" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-75" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-11" as="offset" />
           </mxGeometry>
@@ -1740,7 +1782,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-78" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-77" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-78" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-77" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="75" y="1" as="offset" />
           </mxGeometry>
@@ -1755,7 +1797,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-80" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-79" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-80" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-79" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="80" y="36" as="offset" />
           </mxGeometry>
@@ -1770,7 +1812,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-82" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-81" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-82" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-81" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="80" y="75" as="offset" />
           </mxGeometry>
@@ -1785,7 +1827,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-84" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-83" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-84" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-83" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="80" y="115" as="offset" />
           </mxGeometry>
@@ -1800,7 +1842,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-86" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-85" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-86" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-85" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="80" y="154" as="offset" />
           </mxGeometry>
@@ -1815,7 +1857,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-88" value="s4grid:relatedMeasurement" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-87" vertex="1" connectable="0">
+        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-88" value="s4grid:relatedObservation" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="5hJUQ4Lq3hfWGbKeNYC9-87" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="80" y="194" as="offset" />
           </mxGeometry>
@@ -1962,7 +2004,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="MPaOKqoqY4o5YMpdCesM" name="Get">
-    <mxGraphModel dx="1420" dy="-416" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="-382" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2016,7 +2058,7 @@
             <mxPoint x="248.04" y="1555" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-18" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-18" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="221.04" y="1546" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-19" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.2;exitY=1;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="3KCFvYQO4Nr7krEiYYHR-14" target="3KCFvYQO4Nr7krEiYYHR-10" edge="1">
@@ -2025,7 +2067,7 @@
             <mxPoint x="908.04" y="1946" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-20" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-20" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="218.04" y="1646" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-21" value="&quot;s4grid:ProfileGeneric&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -2060,7 +2102,7 @@
             <mxPoint x="244.54" y="1485.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-27" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-26" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-27" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-26" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
@@ -2116,7 +2158,7 @@
             <mxPoint x="248.03999999999988" y="2077" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-41" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-41" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="221.03999999999988" y="2068" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-42" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.2;exitY=1;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="3KCFvYQO4Nr7krEiYYHR-37" target="3KCFvYQO4Nr7krEiYYHR-35" edge="1">
@@ -2125,7 +2167,7 @@
             <mxPoint x="908.0399999999998" y="2468" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-43" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-43" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="218.03999999999988" y="2168" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-44" value="&quot;xsd:int&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -2160,7 +2202,7 @@
             <mxPoint x="244.53999999999988" y="2007.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-50" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-49" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-50" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-49" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
@@ -2237,7 +2279,7 @@
             <mxPoint x="272.9999999999999" y="2637" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-68" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-68" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="245.9999999999999" y="2628" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-69" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.2;exitY=1;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="3KCFvYQO4Nr7krEiYYHR-64" target="3KCFvYQO4Nr7krEiYYHR-62" edge="1">
@@ -2246,7 +2288,7 @@
             <mxPoint x="933" y="3028" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-70" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-70" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="242.9999999999999" y="2728" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-71" value="&quot;s4grid:Script&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -2281,7 +2323,7 @@
             <mxPoint x="269.4999999999999" y="2567.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-77" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-76" vertex="1" connectable="0">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-77" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="3KCFvYQO4Nr7krEiYYHR-76" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
@@ -2357,7 +2399,7 @@
             <mxPoint x="323.5" y="3195" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-15" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-15" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="296.5" y="3186" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-16" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.2;exitY=1;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="8vjx8haa6S1OWs389tPF-11" target="8vjx8haa6S1OWs389tPF-9" edge="1">
@@ -2366,7 +2408,7 @@
             <mxPoint x="983.5" y="3586" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-17" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-17" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="294.5" y="3395" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-18" value="&quot;s4grid:ProfileGeneric&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -2401,7 +2443,7 @@
             <mxPoint x="320" y="3125.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-24" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="8vjx8haa6S1OWs389tPF-23" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-24" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="8vjx8haa6S1OWs389tPF-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
@@ -2507,7 +2549,7 @@
             <mxPoint x="322.64" y="3877" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-49" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-49" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="295.64" y="3868" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-50" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.2;exitY=1;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="8vjx8haa6S1OWs389tPF-45" target="8vjx8haa6S1OWs389tPF-43" edge="1">
@@ -2516,7 +2558,7 @@
             <mxPoint x="982.64" y="4268" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-51" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-51" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="293.64" y="4077" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-52" value="&quot;s4grid:ProfileGeneric&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -2551,7 +2593,7 @@
             <mxPoint x="319.14" y="3807.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-58" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="8vjx8haa6S1OWs389tPF-57" vertex="1" connectable="0">
+        <mxCell id="8vjx8haa6S1OWs389tPF-58" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="8vjx8haa6S1OWs389tPF-57" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
@@ -2611,7 +2653,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="9S_0XkBk5Ece6Eh6iYSa" name="Set">
-    <mxGraphModel dx="1420" dy="-416" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1452" dy="-165" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2636,7 +2678,7 @@
             <mxPoint x="706.75" y="1339" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-5" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-4" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-5" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-4" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -2650,7 +2692,7 @@
             <mxPoint x="389.5" y="1701" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-9" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-9" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="219.49999999999977" y="1627" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-10" value="s4grid:SetOperationObisInput" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2689,7 +2731,7 @@
         <mxCell id="cRODiDYps_-aIpgkGI7D-20" value="&lt;u&gt;ex:SetOperationMulticastCommunicationIdentifier&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
           <mxGeometry x="70" y="1540" width="291" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-21" value="&quot;s4grid:PropertyValue&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-21" value="&quot;saref:PropertyValue&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
           <mxGeometry x="765" y="1650" width="200" height="30" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-22" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;dashed=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="cRODiDYps_-aIpgkGI7D-11" target="cRODiDYps_-aIpgkGI7D-21" edge="1">
@@ -2728,7 +2770,7 @@
             <mxPoint x="711.5" y="1855" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-28" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-27" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-28" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-27" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -2742,7 +2784,7 @@
             <mxPoint x="394.25" y="2217" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-31" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-31" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="204.74999999999977" y="2160" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-32" value="s4grid:SetOperationDataInput" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2838,7 +2880,7 @@
             <mxPoint x="742.5" y="2425" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-51" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-50" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-51" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="cRODiDYps_-aIpgkGI7D-50" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -2852,7 +2894,7 @@
             <mxPoint x="425.25" y="2787" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-54" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-54" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="235.74999999999977" y="2730" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-55" value="s4grid:SetOperationObjectInput" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2931,7 +2973,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="Jap849RCaIH-MPOWFI4q" name="Action">
-    <mxGraphModel dx="1420" dy="-1585" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1452" dy="-1334" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2953,7 +2995,7 @@
             <mxPoint x="599.6999999999998" y="2755" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="zWe-Fob3svy6_8LgFvBg-3" vertex="1" connectable="0">
+        <mxCell id="zWe-Fob3svy6_8LgFvBg-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="zWe-Fob3svy6_8LgFvBg-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -2964,7 +3006,7 @@
             <mxPoint x="900" y="2755" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-6" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="zWe-Fob3svy6_8LgFvBg-6" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="149.99999999999977" y="2680" as="geometry" />
         </mxCell>
         <mxCell id="zWe-Fob3svy6_8LgFvBg-7" value="&quot;0-1:94.34.1.255&quot;^^xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;align=center;" parent="1" vertex="1">
@@ -3045,7 +3087,7 @@
             <mxPoint x="581.5499999999998" y="3265" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-24" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="zWe-Fob3svy6_8LgFvBg-23" vertex="1" connectable="0">
+        <mxCell id="zWe-Fob3svy6_8LgFvBg-24" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="zWe-Fob3svy6_8LgFvBg-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -3056,7 +3098,7 @@
             <mxPoint x="881.85" y="3265" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-26" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="zWe-Fob3svy6_8LgFvBg-26" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="131.84999999999977" y="3190" as="geometry" />
         </mxCell>
         <mxCell id="zWe-Fob3svy6_8LgFvBg-27" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -3173,7 +3215,7 @@
             <mxPoint x="573.6999999999998" y="3805" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="Vpv4RqKUIZq4zGzb4WJ4-3" vertex="1" connectable="0">
+        <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="Vpv4RqKUIZq4zGzb4WJ4-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -3184,7 +3226,7 @@
             <mxPoint x="874" y="3805" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-6" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-6" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="123.99999999999977" y="3730" as="geometry" />
         </mxCell>
         <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-7" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
diff --git a/diagrams/SAREF4GRID figures.xml b/diagrams/SAREF4GRID figures.xml
index 0b1154166cfc41d6a0fb694b6dd90f4d90e4f7bf..2daf985814afb776f09861f236170bb18d116c74 100644
--- a/diagrams/SAREF4GRID figures.xml	
+++ b/diagrams/SAREF4GRID figures.xml	
@@ -1,10 +1,10 @@
-<mxfile host="Electron" modified="2024-04-25T14:21:12.743Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.2.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="Aif_P_VfgFKYTLAnoqOf" version="24.2.5" type="device" pages="18">
+<mxfile host="Electron" modified="2024-06-19T13:55:54.795Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.3 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="L6I7xyCc1Leme57LawVr" version="24.5.3" type="device" pages="18">
   <diagram name="Property Value" id="VVmcOrx2moW8US6HTCOu">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1089" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="gThzubRPDfsPHgG1rrA1-1" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-1" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="374" y="260" width="136" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-2" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -16,7 +16,7 @@
             <mxPoint x="292.0000000000002" y="378.33" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-4" value="&lt;div&gt;s4grid:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-3" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-4" value="&lt;div&gt;saref:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
@@ -30,7 +30,7 @@
             <mxPoint x="744" y="259" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-7" value="&lt;div&gt;s4grid:hasProperty&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-6" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-7" value="saref:isValueOfProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-6" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="25" as="offset" />
           </mxGeometry>
@@ -44,12 +44,12 @@
             <mxPoint x="586" y="380" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-10" value="&lt;div&gt;s4grid:hasUnit&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-9" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-10" value="&lt;div&gt;saref:isMeasuredIn&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-9" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="36" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-11" value="s4grid:hasValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];dashed=1;align=left;" parent="1" vertex="1">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-11" value="saref:hasValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];dashed=1;align=left;" parent="1" vertex="1">
           <mxGeometry x="374" y="289.9999999999999" width="136" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-12" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;dashed=1;" parent="1" source="gThzubRPDfsPHgG1rrA1-2" target="gThzubRPDfsPHgG1rrA1-14" edge="1">
@@ -58,7 +58,7 @@
             <mxPoint x="260" y="135" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-13" value="&lt;div&gt;(&lt;span class=&quot;ILfuVd NA6bn&quot;&gt;&lt;span class=&quot;e24Kjd&quot;&gt;∀&lt;/span&gt;&lt;/span&gt;) s4grid:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-12" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-13" value="&lt;div&gt;(&lt;span class=&quot;ILfuVd NA6bn&quot;&gt;&lt;span class=&quot;e24Kjd&quot;&gt;∀&lt;/span&gt;&lt;/span&gt;) saref:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-12" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="77" as="offset" />
           </mxGeometry>
@@ -72,7 +72,7 @@
             <mxPoint x="664" y="555" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-16" value="&lt;div&gt;(&lt;span class=&quot;ILfuVd NA6bn&quot;&gt;&lt;span class=&quot;e24Kjd&quot;&gt;∀&lt;/span&gt;&lt;/span&gt;) s4grid:hasProperty&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-15" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-16" value="&lt;div&gt;(&lt;span class=&quot;ILfuVd NA6bn&quot;&gt;&lt;span class=&quot;e24Kjd&quot;&gt;∀&lt;/span&gt;&lt;/span&gt;) saref:isValueOfProperty&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-15" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint as="offset" />
           </mxGeometry>
@@ -116,7 +116,7 @@
         <mxCell id="gThzubRPDfsPHgG1rrA1-25" value="s4grid:hasObis: xsd:string" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];dashed=1;align=left;" parent="1" vertex="1">
           <mxGeometry x="599.25" y="427" width="143.5" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-26" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-26" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="298" y="702" width="136" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-27" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -128,13 +128,13 @@
             <mxPoint x="310.0000000000002" y="820.3299999999999" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-29" value="s4grid:hasPropertyValue" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-28" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-29" value="saref:hasPropertyValue" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-28" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-30" value="saref:Property" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="500" y="778" width="120" height="30" as="geometry" />
+          <mxGeometry x="521" y="778" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-31" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="gThzubRPDfsPHgG1rrA1-36" target="gThzubRPDfsPHgG1rrA1-30" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -142,13 +142,13 @@
             <mxPoint x="668" y="701" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-32" value="&lt;div&gt;s4grid:hasProperty&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-31" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-32" value="saref:isValueOfProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-31" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="18" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-33" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="500" y="647" width="120" height="30" as="geometry" />
+          <mxGeometry x="521" y="647" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-34" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="gThzubRPDfsPHgG1rrA1-26" target="gThzubRPDfsPHgG1rrA1-33" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -156,12 +156,12 @@
             <mxPoint x="510" y="822" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-35" value="&lt;div&gt;s4grid:hasUnit&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-34" vertex="1" connectable="0">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-35" value="saref:isMeasuredIn" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="gThzubRPDfsPHgG1rrA1-34" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="21" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-36" value="s4grid:hasValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];dashed=1;align=left;" parent="1" vertex="1">
+        <mxCell id="gThzubRPDfsPHgG1rrA1-36" value="saref:hasValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];dashed=1;align=left;" parent="1" vertex="1">
           <mxGeometry x="298" y="731.9999999999999" width="136" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-37" value="saref:Meter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
@@ -192,12 +192,12 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-43" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="499.13" y="839" width="121.75" height="30" as="geometry" />
+          <mxGeometry x="520.13" y="839" width="121.75" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-44" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="gThzubRPDfsPHgG1rrA1-43" target="gThzubRPDfsPHgG1rrA1-30" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="603" y="810.9999999999999" as="sourcePoint" />
-            <mxPoint x="606" y="820" as="targetPoint" />
+            <mxPoint x="624" y="810.9999999999999" as="sourcePoint" />
+            <mxPoint x="627" y="820" as="targetPoint" />
           </mxGeometry>
         </mxCell>
       </root>
@@ -332,7 +332,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="HYgVTIpLqka7R-nskqQ4" name="Firmware">
-    <mxGraphModel dx="-234" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="6" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -374,13 +374,13 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="vdYoE8CNYUoPl0HQQ8es-10" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1764" y="320" width="86" height="30" as="geometry" />
+          <mxGeometry x="1760" y="320" width="100" height="30" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="9LeZirKQx9aQG6_ajApF" name="Network Interface">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -422,13 +422,13 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="8NRccoTkKYjIACFmHB8t-10" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="138" y="234" width="81" height="30" as="geometry" />
+          <mxGeometry x="138" y="234" width="112" height="30" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="G8NzCb6VJkkx6D05KdTC" name="Clock">
-    <mxGraphModel dx="593" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="833" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -470,7 +470,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="YTOnsjx63dZk1uOE6Jr_-10" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="960" y="380" width="80" height="30" as="geometry" />
+          <mxGeometry x="960" y="380" width="110" height="30" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
@@ -997,7 +997,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="3KGhjPKiMjUPZhHuZNzh" name="Activity Calendar">
-    <mxGraphModel dx="593" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="833" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1257,7 +1257,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="7lVgEJBkKY9gZ8TuVkJi" name="Power Line Property">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1325,7 +1325,7 @@
             <mxPoint x="324" y="320" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LYTFXZO2eoVTYku1gq08-24" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:measuresProperty&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="LYTFXZO2eoVTYku1gq08-23" vertex="1" connectable="0">
+        <mxCell id="LYTFXZO2eoVTYku1gq08-24" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:observes&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="LYTFXZO2eoVTYku1gq08-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1336,7 +1336,7 @@
             <mxPoint x="464" y="367" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LYTFXZO2eoVTYku1gq08-26" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isMeasuredByDevice&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="LYTFXZO2eoVTYku1gq08-25" vertex="1" connectable="0">
+        <mxCell id="LYTFXZO2eoVTYku1gq08-26" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isObservedBy&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="LYTFXZO2eoVTYku1gq08-25" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="-13" as="offset" />
           </mxGeometry>
@@ -1435,7 +1435,7 @@
             <mxPoint x="324" y="600" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="_m2gVA6NQlzEnRQeAKKp-24" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:measuresProperty&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="_m2gVA6NQlzEnRQeAKKp-23" vertex="1" connectable="0">
+        <mxCell id="_m2gVA6NQlzEnRQeAKKp-24" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:observes&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="_m2gVA6NQlzEnRQeAKKp-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -1446,7 +1446,7 @@
             <mxPoint x="464" y="647" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="_m2gVA6NQlzEnRQeAKKp-26" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isMeasuredByDevice&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="_m2gVA6NQlzEnRQeAKKp-25" vertex="1" connectable="0">
+        <mxCell id="_m2gVA6NQlzEnRQeAKKp-26" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isObservedBy&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="_m2gVA6NQlzEnRQeAKKp-25" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="-13" as="offset" />
           </mxGeometry>
@@ -1491,7 +1491,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="I-rUBqIKO-YYfXG5Om1x" name="Profile Generic">
-    <mxGraphModel dx="593" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="833" dy="787" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1521,7 +1521,7 @@
         <mxCell id="hc89bkI5cAVlX_-MIotH-7" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="1400" y="160" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-8" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-8" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="1400" y="230" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hc89bkI5cAVlX_-MIotH-9" value="" style="endArrow=classic;html=1;exitX=0.9;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hc89bkI5cAVlX_-MIotH-2" target="hc89bkI5cAVlX_-MIotH-6" edge="1">
@@ -1552,7 +1552,7 @@
             <mxPoint x="1330" y="525" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-14" value="&lt;div&gt;s4grid:relatedMeasurement&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hc89bkI5cAVlX_-MIotH-13" vertex="1" connectable="0">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-14" value="&lt;div&gt;s4grid:relatedObservation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hc89bkI5cAVlX_-MIotH-13" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="27" as="offset" />
           </mxGeometry>
@@ -1583,7 +1583,7 @@
         <mxCell id="hc89bkI5cAVlX_-MIotH-21" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="1324" y="483" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-22" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-22" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="1324" y="553" width="121" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hc89bkI5cAVlX_-MIotH-23" value="" style="endArrow=classic;html=1;exitX=0.9;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hc89bkI5cAVlX_-MIotH-16" target="hc89bkI5cAVlX_-MIotH-20" edge="1">
@@ -1614,7 +1614,7 @@
             <mxPoint x="1298" y="848" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-28" value="&lt;div&gt;s4grid:relatedMeasurement&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hc89bkI5cAVlX_-MIotH-27" vertex="1" connectable="0">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-28" value="&lt;div&gt;s4grid:relatedObservation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hc89bkI5cAVlX_-MIotH-27" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="27" as="offset" />
           </mxGeometry>
@@ -1623,7 +1623,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="ce7plKscNpKVN0YoRwd1" name="Services-Overview">
-    <mxGraphModel dx="1420" dy="1922" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1089" dy="1922" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1640,7 +1640,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="wBTAeAmXKWskdA0Lt4mn-3" value="&lt;div&gt;oneM2M:hasOutput&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-2" vertex="1" connectable="0">
+        <mxCell id="wBTAeAmXKWskdA0Lt4mn-3" value="&lt;div&gt;saref:hasOutput&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-2" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="59" y="3" as="offset" />
           </mxGeometry>
@@ -1658,7 +1658,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="wBTAeAmXKWskdA0Lt4mn-6" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-5" vertex="1" connectable="0">
+        <mxCell id="wBTAeAmXKWskdA0Lt4mn-6" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-5" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="40" as="offset" />
           </mxGeometry>
@@ -1730,7 +1730,7 @@
             <mxPoint x="2" y="8" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wBTAeAmXKWskdA0Lt4mn-22" value="oneM2M:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="wBTAeAmXKWskdA0Lt4mn-22" value="saref:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;" parent="1" vertex="1">
           <mxGeometry x="524" y="-1080" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="wBTAeAmXKWskdA0Lt4mn-23" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;dashed=1;" parent="1" source="wBTAeAmXKWskdA0Lt4mn-19" target="wBTAeAmXKWskdA0Lt4mn-22" edge="1">
@@ -1739,7 +1739,7 @@
             <mxPoint x="795.75" y="-948" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wBTAeAmXKWskdA0Lt4mn-24" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-23" vertex="1" connectable="0">
+        <mxCell id="wBTAeAmXKWskdA0Lt4mn-24" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="wBTAeAmXKWskdA0Lt4mn-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="6" as="offset" />
           </mxGeometry>
@@ -1833,7 +1833,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="3LcsHulGvyM4QFrY3Apt" name="Get service">
-    <mxGraphModel dx="-234" dy="-416" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="-98" dy="-93" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1862,12 +1862,12 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="UY4m5p3PhefD3EG9c2Qh-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="UY4m5p3PhefD3EG9c2Qh-3" vertex="1" connectable="0">
+        <mxCell id="UY4m5p3PhefD3EG9c2Qh-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="UY4m5p3PhefD3EG9c2Qh-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="UY4m5p3PhefD3EG9c2Qh-5" value="oneM2M:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="UY4m5p3PhefD3EG9c2Qh-5" value="saref:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;" parent="1" vertex="1">
           <mxGeometry x="2006.49" y="1670" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="UY4m5p3PhefD3EG9c2Qh-6" value="oneM2M:Device" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
@@ -1921,7 +1921,7 @@
             <mxPoint x="2067.8" y="1653" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="UY4m5p3PhefD3EG9c2Qh-21" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="UY4m5p3PhefD3EG9c2Qh-21" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="2204.2799999999997" y="1685" as="geometry" />
         </mxCell>
         <mxCell id="UY4m5p3PhefD3EG9c2Qh-22" value="s4grid:SelectiveAccess" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2007,7 +2007,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="Lge8Ax-YrdTgtg1zuTNF-10" value="oneM2M:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="Lge8Ax-YrdTgtg1zuTNF-10" value="saref:hasOutput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="2574.28" y="1640" as="geometry" />
         </mxCell>
         <mxCell id="Lge8Ax-YrdTgtg1zuTNF-11" value="s4grid:GetOperationOutput" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2137,7 +2137,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="p3AaXxes5gfZudKbeztw-80" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="p3AaXxes5gfZudKbeztw-79" vertex="1" connectable="0">
+        <mxCell id="p3AaXxes5gfZudKbeztw-80" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="p3AaXxes5gfZudKbeztw-79" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
@@ -2165,7 +2165,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="p3AaXxes5gfZudKbeztw-84" value="oneM2M:hasOutput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="p3AaXxes5gfZudKbeztw-84" value="saref:hasOutput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="2484.2799999999997" y="1280" as="geometry" />
         </mxCell>
         <mxCell id="p3AaXxes5gfZudKbeztw-85" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.7;exitY=0;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="p3AaXxes5gfZudKbeztw-49" target="p3AaXxes5gfZudKbeztw-59" edge="1">
@@ -2178,7 +2178,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="p3AaXxes5gfZudKbeztw-86" value="oneM2M:hasInput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="p3AaXxes5gfZudKbeztw-86" value="saref:hasInput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="2324.2799999999997" y="1310" as="geometry" />
         </mxCell>
         <mxCell id="MK8SGlBonqbYGOvGf8Ac-2" value="s4grid:RangeDescriptor" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2197,7 +2197,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="X_Gde6arEc2U97pXeakK" name="Set service">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1089" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2226,12 +2226,12 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="ymajf1u4WVUhnZJ3Aq9y-3" vertex="1" connectable="0">
+        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="ymajf1u4WVUhnZJ3Aq9y-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-5" value="oneM2M:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-5" value="saref:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;" parent="1" vertex="1">
           <mxGeometry x="318.48" y="430" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="ymajf1u4WVUhnZJ3Aq9y-6" value="oneM2M:Device" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
@@ -2285,7 +2285,7 @@
             <mxPoint x="379.78999999999996" y="413" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-18" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-18" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="555.9899999999996" y="445" as="geometry" />
         </mxCell>
         <mxCell id="ymajf1u4WVUhnZJ3Aq9y-22" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="ymajf1u4WVUhnZJ3Aq9y-31" target="ymajf1u4WVUhnZJ3Aq9y-16" edge="1">
@@ -2412,7 +2412,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-42" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="ml750XWidTsMEYCA3FV2-41" vertex="1" connectable="0">
+        <mxCell id="ml750XWidTsMEYCA3FV2-42" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="ml750XWidTsMEYCA3FV2-41" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
@@ -2427,14 +2427,14 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-44" value="oneM2M:hasInput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="ml750XWidTsMEYCA3FV2-44" value="saref:hasInput (1..1)" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="513.9999999999998" y="110" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="PLNgzRsWFFMttXSUcTWf" name="Action service">
-    <mxGraphModel dx="2247" dy="-1585" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1916" dy="-1585" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2463,12 +2463,12 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="XwRDZ1KnKvy4vy_mBu6z-3" vertex="1" connectable="0">
+        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="XwRDZ1KnKvy4vy_mBu6z-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-5" value="oneM2M:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
+        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-5" value="saref:Operation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;" parent="1" vertex="1">
           <mxGeometry x="-483.51" y="2970" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="XwRDZ1KnKvy4vy_mBu6z-6" value="oneM2M:Device" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];" parent="1" vertex="1">
@@ -2522,7 +2522,7 @@
             <mxPoint x="-422.20000000000005" y="2953" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-18" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-18" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="-246.00000000000045" y="2985" as="geometry" />
         </mxCell>
         <mxCell id="XwRDZ1KnKvy4vy_mBu6z-19" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="XwRDZ1KnKvy4vy_mBu6z-28" target="XwRDZ1KnKvy4vy_mBu6z-16" edge="1">
@@ -2667,7 +2667,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-4" value="&lt;div&gt;oneM2M:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="tH0bkFI3j6yPcat26ZQL-3" vertex="1" connectable="0">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-4" value="&lt;div&gt;saref:hasOperation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="tH0bkFI3j6yPcat26ZQL-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
@@ -2678,24 +2678,24 @@
             <mxPoint x="-179.01" y="2502.17" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-6" value="oneM2M:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-6" value="saref:hasInput" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="1" vertex="1" connectable="0">
           <mxGeometry x="-309.08000000000044" y="2506" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="ce41JE-ia9TNi69TphpT" name="Overview 1">
-    <mxGraphModel dx="1420" dy="753" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1037" dy="717" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="hH1hdK6_R2So6OFxHRcg-1" value="s4grid:Firmware" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="330" width="160" height="30" as="geometry" />
+          <mxGeometry x="857" y="330" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-2" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1140" y="285" as="sourcePoint" />
-            <mxPoint x="1101" y="225" as="targetPoint" />
+            <mxPoint x="717" y="285" as="sourcePoint" />
+            <mxPoint x="678" y="225" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-3" value="&lt;div&gt;s4grid:hasFirmware&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-2" vertex="1" connectable="0">
@@ -2704,12 +2704,12 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-4" value="s4grid:NetworkInterface" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="380" width="160" height="30" as="geometry" />
+          <mxGeometry x="857" y="380" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-5" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-4" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1110" y="435" as="sourcePoint" />
-            <mxPoint x="1124" y="515" as="targetPoint" />
+            <mxPoint x="687" y="435" as="sourcePoint" />
+            <mxPoint x="701" y="515" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-6" value="&lt;div&gt;s4grid:hasNetworkInterface&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-5" vertex="1" connectable="0">
@@ -2718,12 +2718,12 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-7" value="saref:State" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="761.25" y="149.9999999999999" width="100" height="30" as="geometry" />
+          <mxGeometry x="368.25" y="149.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-8" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;dashed=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-15" target="hH1hdK6_R2So6OFxHRcg-7" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1000" y="165" as="sourcePoint" />
-            <mxPoint x="640" y="130" as="targetPoint" />
+            <mxPoint x="577" y="165" as="sourcePoint" />
+            <mxPoint x="217" y="130" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-9" value="&lt;div&gt;saref:hasState&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-8" vertex="1" connectable="0">
@@ -2732,18 +2732,18 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-10" value="s4grid:BreakerState" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="740" y="270" width="142.5" height="30" as="geometry" />
+          <mxGeometry x="347" y="270" width="142.5" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-11" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-10" target="hH1hdK6_R2So6OFxHRcg-7" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="220" y="280" as="sourcePoint" />
-            <mxPoint x="220" y="240" as="targetPoint" />
+            <mxPoint x="-173" y="280" as="sourcePoint" />
+            <mxPoint x="-173" y="240" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-12" value="" style="endArrow=classic;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;dashed=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-10" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1000" y="283" as="sourcePoint" />
-            <mxPoint x="470" y="85" as="targetPoint" />
+            <mxPoint x="577" y="283" as="sourcePoint" />
+            <mxPoint x="47" y="85" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-13" value="&lt;div&gt;saref:hasState&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-12" vertex="1" connectable="0">
@@ -2752,33 +2752,33 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-14" value="saref:Meter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="209.9999999999999" width="100" height="30" as="geometry" />
+          <mxGeometry x="597" y="209.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-15" value="saref:Device" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="149.9999999999999" width="100" height="30" as="geometry" />
+          <mxGeometry x="597" y="149.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-16" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-14" target="hH1hdK6_R2So6OFxHRcg-15" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1070" y="139.9999999999999" as="sourcePoint" />
-            <mxPoint x="1210" y="120" as="targetPoint" />
+            <mxPoint x="647" y="139.9999999999999" as="sourcePoint" />
+            <mxPoint x="787" y="120" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-17" value="s4grid:GridMeter" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="269.9999999999999" width="100" height="30" as="geometry" />
+          <mxGeometry x="597" y="269.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-18" value="" style="endArrow=block;html=1;fontColor=#000099;exitX=0.5;exitY=0;exitDx=0;exitDy=0;endFill=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-14" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1390" y="330" as="sourcePoint" />
-            <mxPoint x="1080" y="250" as="targetPoint" />
+            <mxPoint x="967" y="330" as="sourcePoint" />
+            <mxPoint x="657" y="250" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-19" value="s4grid:Clock" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="430" width="160" height="30" as="geometry" />
+          <mxGeometry x="857" y="430" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-20" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-19" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1080" y="310" as="sourcePoint" />
-            <mxPoint x="1340" y="359" as="targetPoint" />
+            <mxPoint x="657" y="310" as="sourcePoint" />
+            <mxPoint x="917" y="359" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-21" value="s4grid:hasClock" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-20" vertex="1" connectable="0">
@@ -2786,39 +2786,39 @@
             <mxPoint x="78" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hH1hdK6_R2So6OFxHRcg-22" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="270" width="160" height="30" as="geometry" />
+        <mxCell id="hH1hdK6_R2So6OFxHRcg-22" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
+          <mxGeometry x="857" y="270" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-23" value="saref:Property" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="1481" y="210" width="160" height="30" as="geometry" />
+          <mxGeometry x="1081" y="210" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-24" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hH1hdK6_R2So6OFxHRcg-22" target="hH1hdK6_R2So6OFxHRcg-23" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1166" y="509" as="sourcePoint" />
-            <mxPoint x="1420" y="509" as="targetPoint" />
+            <mxPoint x="743" y="509" as="sourcePoint" />
+            <mxPoint x="997" y="509" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hH1hdK6_R2So6OFxHRcg-25" value="&lt;div&gt;s4grid:hasProperty&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-24" vertex="1" connectable="0">
+        <mxCell id="hH1hdK6_R2So6OFxHRcg-25" value="saref:isValueOfProperty" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-24" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="27" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-26" value="s4grid:MeterProperty" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="1481" y="270" width="160" height="30" as="geometry" />
+          <mxGeometry x="1081" y="270" width="160" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-27" value="" style="endArrow=block;html=1;fontColor=#000099;endFill=0;endSize=8;arcSize=0;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="hH1hdK6_R2So6OFxHRcg-26" target="hH1hdK6_R2So6OFxHRcg-23" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1442" y="273" as="sourcePoint" />
-            <mxPoint x="1440" y="240" as="targetPoint" />
+            <mxPoint x="1042" y="273" as="sourcePoint" />
+            <mxPoint x="1040" y="240" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="hH1hdK6_R2So6OFxHRcg-28" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="hH1hdK6_R2So6OFxHRcg-17" target="hH1hdK6_R2So6OFxHRcg-22" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1070" y="625" as="sourcePoint" />
-            <mxPoint x="1360" y="733" as="targetPoint" />
+            <mxPoint x="647" y="625" as="sourcePoint" />
+            <mxPoint x="937" y="733" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hH1hdK6_R2So6OFxHRcg-29" value="&lt;div&gt;s4grid:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-28" vertex="1" connectable="0">
+        <mxCell id="hH1hdK6_R2So6OFxHRcg-29" value="&lt;div&gt;saref:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="hH1hdK6_R2So6OFxHRcg-28" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="3" as="offset" />
           </mxGeometry>
@@ -2827,7 +2827,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="OtFNykTdnFaeaEVrI7Rf" name="Overview 2">
-    <mxGraphModel dx="1420" dy="-416" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="1660" dy="-382" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2837,7 +2837,7 @@
         <mxCell id="fc7WsreWl8LRgYKGyhmU-2" value="s4grid:PowerLine" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="1512" y="1270" width="104" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-3" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-3" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="652.5" y="1200" width="115" height="30" as="geometry" />
         </mxCell>
         <mxCell id="fc7WsreWl8LRgYKGyhmU-4" value="saref:Property" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
@@ -2886,7 +2886,7 @@
             <mxPoint x="1285" y="1405" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-14" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:measuresProperty&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="fc7WsreWl8LRgYKGyhmU-13" vertex="1" connectable="0">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-14" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:observes&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="fc7WsreWl8LRgYKGyhmU-13" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="13" as="offset" />
           </mxGeometry>
@@ -2897,7 +2897,7 @@
             <mxPoint x="1065" y="1429" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-16" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isMeasuredByDevice&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="fc7WsreWl8LRgYKGyhmU-15" vertex="1" connectable="0">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-16" value="&lt;div style=&quot;font-size: 12px;&quot;&gt;saref:isObservedBy&lt;/div&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="fc7WsreWl8LRgYKGyhmU-15" vertex="1" connectable="0">
           <mxGeometry x="-0.1912" y="-1" relative="1" as="geometry">
             <mxPoint x="-13" as="offset" />
           </mxGeometry>
@@ -2914,7 +2914,7 @@
             <mxPoint x="1566" y="1095" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-19" value="s4grid:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-19" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#FFF2CC;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="795" y="1400" width="120" height="30" as="geometry" />
         </mxCell>
         <mxCell id="fc7WsreWl8LRgYKGyhmU-20" value="s4grid:ProfileGeneric" style="rounded=0;whiteSpace=wrap;html=1;snapToPoint=1;points=[[0.1,0],[0.2,0],[0.3,0],[0.4,0],[0.5,0],[0.6,0],[0.7,0],[0.8,0],[0.9,0],[0,0.1],[0,0.3],[0,0.5],[0,0.7],[0,0.9],[0.1,1],[0.2,1],[0.3,1],[0.4,1],[0.5,1],[0.6,1],[0.7,1],[0.8,1],[0.9,1],[1,0.1],[1,0.3],[1,0.5],[1,0.7],[1,0.9]];fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
@@ -2937,7 +2937,7 @@
             <mxPoint x="736" y="1082.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-24" value="&lt;div&gt;s4grid:relatedMeasurement&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="fc7WsreWl8LRgYKGyhmU-23" vertex="1" connectable="0">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-24" value="&lt;div&gt;s4grid:relatedObservation&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="fc7WsreWl8LRgYKGyhmU-23" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-2" y="-1" as="offset" />
           </mxGeometry>
@@ -2986,7 +2986,7 @@
             <mxPoint x="1055" y="1508" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-33" value="&lt;div&gt;s4grid:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="fc7WsreWl8LRgYKGyhmU-32" vertex="1" connectable="0">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-33" value="&lt;div&gt;saref:hasPropertyValue&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="fc7WsreWl8LRgYKGyhmU-32" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint y="-17" as="offset" />
           </mxGeometry>
diff --git a/documentation/diagrams/SAREF4GRID_Action_service.png b/documentation/diagrams/SAREF4GRID_Action_service.png
index 65cb6a290fc884394f36dd3b5036a13abac4e05c..2a977fcc91c9586f723ef248520dd2591167d7e6 100644
Binary files a/documentation/diagrams/SAREF4GRID_Action_service.png and b/documentation/diagrams/SAREF4GRID_Action_service.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Activity_calendar.png b/documentation/diagrams/SAREF4GRID_Activity_calendar.png
index fd5386f8c9148929e505e9a7b7a30cfe8b52d13b..4d77e413e0aefea59143e3315742b5f160ed4a06 100644
Binary files a/documentation/diagrams/SAREF4GRID_Activity_calendar.png and b/documentation/diagrams/SAREF4GRID_Activity_calendar.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Breaker_state.png b/documentation/diagrams/SAREF4GRID_Breaker_state.png
index f38ccf6266d8869e4a2ee506e2dbd3ca758085b7..4b5495da23a8aa86d8f9cf8012d4bb8d125c4e8d 100644
Binary files a/documentation/diagrams/SAREF4GRID_Breaker_state.png and b/documentation/diagrams/SAREF4GRID_Breaker_state.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Clock.png b/documentation/diagrams/SAREF4GRID_Clock.png
index 0731ac655c5f2821bbbde0ae4b688432ca02d20f..838b1ab1de9d10753ac4f0572acce2026ca5a109 100644
Binary files a/documentation/diagrams/SAREF4GRID_Clock.png and b/documentation/diagrams/SAREF4GRID_Clock.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Electric_grid_meter.png b/documentation/diagrams/SAREF4GRID_Electric_grid_meter.png
index e1c7c0645ca2ebacd7cc2d49252179dd05b2f5b1..b0ae945f1fd12c46b7b86e4c3107ae451be0a23d 100644
Binary files a/documentation/diagrams/SAREF4GRID_Electric_grid_meter.png and b/documentation/diagrams/SAREF4GRID_Electric_grid_meter.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Energy_and_power_properties.png b/documentation/diagrams/SAREF4GRID_Energy_and_power_properties.png
index b9748b53c30accf19c71f3aaee35051f5419a281..d1d0640779a774a9bce5d828167333d09ff52ec8 100644
Binary files a/documentation/diagrams/SAREF4GRID_Energy_and_power_properties.png and b/documentation/diagrams/SAREF4GRID_Energy_and_power_properties.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_action_1.png b/documentation/diagrams/SAREF4GRID_Example_action_1.png
index 276f345807891c11d6d63461ee2968b08a3e0a37..9fd032b2f5a7f9ee707dcb8761112d17750819bd 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_action_1.png and b/documentation/diagrams/SAREF4GRID_Example_action_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_action_2.png b/documentation/diagrams/SAREF4GRID_Example_action_2.png
index b961a89b783639720cf92a5b6c846f2949a37fe4..0f5ba18d74d63fb429e431445ead8be42929ba9b 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_action_2.png and b/documentation/diagrams/SAREF4GRID_Example_action_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_action_3.png b/documentation/diagrams/SAREF4GRID_Example_action_3.png
index 8c6030764a92e3492f185fd96dc3168c2935380b..64d1fa15f15c31350085dd9977feabcb27bb6e84 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_action_3.png and b/documentation/diagrams/SAREF4GRID_Example_action_3.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_activity_calendar.png b/documentation/diagrams/SAREF4GRID_Example_activity_calendar.png
index 6fb3702e67eef8f910c9c68459e5bb595ad51a34..bf68839fd5ae775b41094d9b8f780f4e98854dc1 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_activity_calendar.png and b/documentation/diagrams/SAREF4GRID_Example_activity_calendar.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_breaker_state.png b/documentation/diagrams/SAREF4GRID_Example_breaker_state.png
index 4e31c076d57b623a598e7a863242ce08a6a24723..9deaefb09d6ddd3806cb64ace5afbf96fe8c296c 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_breaker_state.png and b/documentation/diagrams/SAREF4GRID_Example_breaker_state.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_clock.png b/documentation/diagrams/SAREF4GRID_Example_clock.png
index f0b19421d7ef7fc86b28c2260b5457997ab2a71a..2d15267ddeca20c6f2996c1553216714410bee66 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_clock.png and b/documentation/diagrams/SAREF4GRID_Example_clock.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_firmware.png b/documentation/diagrams/SAREF4GRID_Example_firmware.png
index 6552052f9d7b8a704dc79c301b8b754ac39dc2f6..b09650f99646058965a50cecb64e9039f375f2e4 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_firmware.png and b/documentation/diagrams/SAREF4GRID_Example_firmware.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_get_1.png b/documentation/diagrams/SAREF4GRID_Example_get_1.png
index 5a4f053863e91ee6ceae96e93a7dbd96a0dd8cad..84e0e9f296f1d49863e164dd1940a6222e7c0689 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_get_1.png and b/documentation/diagrams/SAREF4GRID_Example_get_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_get_2.png b/documentation/diagrams/SAREF4GRID_Example_get_2.png
index c6af7fa61d48b1f6bba98d51c0c82af1f508e72e..519c86d0cbe70545fab03a127137813544e10fcb 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_get_2.png and b/documentation/diagrams/SAREF4GRID_Example_get_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_get_3.png b/documentation/diagrams/SAREF4GRID_Example_get_3.png
index 177bb72aebeb7978659c5445ccc779ddf68173a9..5d14396f775f99de4d7707cdf11db0fd52b589ec 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_get_3.png and b/documentation/diagrams/SAREF4GRID_Example_get_3.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_get_4.png b/documentation/diagrams/SAREF4GRID_Example_get_4.png
index d1eaa5d2c6b48a2bda61b81147a19fb50bd3f1a4..fc0a5f57da3e7c761cc6fd751c8a896fbd56c3b9 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_get_4.png and b/documentation/diagrams/SAREF4GRID_Example_get_4.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_get_5.png b/documentation/diagrams/SAREF4GRID_Example_get_5.png
index 21e30d990e6ade31887288d2c3e7088185797b82..0befc053129177c459d25a18d431af7616220da7 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_get_5.png and b/documentation/diagrams/SAREF4GRID_Example_get_5.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_measurement_1.png b/documentation/diagrams/SAREF4GRID_Example_measurement_1.png
index 025f9d0062dbe58290bbe6cda188105044e987d8..154d842be3a8bb8f38f69da5e55c958e4c8e32dc 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_measurement_1.png and b/documentation/diagrams/SAREF4GRID_Example_measurement_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_measurement_2.png b/documentation/diagrams/SAREF4GRID_Example_measurement_2.png
index 1fdeafd2b64c71c90c626f88432244e2f4baac8a..e538ced5e0ec61ba42cfbcc707029f7e72bf1608 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_measurement_2.png and b/documentation/diagrams/SAREF4GRID_Example_measurement_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_meter_1.png b/documentation/diagrams/SAREF4GRID_Example_meter_1.png
index 3dd28a23e2a354adf8dac7049f1b6b891805ab3c..c1959237c030727f220d0a50d184fc107b06ef51 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_meter_1.png and b/documentation/diagrams/SAREF4GRID_Example_meter_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_meter_2.png b/documentation/diagrams/SAREF4GRID_Example_meter_2.png
index 0d0c9a9d2bcadedd32954caf2dcc7616f12afbe7..d6be1f57b3147f8ff453019e9da8ccdf6d6f4fc4 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_meter_2.png and b/documentation/diagrams/SAREF4GRID_Example_meter_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_network_interface.png b/documentation/diagrams/SAREF4GRID_Example_network_interface.png
index 5b3a8da78eda51090bcbe1a4907ef70b96e0a85a..c841ef119320d14bdcd04bb2546bcd59c0fb0936 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_network_interface.png and b/documentation/diagrams/SAREF4GRID_Example_network_interface.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_profile.png b/documentation/diagrams/SAREF4GRID_Example_profile.png
index 84cc13d89f7500d9cc8a9fece864a099bbb3bc43..490488b11620b0cbb3f725b82561d611dc3fa3c1 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_profile.png and b/documentation/diagrams/SAREF4GRID_Example_profile.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_script.png b/documentation/diagrams/SAREF4GRID_Example_script.png
index 37fda2353cdd37c23ae5aaed46dfc438ffdefdb5..9fe6887adec5cbab7208a4e1725a511651956d7f 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_script.png and b/documentation/diagrams/SAREF4GRID_Example_script.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_set_1.png b/documentation/diagrams/SAREF4GRID_Example_set_1.png
index 4dd7a1ca5121ba10f2cb90e62899074d6bb1efcb..9bb508f9eb3ba8db981131dc5d8112985a566630 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_set_1.png and b/documentation/diagrams/SAREF4GRID_Example_set_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_set_2.png b/documentation/diagrams/SAREF4GRID_Example_set_2.png
index b6117f442cceb0cfaad2c64605cbac67918dd188..4527682904df41a5c607ae406c2b3aeabe4661e6 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_set_2.png and b/documentation/diagrams/SAREF4GRID_Example_set_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Example_set_3.png b/documentation/diagrams/SAREF4GRID_Example_set_3.png
index ad21cae0f2b2eaba8cd037219ba8525e29dbe5b3..46f6ad099724f57a98e8df6975d2b4091fd30362 100644
Binary files a/documentation/diagrams/SAREF4GRID_Example_set_3.png and b/documentation/diagrams/SAREF4GRID_Example_set_3.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Firmware.png b/documentation/diagrams/SAREF4GRID_Firmware.png
index 62bc8255325bba683c80b9a8537cbd634fabbc38..decfc5932ccc1c01043ff37ff1ce5b9399972c49 100644
Binary files a/documentation/diagrams/SAREF4GRID_Firmware.png and b/documentation/diagrams/SAREF4GRID_Firmware.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Get_service.png b/documentation/diagrams/SAREF4GRID_Get_service.png
index 763f1b39e1026b74cd1c2fb266d11769a57d5f21..9abf70895437159830dbb5035285905d3c8226e8 100644
Binary files a/documentation/diagrams/SAREF4GRID_Get_service.png and b/documentation/diagrams/SAREF4GRID_Get_service.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Network_interface.png b/documentation/diagrams/SAREF4GRID_Network_interface.png
index e75ef33242e2b2a64c5f98f5f8fc4872001e178c..3e13dc0d5d3f261f965170532a9dbcb99b0126f3 100644
Binary files a/documentation/diagrams/SAREF4GRID_Network_interface.png and b/documentation/diagrams/SAREF4GRID_Network_interface.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Overview_1.png b/documentation/diagrams/SAREF4GRID_Overview_1.png
index 0d4ffff736b1c2b87ac6b14cba29d8cde7aa4078..4830961681c5e1b619fb61d1338d9137baa659bd 100644
Binary files a/documentation/diagrams/SAREF4GRID_Overview_1.png and b/documentation/diagrams/SAREF4GRID_Overview_1.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Overview_2.png b/documentation/diagrams/SAREF4GRID_Overview_2.png
index 2e1ed17646cc588665e934014cc07b85a526ee72..5763bc4f2cffa91b772a420cf6c05ec6a61e96cb 100644
Binary files a/documentation/diagrams/SAREF4GRID_Overview_2.png and b/documentation/diagrams/SAREF4GRID_Overview_2.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Overview_3.png b/documentation/diagrams/SAREF4GRID_Overview_3.png
index 0618e45c56f6ddb0c0fbff9d52d3d6bca416f890..6790b230b96a671ed7515d0f4c9879f070761cc0 100644
Binary files a/documentation/diagrams/SAREF4GRID_Overview_3.png and b/documentation/diagrams/SAREF4GRID_Overview_3.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Overview_4.png b/documentation/diagrams/SAREF4GRID_Overview_4.png
index e32d55f014e828ba1657b22e09245eefa19914e7..a705f7234f0e7b39e9868de98a35109690030a78 100644
Binary files a/documentation/diagrams/SAREF4GRID_Overview_4.png and b/documentation/diagrams/SAREF4GRID_Overview_4.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Profile_generic.png b/documentation/diagrams/SAREF4GRID_Profile_generic.png
index 1b82cb75b13fe482aa30ee802f73d770680261ef..11b46875495800e9b098b72df4ece50caf5aa356 100644
Binary files a/documentation/diagrams/SAREF4GRID_Profile_generic.png and b/documentation/diagrams/SAREF4GRID_Profile_generic.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Quality_properties.png b/documentation/diagrams/SAREF4GRID_Quality_properties.png
index 782c1e210ccbfca4dbc89510e47e83f289087011..13d07efee095593df200adc70a80bb3d81fc2ac0 100644
Binary files a/documentation/diagrams/SAREF4GRID_Quality_properties.png and b/documentation/diagrams/SAREF4GRID_Quality_properties.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Scheduled_action.png b/documentation/diagrams/SAREF4GRID_Scheduled_action.png
index 30a4efb73cee90b41f70359b870e05cab680dcd2..c0d51ffa95c31d7e33d9db7ecac07fc2116c3cb9 100644
Binary files a/documentation/diagrams/SAREF4GRID_Scheduled_action.png and b/documentation/diagrams/SAREF4GRID_Scheduled_action.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Script_table.png b/documentation/diagrams/SAREF4GRID_Script_table.png
index 7b8856a05579c3c6abfddedb11c1a25587b7857d..4b7e83e0e81a31e21cbd12d54e0bc102490d52f0 100644
Binary files a/documentation/diagrams/SAREF4GRID_Script_table.png and b/documentation/diagrams/SAREF4GRID_Script_table.png differ
diff --git a/documentation/diagrams/SAREF4GRID_Set_service.png b/documentation/diagrams/SAREF4GRID_Set_service.png
index 92fc1a0032a38e2352f258a229cdb0a5c806ee55..2764f9bc3c34816be73c7be8670d7e67ab138745 100644
Binary files a/documentation/diagrams/SAREF4GRID_Set_service.png and b/documentation/diagrams/SAREF4GRID_Set_service.png differ
diff --git a/examples/Measurements.ttl b/examples/Measurements.ttl
index 74a6a3b3a2df2c6d3aa3c82973659d58d48387ce..7abd6209b70e068cb02992cab860f5780e9af025 100644
--- a/examples/Measurements.ttl
+++ b/examples/Measurements.ttl
@@ -27,6 +27,8 @@ saref:madeExecution a owl:ObjectProperty .
 
 saref:hasProperty a owl:ObjectProperty .
 
+saref:hasResult a owl:ObjectProperty .
+
 saref:isMeasuredIn a owl:ObjectProperty .
 
 saref:isPropertyOf a owl:ObjectProperty .
@@ -84,10 +86,13 @@ s4grid:DemandRegister a s4grid:EnergyAndPowerProperty,
 ex:MaximumDemandRegisterImportC1TP1Observation136 a saref:Observation,
         owl:NamedIndividual ;
     saref:hasTimestamp "2023-10-20T21:01:10"^^xsd:dateTime ;
-    saref:hasValue "5"^^xsd:unsignedLong ;
-    saref:isMeasuredIn om:watt ;
+    saref:hasResult ex:5Watt ;
 	saref:observes ex:MaximumDemandRegisterImportC1TP1 .
 
+ex:5Watt a saref:PropertyValue ;
+    saref:hasValue "5"^^xsd:unsignedLong ;
+    saref:isMeasuredIn om:watt .	
+
 ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     saref:madeExecution ex:TotalIncrementalActiveEnergyImportObservation123,
@@ -106,10 +111,13 @@ ex:MaximumDemandRegisterImportC1TP1 a s4grid:EnergyAndPowerProperty,
 ex:TotalIncrementalActiveEnergyImportObservation123 a saref:Observation,
         owl:NamedIndividual ;
     saref:hasTimestamp "2023-10-20T21:01:10"^^xsd:dateTime ;
-    saref:hasValue "5"^^xsd:unsignedLong ;
-    saref:isMeasuredIn om:wattHour ;
+    saref:hasResult ex:5WattHour ;
 	saref:observes ex:TotalIncrementalActiveEnergyImport .
 
+ex:5WattHour a saref:PropertyValue ;
+    saref:hasValue "5"^^xsd:unsignedLong ;
+    saref:isMeasuredIn om:wattHour .	
+
 ex:SubstationLine23 a s4grid:PowerLine,
         owl:NamedIndividual ;
     saref:hasProperty ex:MaximumDemandRegisterImportC1TP1,