From 83d982f566594125feab67babefef4777033b4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Garc=C3=ADa=20Castro?= <rgarcia@fi.upm.es>
Date: Thu, 25 Apr 2024 16:26:21 +0200
Subject: [PATCH] Renamed s4grid:Meter with s4grid:GridMeter.

---
 diagrams/SAREF4GRID examples.xml              |  70 ++---
 diagrams/SAREF4GRID figures.xml               | 240 +++++++++---------
 documentation/description.html                |   2 +-
 examples/Action.ttl                           |   4 +-
 examples/ActivityCalendar.ttl                 |   4 +-
 examples/BreakerState.ttl                     |   4 +-
 examples/Clock.ttl                            |   4 +-
 examples/Firmware.ttl                         |   4 +-
 examples/Get.ttl                              |   4 +-
 examples/Measurements.ttl                     |   4 +-
 examples/NetworkInterface.ttl                 |   4 +-
 examples/ProfileGeneric.ttl                   |   4 +-
 examples/PropertyValues.ttl                   |   4 +-
 examples/ScriptTable_SingleActionSchedule.ttl |   4 +-
 examples/Set.ttl                              |   4 +-
 ontology/saref4grid.ttl                       |  18 +-
 tests/tests.csv                               | 146 +++++------
 17 files changed, 262 insertions(+), 262 deletions(-)

diff --git a/diagrams/SAREF4GRID examples.xml b/diagrams/SAREF4GRID examples.xml
index 8530ad9..7632195 100644
--- a/diagrams/SAREF4GRID examples.xml	
+++ b/diagrams/SAREF4GRID examples.xml	
@@ -1,10 +1,10 @@
-<mxfile host="app.diagrams.net" modified="2023-10-19T09:11:26.888Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36" etag="jtrYi4reZfXlEMxkd0Fu" version="22.0.5" type="device" pages="12">
+<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="1221" dy="1878" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="EovbIy0NGflAQaJYc6TK-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -158,7 +158,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="EovbIy0NGflAQaJYc6TK-31" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -181,11 +181,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="A_r--za1B4y3ghjr__DO" name="Firmware">
-    <mxGraphModel dx="2607" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="i0GKpCLRo_s5J3K9x4Ag-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="i0GKpCLRo_s5J3K9x4Ag-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="100" y="230" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="i0GKpCLRo_s5J3K9x4Ag-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">
@@ -264,11 +264,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="IacRrOIRQrnDiarez3ik" name="Network Interface">
-    <mxGraphModel dx="2868" dy="1564" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="AmKfL7YFRLVTVCTpOpFW-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="AmKfL7YFRLVTVCTpOpFW-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="100" y="230" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="AmKfL7YFRLVTVCTpOpFW-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">
@@ -321,11 +321,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="P9RxAFtGG_ub73rfMHYp" name="Clock">
-    <mxGraphModel dx="2607" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="S0erdF2h65B93rT5bqcW-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -465,11 +465,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="wfcbmZf7GnxYsOdtUIiX" name="Connectivity State">
-    <mxGraphModel dx="2607" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="tyYUNNKnE5M3B1T01rYa-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="tyYUNNKnE5M3B1T01rYa-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="245" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="tyYUNNKnE5M3B1T01rYa-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">
@@ -548,11 +548,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="lrL5THFkw-6iNbGlZz8n" name="Script Table and Single Scheduled Action">
-    <mxGraphModel dx="2607" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="xfap3eHffdkBt1u9Xu-x-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="xfap3eHffdkBt1u9Xu-x-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="64" y="280" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="xfap3eHffdkBt1u9Xu-x-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">
@@ -677,11 +677,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="a4cnNXSlPwZuV84DJe1K" name="ActivityCalendar">
-    <mxGraphModel dx="1780" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="EtD4LTUsVNLmKn0oSO0F-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="EtD4LTUsVNLmKn0oSO0F-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="955" y="60" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="EtD4LTUsVNLmKn0oSO0F-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">
@@ -1038,7 +1038,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="E8k2KVbBWa5BwWXB3SHF" name="Measurements">
-    <mxGraphModel dx="2607" dy="1422" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1057,7 +1057,7 @@
         <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" />
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-6" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -1227,7 +1227,7 @@
         <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" />
         </mxCell>
-        <mxCell id="KFuXAu45WO3QxNMIKkzj-41" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -1386,7 +1386,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="buOlGK0-Hgljydil1Zkz" name="Profile Generic">
-    <mxGraphModel dx="1434" dy="1951" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1472,7 +1472,7 @@
         <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" />
         </mxCell>
-        <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-23" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </mxCell>
         <mxCell id="5hJUQ4Lq3hfWGbKeNYC9-24" 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">
@@ -1962,11 +1962,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="MPaOKqoqY4o5YMpdCesM" name="Get">
-    <mxGraphModel dx="1221" dy="-460" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-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="175.04" y="1220" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-2" value="s4grid:GetService" 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">
@@ -2065,7 +2065,7 @@
             <mxPoint x="2" y="-1" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-28" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-28" 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="215.03999999999988" y="1740" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-29" value="s4grid:GetService" 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">
@@ -2186,7 +2186,7 @@
             <mxPoint x="4" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="3KCFvYQO4Nr7krEiYYHR-55" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="3KCFvYQO4Nr7krEiYYHR-55" 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="239.9999999999999" y="2300" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="3KCFvYQO4Nr7krEiYYHR-56" value="s4grid:GetService" 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">
@@ -2307,7 +2307,7 @@
             <mxPoint x="4" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="8vjx8haa6S1OWs389tPF-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="250.5" y="2860" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-2" value="s4grid:GetService" 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">
@@ -2457,7 +2457,7 @@
             <mxPoint y="2" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8vjx8haa6S1OWs389tPF-35" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="8vjx8haa6S1OWs389tPF-35" 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="249.64" y="3542" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="8vjx8haa6S1OWs389tPF-36" value="s4grid:GetService" 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">
@@ -2611,11 +2611,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="9S_0XkBk5Ece6Eh6iYSa" name="Set">
-    <mxGraphModel dx="3585" dy="786" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="cRODiDYps_-aIpgkGI7D-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-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="165.5" y="1294" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-2" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="cRODiDYps_-aIpgkGI7D-6" target="cRODiDYps_-aIpgkGI7D-17" edge="1">
@@ -2707,7 +2707,7 @@
             <mxPoint x="9" y="4" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-24" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-24" 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="170.25" y="1810" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-25" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="cRODiDYps_-aIpgkGI7D-29" target="cRODiDYps_-aIpgkGI7D-37" edge="1">
@@ -2817,7 +2817,7 @@
             <mxPoint x="4" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="cRODiDYps_-aIpgkGI7D-47" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="cRODiDYps_-aIpgkGI7D-47" 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="201.25" y="2380" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="cRODiDYps_-aIpgkGI7D-48" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="cRODiDYps_-aIpgkGI7D-52" target="cRODiDYps_-aIpgkGI7D-60" edge="1">
@@ -2931,7 +2931,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="Jap849RCaIH-MPOWFI4q" name="Action">
-    <mxGraphModel dx="3585" dy="-383" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -3003,7 +3003,7 @@
             <mxPoint x="4" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-13" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="zWe-Fob3svy6_8LgFvBg-13" 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="100" y="2380" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="zWe-Fob3svy6_8LgFvBg-14" 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">
@@ -3059,7 +3059,7 @@
         <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">
           <mxGeometry x="131.84999999999977" y="3190" as="geometry" />
         </mxCell>
-        <mxCell id="zWe-Fob3svy6_8LgFvBg-27" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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">
           <mxGeometry x="81.85" y="2890" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="zWe-Fob3svy6_8LgFvBg-28" 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">
@@ -3187,7 +3187,7 @@
         <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">
           <mxGeometry x="123.99999999999977" y="3730" as="geometry" />
         </mxCell>
-        <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-7" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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">
           <mxGeometry x="73.85" y="3430" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="Vpv4RqKUIZq4zGzb4WJ4-8" 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">
diff --git a/diagrams/SAREF4GRID figures.xml b/diagrams/SAREF4GRID figures.xml
index 82270ee..0b11541 100644
--- a/diagrams/SAREF4GRID figures.xml	
+++ b/diagrams/SAREF4GRID figures.xml	
@@ -1,13 +1,13 @@
-<mxfile host="app.diagrams.net" modified="2023-10-19T09:10:24.922Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36" etag="nWWs7RWaNmtZlBfzMpl4" version="22.0.5" type="device" pages="18">
+<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">
   <diagram name="Property Value" id="VVmcOrx2moW8US6HTCOu">
-    <mxGraphModel dx="1221" dy="709" 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="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">
       <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">
           <mxGeometry x="374" y="260" width="136" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-2" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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">
           <mxGeometry x="20" y="260" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-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;" parent="1" source="gThzubRPDfsPHgG1rrA1-2" target="gThzubRPDfsPHgG1rrA1-1" edge="1">
@@ -119,7 +119,7 @@
         <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">
           <mxGeometry x="298" y="702" width="136" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="gThzubRPDfsPHgG1rrA1-27" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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">
           <mxGeometry x="38" y="702" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="gThzubRPDfsPHgG1rrA1-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;" parent="1" source="gThzubRPDfsPHgG1rrA1-27" target="gThzubRPDfsPHgG1rrA1-26" edge="1">
@@ -204,7 +204,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="AF3pihWE0dxvoIjMQTJO" name="Meter Property">
-    <mxGraphModel dx="1434" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -332,7 +332,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="HYgVTIpLqka7R-nskqQ4" name="Firmware">
-    <mxGraphModel dx="-220" dy="782" 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="-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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -353,7 +353,7 @@
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="vdYoE8CNYUoPl0HQQ8es-5" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="vdYoE8CNYUoPl0HQQ8es-5" 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="1760" y="59.999999999999886" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="vdYoE8CNYUoPl0HQQ8es-6" value="s4grid:hasFirmwareVersion: xsd:string&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasVendorId: xsd:unsignedShort&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasProductId: xsd:unsignedShort&lt;br&gt;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">
@@ -373,14 +373,14 @@
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="vdYoE8CNYUoPl0HQQ8es-10" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="9LeZirKQx9aQG6_ajApF" name="Network Interface">
-    <mxGraphModel dx="1434" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -401,7 +401,7 @@
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8NRccoTkKYjIACFmHB8t-5" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="8NRccoTkKYjIACFmHB8t-5" 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="130" y="49.999999999999886" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="8NRccoTkKYjIACFmHB8t-6" value="s4grid:hasMACAddress: xsd:string&lt;br&gt;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">
@@ -421,14 +421,14 @@
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8NRccoTkKYjIACFmHB8t-10" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="G8NzCb6VJkkx6D05KdTC" name="Clock">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -449,7 +449,7 @@
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="YTOnsjx63dZk1uOE6Jr_-5" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="YTOnsjx63dZk1uOE6Jr_-5" 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="950" y="100" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="YTOnsjx63dZk1uOE6Jr_-6" value="s4grid:hasTime: xsd:dateTime&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasTimeZone: xsd:long&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasStatus: xsd:int&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasDaylightSavingsBegin: xsd:dateTime&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasDaylightSavingsEnd: xsd:dateTime&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasDaylightSavingsDeviation: xsd:integer&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasDaylightSavingsEnabled: xsd:boolean&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasClockBase: xsd:int&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;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">
@@ -469,21 +469,21 @@
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="YTOnsjx63dZk1uOE6Jr_-10" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="g2OXIvZ8p8PRQxD298nG" name="Breaker-State">
-    <mxGraphModel dx="1434" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
         <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-1" 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="10" y="189.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-2" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-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">
           <mxGeometry x="10" y="259.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-3" 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="6ETrdjPlmqTQ-0tLx3Zz-2" target="6ETrdjPlmqTQ-0tLx3Zz-1" edge="1">
@@ -550,7 +550,7 @@
         <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-16" 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="25" y="623.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-17" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-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="25" y="693.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="6ETrdjPlmqTQ-0tLx3Zz-18" 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="6ETrdjPlmqTQ-0tLx3Zz-17" target="6ETrdjPlmqTQ-0tLx3Zz-16" edge="1">
@@ -618,7 +618,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="zxjEZ7-anZhRLRqBY_1h" name="Script Table">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -713,7 +713,7 @@
         <mxCell id="tuTcouQHKnO_GeFtwv6Y-18" 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="1015" y="199.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="tuTcouQHKnO_GeFtwv6Y-19" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="tuTcouQHKnO_GeFtwv6Y-19" 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="1015" y="269.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="tuTcouQHKnO_GeFtwv6Y-20" 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="tuTcouQHKnO_GeFtwv6Y-19" target="tuTcouQHKnO_GeFtwv6Y-18" edge="1">
@@ -747,11 +747,11 @@
     </mxGraphModel>
   </diagram>
   <diagram id="143nPN6u34qnr13lKFaE" name="Single Scheduled Action">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="vYmO6904O5plnU4DORet-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="vYmO6904O5plnU4DORet-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="1151" y="467" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="vYmO6904O5plnU4DORet-2" value="s4grid:SingleScheduledAction" 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">
@@ -872,7 +872,7 @@
             <mxPoint x="1211" y="428" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="vYmO6904O5plnU4DORet-26" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="vYmO6904O5plnU4DORet-26" 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="1130" y="846" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="vYmO6904O5plnU4DORet-27" value="s4grid:SingleScheduledAction" 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">
@@ -997,7 +997,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="3KGhjPKiMjUPZhHuZNzh" name="Activity Calendar">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1024,7 +1024,7 @@
         <mxCell id="9FWBLaq85ZqsYcFE-fzn-33" value="s4grid:RegularDayProfile" 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="1826" y="1089" width="201" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="9FWBLaq85ZqsYcFE-fzn-34" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="9FWBLaq85ZqsYcFE-fzn-34" 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="1393.5" y="790" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="9FWBLaq85ZqsYcFE-fzn-35" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" parent="1" source="9FWBLaq85ZqsYcFE-fzn-29" target="9FWBLaq85ZqsYcFE-fzn-33" edge="1">
@@ -1150,7 +1150,7 @@
         <mxCell id="-1xcqEHKds2JBzj6X6b1-6" value="s4grid:RegularDayProfile" 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="1839.5" y="399" width="230.5" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="-1xcqEHKds2JBzj6X6b1-7" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="-1xcqEHKds2JBzj6X6b1-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">
           <mxGeometry x="1408.5" y="110" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="-1xcqEHKds2JBzj6X6b1-8" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" parent="1" source="-1xcqEHKds2JBzj6X6b1-2" target="-1xcqEHKds2JBzj6X6b1-6" edge="1">
@@ -1257,7 +1257,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="7lVgEJBkKY9gZ8TuVkJi" name="Power Line Property">
-    <mxGraphModel dx="1434" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1316,7 +1316,7 @@
         <mxCell id="LYTFXZO2eoVTYku1gq08-18" value="&lt;u&gt;s4grid:DurationVoltageSwell&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="456" y="378" width="193" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="LYTFXZO2eoVTYku1gq08-22" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="LYTFXZO2eoVTYku1gq08-22" 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="42" y="249.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="LYTFXZO2eoVTYku1gq08-23" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.1;exitDx=0;exitDy=0;entryX=0;entryY=0.1;entryDx=0;entryDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;" parent="1" source="LYTFXZO2eoVTYku1gq08-22" target="LYTFXZO2eoVTYku1gq08-3" edge="1">
@@ -1426,7 +1426,7 @@
         <mxCell id="_m2gVA6NQlzEnRQeAKKp-21" value="&lt;u&gt;s4grid:Voltage&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="456" y="708" width="193" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="_m2gVA6NQlzEnRQeAKKp-22" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="_m2gVA6NQlzEnRQeAKKp-22" 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="42" y="529.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="_m2gVA6NQlzEnRQeAKKp-23" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.1;exitDx=0;exitDy=0;entryX=0;entryY=0.1;entryDx=0;entryDy=0;endSize=8;dashed=1;arcSize=0;rounded=0;" parent="1" source="_m2gVA6NQlzEnRQeAKKp-22" target="_m2gVA6NQlzEnRQeAKKp-3" edge="1">
@@ -1491,7 +1491,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="I-rUBqIKO-YYfXG5Om1x" name="Profile Generic">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1512,7 +1512,7 @@
             <mxPoint x="-10" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-5" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-5" 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="990" y="40" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hc89bkI5cAVlX_-MIotH-6" 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">
@@ -1574,7 +1574,7 @@
             <mxPoint x="-4" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hc89bkI5cAVlX_-MIotH-19" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="hc89bkI5cAVlX_-MIotH-19" 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="942.5" y="393" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="hc89bkI5cAVlX_-MIotH-20" 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">
@@ -1623,7 +1623,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="ce7plKscNpKVN0YoRwd1" name="Services-Overview">
-    <mxGraphModel dx="986" dy="1407" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1672,7 +1672,7 @@
         <mxCell id="wBTAeAmXKWskdA0Lt4mn-8" 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="30" y="-988" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="wBTAeAmXKWskdA0Lt4mn-9" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="wBTAeAmXKWskdA0Lt4mn-9" 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="-896" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="wBTAeAmXKWskdA0Lt4mn-10" 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="wBTAeAmXKWskdA0Lt4mn-9" target="wBTAeAmXKWskdA0Lt4mn-8" edge="1">
@@ -1833,7 +1833,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="3LcsHulGvyM4QFrY3Apt" name="Get service">
-    <mxGraphModel dx="90" dy="-156" 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="-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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -1876,7 +1876,7 @@
         <mxCell id="UY4m5p3PhefD3EG9c2Qh-7" value="oneM2M:Service" 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="1868.04" y="1670" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="UY4m5p3PhefD3EG9c2Qh-9" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="UY4m5p3PhefD3EG9c2Qh-9" 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="1736" y="1770" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="UY4m5p3PhefD3EG9c2Qh-10" value="s4grid:GetService" 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">
@@ -2043,7 +2043,7 @@
             <mxPoint x="2899.28" y="1810" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="p3AaXxes5gfZudKbeztw-47" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="p3AaXxes5gfZudKbeztw-47" 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="1710" y="1355.5" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="p3AaXxes5gfZudKbeztw-48" value="s4grid:GetService" 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">
@@ -2181,23 +2181,23 @@
         <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">
           <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;" vertex="1" parent="1">
+        <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">
           <mxGeometry x="2223.51" y="1434.4099999999996" width="138.5" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MK8SGlBonqbYGOvGf8Ac-3" value="s4grid:EntryDescriptor" 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;" vertex="1" parent="1">
+        <mxCell id="MK8SGlBonqbYGOvGf8Ac-3" value="s4grid:EntryDescriptor" 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="1970" y="1434.32" width="233.51" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MK8SGlBonqbYGOvGf8Ac-4" value="s4grid:obtainFromValue&lt;br&gt;s4grid:obtainToValue" 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;" vertex="1" parent="1">
+        <mxCell id="MK8SGlBonqbYGOvGf8Ac-4" value="s4grid:obtainFromValue&lt;br&gt;s4grid:obtainToValue" 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="2223.51" y="1464.4099999999996" width="138.5" height="31" as="geometry" />
         </mxCell>
-        <mxCell id="MK8SGlBonqbYGOvGf8Ac-5" value="s4grid:obtainFromEntry: xsd:unsignedLong&lt;br&gt;s4grid:obtainToEntry: xsd:unsignedLong" 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;" vertex="1" parent="1">
+        <mxCell id="MK8SGlBonqbYGOvGf8Ac-5" value="s4grid:obtainFromEntry: xsd:unsignedLong&lt;br&gt;s4grid:obtainToEntry: xsd:unsignedLong" 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="1970" y="1464.4099999999999" width="234.28" height="32" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="X_Gde6arEc2U97pXeakK" name="Set service">
-    <mxGraphModel dx="1793" dy="978" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2240,7 +2240,7 @@
         <mxCell id="ymajf1u4WVUhnZJ3Aq9y-7" value="oneM2M:Service" 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="180.02999999999997" y="430" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-8" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="ymajf1u4WVUhnZJ3Aq9y-8" 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.989999999999995" y="530" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="ymajf1u4WVUhnZJ3Aq9y-9" value="s4grid:SetService" 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">
@@ -2336,58 +2336,58 @@
             <mxPoint x="941.02" y="774" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-16" value="s4grid: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=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-16" 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 y="143" width="110" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-17" value="s4grid:SetService" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-17" value="s4grid:SetService" 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="137.03999999999996" y="143" width="110" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-18" value="s4grid:SetOperation" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-18" value="s4grid:SetOperation" 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="275.1299999999999" y="143" width="110.72" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-20" value="s4grid:obtainInputForProperty: xsd:string (1..1)&lt;br&gt;s4grid:hasInputDataType: xsd:string (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-20" value="s4grid:obtainInputForProperty: xsd:string (1..1)&lt;br&gt;s4grid:hasInputDataType: xsd:string (1..1)" 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="849" y="273" width="259.62" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-21" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-21" 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">
           <mxGeometry x="324" y="243" width="240" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-22" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-22" 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">
           <mxGeometry x="849" y="243" width="259.62" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-23" 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;edgeStyle=orthogonalEdgeStyle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-21" target="ml750XWidTsMEYCA3FV2-29">
+        <mxCell id="ml750XWidTsMEYCA3FV2-23" 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;edgeStyle=orthogonalEdgeStyle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="ml750XWidTsMEYCA3FV2-21" target="ml750XWidTsMEYCA3FV2-29" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="840.97" y="218" as="sourcePoint" />
             <mxPoint x="949.03" y="327" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-24" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-22" target="ml750XWidTsMEYCA3FV2-29">
+        <mxCell id="ml750XWidTsMEYCA3FV2-24" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="ml750XWidTsMEYCA3FV2-22" target="ml750XWidTsMEYCA3FV2-29" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="901.8399999999999" y="528" as="sourcePoint" />
             <mxPoint x="883.03" y="377" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-25" value="s4grid:hasInputObjectType: xsd:string (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-25" value="s4grid:hasInputObjectType: xsd:string (1..1)" 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="324" y="273" width="240" height="38" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-26" value="s4grid:obtainInputForProperty: xsd:string (1..1)&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasInputObjectType: xsd:string (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-26" value="s4grid:obtainInputForProperty: xsd:string (1..1)&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;s4grid:hasInputObjectType: xsd:string (1..1)" 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="576.25" y="272" width="259.75" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-27" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-27" 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">
           <mxGeometry x="576" y="243" width="260" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-28" value="s4grid:CosemOperationInput" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-28" value="s4grid:CosemOperationInput" 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="584.6899999999999" y="143" width="242.87" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-29" value="s4grid:obtainInputFromObis: xsd:string (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="ml750XWidTsMEYCA3FV2-29" value="s4grid:obtainInputFromObis: xsd:string (1..1)" 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="584.6899999999999" y="173" width="242.87" height="33" as="geometry" />
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-30" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-27" target="ml750XWidTsMEYCA3FV2-29">
+        <mxCell id="ml750XWidTsMEYCA3FV2-30" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="ml750XWidTsMEYCA3FV2-27" target="ml750XWidTsMEYCA3FV2-29" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="914.47" y="591" as="sourcePoint" />
             <mxPoint x="893.03" y="387" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-39" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;dashed=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.3;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-16" target="ml750XWidTsMEYCA3FV2-17">
+        <mxCell id="ml750XWidTsMEYCA3FV2-39" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;dashed=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.3;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ml750XWidTsMEYCA3FV2-16" target="ml750XWidTsMEYCA3FV2-17" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="74" y="130" as="sourcePoint" />
             <mxPoint x="184" y="130" as="targetPoint" />
@@ -2397,12 +2397,12 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-40" value="&lt;div&gt;oneM2M:hasService&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="ml750XWidTsMEYCA3FV2-39">
+        <mxCell id="ml750XWidTsMEYCA3FV2-40" value="&lt;div&gt;oneM2M:hasService&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="ml750XWidTsMEYCA3FV2-39" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="8" y="-2" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-41" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;dashed=1;edgeStyle=orthogonalEdgeStyle;exitX=0.7;exitY=0;exitDx=0;exitDy=0;entryX=0.3;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-17" target="ml750XWidTsMEYCA3FV2-18">
+        <mxCell id="ml750XWidTsMEYCA3FV2-41" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;dashed=1;edgeStyle=orthogonalEdgeStyle;exitX=0.7;exitY=0;exitDx=0;exitDy=0;entryX=0.3;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ml750XWidTsMEYCA3FV2-17" target="ml750XWidTsMEYCA3FV2-18" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="224" y="130" as="sourcePoint" />
             <mxPoint x="314" y="130" as="targetPoint" />
@@ -2412,12 +2412,12 @@
             </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;" vertex="1" connectable="0" parent="ml750XWidTsMEYCA3FV2-41">
+        <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">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="ml750XWidTsMEYCA3FV2-43" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;exitX=0.7;exitY=0;exitDx=0;exitDy=0;dashed=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="ml750XWidTsMEYCA3FV2-18" target="ml750XWidTsMEYCA3FV2-28">
+        <mxCell id="ml750XWidTsMEYCA3FV2-43" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;exitX=0.7;exitY=0;exitDx=0;exitDy=0;dashed=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="ml750XWidTsMEYCA3FV2-18" target="ml750XWidTsMEYCA3FV2-28" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="924" y="-60" as="sourcePoint" />
             <mxPoint x="1120" y="-15" as="targetPoint" />
@@ -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;" vertex="1" connectable="0" parent="1">
+        <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">
           <mxGeometry x="513.9999999999998" y="110" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="PLNgzRsWFFMttXSUcTWf" name="Action service">
-    <mxGraphModel dx="3695" dy="-774" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2477,7 +2477,7 @@
         <mxCell id="XwRDZ1KnKvy4vy_mBu6z-7" value="oneM2M:Service" 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="-621.96" y="2970" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-8" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="XwRDZ1KnKvy4vy_mBu6z-8" 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="-754" y="3070" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="XwRDZ1KnKvy4vy_mBu6z-9" value="s4grid:ActionService" 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">
@@ -2582,67 +2582,67 @@
             <mxPoint x="-179" y="3220" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-1" value="s4grid: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=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-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="-800" y="2491" width="110" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-2" value="s4grid:ActionService" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-2" value="s4grid:ActionService" 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="-669.48" y="2491" width="123.04" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-3" value="s4grid:ActionOperation" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-3" value="s4grid:ActionOperation" 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="-533.95" y="2491" width="128.87" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-5" value="s4grid:CosemOperationInput" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-5" value="s4grid:CosemOperationInput" 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="-210" y="2491" width="240.38" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-6" value="s4grid:obtainInputFromObis: xsd:string (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-6" value="s4grid:obtainInputFromObis: xsd:string (1..1)" 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="-210" y="2521" width="240.38" height="33" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-7" value="s4grid:ComplexActionOperationInput" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-7" value="s4grid:ComplexActionOperationInput" 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="-336" y="2601" width="201.38" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-8" value="s4grid:hasActionValue (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-8" value="s4grid:hasActionValue (1..1)" 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="-56" y="2631" width="200.38" height="31" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-9" value="s4grid:SimpleActionOperationInput" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-9" value="s4grid:SimpleActionOperationInput" 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="-56" y="2601" width="200.38" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-10" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-7" target="W3fqK7p7tv4_LDdI9zIB-6">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-10" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-7" target="W3fqK7p7tv4_LDdI9zIB-6" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-85" y="2501" as="sourcePoint" />
             <mxPoint x="-85" y="2431" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-11" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-9" target="W3fqK7p7tv4_LDdI9zIB-6">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-11" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-9" target="W3fqK7p7tv4_LDdI9zIB-6" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-255" y="2611" as="sourcePoint" />
             <mxPoint x="-85" y="2564" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-12" value="s4grid:hasPresetTime: xsd:dateTime (1..1)&lt;br&gt;s4grid:hasValidityIntervalStart: xsd:dateTime (1..1)&lt;br&gt;s4grid:hasValidityIntervalEnd: xsd:dateTime (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-12" value="s4grid:hasPresetTime: xsd:dateTime (1..1)&lt;br&gt;s4grid:hasValidityIntervalStart: xsd:dateTime (1..1)&lt;br&gt;s4grid:hasValidityIntervalEnd: xsd:dateTime (1..1)" 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="-520" y="2721" width="271" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-13" value="s4grid:PresetAdjustingTime" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-13" value="s4grid:PresetAdjustingTime" 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="-520" y="2691" width="271" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-14" value="s4grid:hasIndex: xsd:unsignedShort (1..1)&lt;br&gt;s4grid:hasSpecialDate: xsd:date (1..1)&lt;br&gt;s4grid:hasDayId: xsd:int (1..1)" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-14" value="s4grid:hasIndex: xsd:unsignedShort (1..1)&lt;br&gt;s4grid:hasSpecialDate: xsd:date (1..1)&lt;br&gt;s4grid:hasDayId: xsd:int (1..1)" 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="-221.62" y="2721" width="271.62" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-15" value="s4grid:SpecialDayEntry" 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;" vertex="1" parent="1">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-15" value="s4grid:SpecialDayEntry" 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="-221.62" y="2691" width="271.62" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-16" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-13" target="W3fqK7p7tv4_LDdI9zIB-7">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-16" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-13" target="W3fqK7p7tv4_LDdI9zIB-7" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-85" y="2501" as="sourcePoint" />
             <mxPoint x="-85" y="2431" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="W3fqK7p7tv4_LDdI9zIB-17" 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;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-15" target="W3fqK7p7tv4_LDdI9zIB-7">
+        <mxCell id="W3fqK7p7tv4_LDdI9zIB-17" 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;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-15" target="W3fqK7p7tv4_LDdI9zIB-7" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-389" y="2701" as="sourcePoint" />
             <mxPoint x="-225" y="2641" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-1" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.2;entryY=0;entryDx=0;entryDy=0;dashed=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-1" target="W3fqK7p7tv4_LDdI9zIB-2">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-1" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.2;entryY=0;entryDx=0;entryDy=0;dashed=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-1" target="W3fqK7p7tv4_LDdI9zIB-2" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-760.01" y="2487.17" as="sourcePoint" />
             <mxPoint x="-646.01" y="2487.17" as="targetPoint" />
@@ -2652,12 +2652,12 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-2" value="&lt;div&gt;oneM2M:hasService&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="tH0bkFI3j6yPcat26ZQL-1">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-2" value="&lt;div&gt;oneM2M:hasService&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="tH0bkFI3j6yPcat26ZQL-1" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="9" y="-2" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-3" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.2;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-2" target="W3fqK7p7tv4_LDdI9zIB-3">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-3" value="" style="endArrow=classic;html=1;endSize=8;arcSize=0;rounded=0;entryX=0.2;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="W3fqK7p7tv4_LDdI9zIB-2" target="W3fqK7p7tv4_LDdI9zIB-3" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-598.01" y="2487.17" as="sourcePoint" />
             <mxPoint x="-508.01" y="2487.17" as="targetPoint" />
@@ -2667,25 +2667,25 @@
             </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;" vertex="1" connectable="0" parent="tH0bkFI3j6yPcat26ZQL-3">
+        <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">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="11" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="tH0bkFI3j6yPcat26ZQL-5" 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;" edge="1" parent="1" source="W3fqK7p7tv4_LDdI9zIB-3" target="W3fqK7p7tv4_LDdI9zIB-5">
+        <mxCell id="tH0bkFI3j6yPcat26ZQL-5" 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="W3fqK7p7tv4_LDdI9zIB-3" target="W3fqK7p7tv4_LDdI9zIB-5" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-424.01" y="2502.17" as="sourcePoint" />
             <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;" vertex="1" connectable="0" parent="1">
+        <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">
           <mxGeometry x="-309.08000000000044" y="2506" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
   <diagram id="ce41JE-ia9TNi69TphpT" name="Overview 1">
-    <mxGraphModel dx="937" dy="226" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2763,7 +2763,7 @@
             <mxPoint x="1210" y="120" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hH1hdK6_R2So6OFxHRcg-17" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <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" />
         </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">
@@ -2827,7 +2827,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="OtFNykTdnFaeaEVrI7Rf" name="Overview 2">
-    <mxGraphModel dx="956" dy="-648" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -2849,7 +2849,7 @@
         <mxCell id="fc7WsreWl8LRgYKGyhmU-6" 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="945" y="1200" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="fc7WsreWl8LRgYKGyhmU-7" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="fc7WsreWl8LRgYKGyhmU-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">
           <mxGeometry x="945" y="1270" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="fc7WsreWl8LRgYKGyhmU-8" 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="fc7WsreWl8LRgYKGyhmU-7" target="fc7WsreWl8LRgYKGyhmU-6" edge="1">
@@ -3004,7 +3004,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="xMR1dpLqpirXl3-Xl4eC" name="Overview 3">
-    <mxGraphModel dx="607" dy="782" 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="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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -3045,7 +3045,7 @@
             <mxPoint x="1470" y="570" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="1vz48aJc2MZ5i11t-8Yv-37" value="s4grid: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=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+        <mxCell id="1vz48aJc2MZ5i11t-8Yv-37" 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="1220" y="519.9999999999999" width="100" height="30" as="geometry" />
         </mxCell>
         <mxCell id="1vz48aJc2MZ5i11t-8Yv-38" value="s4grid:SingleScheduledAction" 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">
@@ -3145,61 +3145,61 @@
             <mxPoint x="-91" y="-4" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-1" value="saref:Function" 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">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-1" value="saref:Function" 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="1458.5" y="110" width="110" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-2" value="s4grid:ScriptTable" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-2" value="s4grid:ScriptTable" 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="1189.5" y="220" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-3" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-2">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-3" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-2" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1249.5" y="160" as="sourcePoint" />
             <mxPoint x="1295.5" y="250" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-4" value="&lt;div&gt;s4grid:hasScriptTable&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-3">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-4" value="&lt;div&gt;s4grid:hasScriptTable&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-3" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-5" value="s4grid:Script" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-5" value="s4grid:Script" 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="1463.5" y="220" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-6" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-2" target="MTY-nUNpakiUWvuJ1UsG-5">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-6" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-2" target="MTY-nUNpakiUWvuJ1UsG-5" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1673.5" y="-35" as="sourcePoint" />
             <mxPoint x="1512.5" y="-35" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-7" value="s4grid:storesScript" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-6">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-7" value="s4grid:storesScript" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-6" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-8" 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;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-5" target="MTY-nUNpakiUWvuJ1UsG-1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-8" 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="MTY-nUNpakiUWvuJ1UsG-5" target="MTY-nUNpakiUWvuJ1UsG-1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1480" y="190" as="sourcePoint" />
             <mxPoint x="1449.5" y="160" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-9" value="s4grid: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=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-9" 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="1199.5" y="109.99999999999989" width="100" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-10" value="s4grid:SingleScheduledAction" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-10" value="s4grid:SingleScheduledAction" 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="1149.5" y="330" width="200" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-11" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-10" target="MTY-nUNpakiUWvuJ1UsG-5">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-11" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-10" target="MTY-nUNpakiUWvuJ1UsG-5" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1765.5" y="620" as="sourcePoint" />
             <mxPoint x="1235.5" y="580" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-12" value="&lt;div&gt;s4grid:executesScript (1..1)&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-11">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-12" value="&lt;div&gt;s4grid:executesScript (1..1)&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-11" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-33" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-13" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.9;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="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-10">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-13" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.9;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-10" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="809.5" y="380" as="sourcePoint" />
             <mxPoint x="1038.5" y="461" as="targetPoint" />
@@ -3209,75 +3209,75 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-14" value="&lt;div&gt;s4grid:hasSingleScheduledAction&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-13">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-14" value="&lt;div&gt;s4grid:hasSingleScheduledAction&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-13" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint y="97" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-15" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.1;exitDx=0;exitDy=0;entryX=1;entryY=0.1;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-17">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-15" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.1;exitDx=0;exitDy=0;entryX=1;entryY=0.1;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-9" target="MTY-nUNpakiUWvuJ1UsG-17" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1244.5" y="425" as="sourcePoint" />
             <mxPoint x="2279" y="485" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-16" value="&lt;div&gt;s4grid:hasActivityCalendar&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-15">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-16" value="&lt;div&gt;s4grid:hasActivityCalendar&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-15" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-7" y="-3" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-17" value="s4grid:ActivityCalendar" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-17" value="s4grid:ActivityCalendar" 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="847" y="110" width="144" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-18" value="s4grid:DayProfile" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-18" value="s4grid:DayProfile" 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="989.5" y="410" width="280" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-19" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-26" target="MTY-nUNpakiUWvuJ1UsG-18">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-19" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-26" target="MTY-nUNpakiUWvuJ1UsG-18" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="854.5" y="380" as="sourcePoint" />
             <mxPoint x="1293.5" y="687" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-20" value="&lt;div&gt;s4grid:hasDayProfile&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-19">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-20" value="&lt;div&gt;s4grid:hasDayProfile&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-19" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="5" y="-34" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-21" value="s4grid:DaySchedule" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-21" value="s4grid:DaySchedule" 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="1458.5" y="410" width="175" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-22" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.821;entryY=1.017;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;dashed=1;entryPerimeter=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-21" target="MTY-nUNpakiUWvuJ1UsG-5">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-22" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.821;entryY=1.017;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;dashed=1;entryPerimeter=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-21" target="MTY-nUNpakiUWvuJ1UsG-5" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1307.5" y="952" as="sourcePoint" />
             <mxPoint x="1504.5" y="927" as="targetPoint" />
             <Array as="points" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-23" value="s4grid:executesScript (1..1)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-22">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-23" value="s4grid:executesScript (1..1)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=12;" parent="MTY-nUNpakiUWvuJ1UsG-22" vertex="1" connectable="0">
           <mxGeometry x="-0.1686" relative="1" as="geometry">
             <mxPoint x="8" y="36" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-24" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-18" target="MTY-nUNpakiUWvuJ1UsG-21">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-24" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endSize=8;arcSize=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-18" target="MTY-nUNpakiUWvuJ1UsG-21" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="1059.5" y="927.0000000000002" as="sourcePoint" />
             <mxPoint x="1529.5" y="720" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-25" value="&lt;div&gt;s4grid:hasDaySchedule&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-24">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-25" value="&lt;div&gt;s4grid:hasDaySchedule&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-24" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="4.17" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-26" value="s4grid:SeasonProfile" 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;" vertex="1" parent="1">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-26" value="s4grid:SeasonProfile" 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="860.5" y="240" width="114" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-27" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="MTY-nUNpakiUWvuJ1UsG-17" target="MTY-nUNpakiUWvuJ1UsG-26">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-27" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endSize=8;arcSize=0;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="MTY-nUNpakiUWvuJ1UsG-17" target="MTY-nUNpakiUWvuJ1UsG-26" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="854.5" y="190" as="sourcePoint" />
             <mxPoint x="2194.5" y="466" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="MTY-nUNpakiUWvuJ1UsG-28" value="&lt;div&gt;s4grid:hasActiveSeasonProfile&lt;/div&gt;s4grid:hasPassiveSeasonProfile" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" vertex="1" connectable="0" parent="MTY-nUNpakiUWvuJ1UsG-27">
+        <mxCell id="MTY-nUNpakiUWvuJ1UsG-28" value="&lt;div&gt;s4grid:hasActiveSeasonProfile&lt;/div&gt;s4grid:hasPassiveSeasonProfile" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="MTY-nUNpakiUWvuJ1UsG-27" vertex="1" connectable="0">
           <mxGeometry x="-0.1269" relative="1" as="geometry">
             <mxPoint x="-91" y="-4" as="offset" />
           </mxGeometry>
diff --git a/documentation/description.html b/documentation/description.html
index ede13ba..3b20e6c 100644
--- a/documentation/description.html
+++ b/documentation/description.html
@@ -34,7 +34,7 @@
 
 	<h3>Meter</h3>
 
-	<p><a href="#Figure_5">Figure 5</a> provides an overview of how to represent an electric grid meter using the <a href="#s4grid:Meter">s4grid:Meter</a> class. 
+	<p><a href="#Figure_5">Figure 5</a> provides an overview of how to represent an electric grid meter using the <a href="#s4grid:GridMeter">s4grid:GridMeter</a> class. 
 	  The representation of electric grid meters and their properties has been extracted from the DLMS/COSEM standard (IEC 62056)</p>
 
 	<p>Unlike in other SAREF extensions, meter-specific information is not defined using properties from SAREF. This is because the DLMS/COSEM standard defines the data 
diff --git a/examples/Action.ttl b/examples/Action.ttl
index a7e0cff..ae34c69 100644
--- a/examples/Action.ttl
+++ b/examples/Action.ttl
@@ -53,7 +53,7 @@ s4grid:hasDayId a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:ActionService a owl:Class .
 
@@ -72,7 +72,7 @@ s4grid:ComplexActionOperationInput a owl:Class .
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     oneM2M:hasService ex:ResetServiceRegister,
 			ex:PresetAdjustingTimeServiceClock ,
diff --git a/examples/ActivityCalendar.ttl b/examples/ActivityCalendar.ttl
index 2de9df0..f096ba7 100644
--- a/examples/ActivityCalendar.ttl
+++ b/examples/ActivityCalendar.ttl
@@ -75,7 +75,7 @@ s4grid:hasStartTime a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:ActivityCalendar a owl:Class .
 
@@ -104,7 +104,7 @@ ex:ActivityCalendarContract1-1234 a s4grid:ActivityCalendar,
     s4grid:hasObis "0-0:13.0.1.255"^^xsd:string ;
 	s4grid:hasActiveSeasonProfile ex:SeasonActive1.
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
 	s4grid:hasActivityCalendar ex:ActivityCalendarContract1-1234.
 
diff --git a/examples/BreakerState.ttl b/examples/BreakerState.ttl
index 6503778..d85c0df 100644
--- a/examples/BreakerState.ttl
+++ b/examples/BreakerState.ttl
@@ -44,14 +44,14 @@ s4grid:hasOutputState a owl:DatatypeProperty .
 
 s4grid:BreakerState a owl:Class .
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 
 #################################################################
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     saref:hasState ex:CurrentConnectivityState .
 
diff --git a/examples/Clock.ttl b/examples/Clock.ttl
index 3c7e32e..3685be5 100644
--- a/examples/Clock.ttl
+++ b/examples/Clock.ttl
@@ -53,14 +53,14 @@ s4grid:hasTimeZone a owl:DatatypeProperty .
 
 s4grid:Clock a owl:Class .
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 
 #################################################################
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     s4grid:hasClock ex:Clock1234 .
 
diff --git a/examples/Firmware.ttl b/examples/Firmware.ttl
index 4eb76ae..d801a3d 100644
--- a/examples/Firmware.ttl
+++ b/examples/Firmware.ttl
@@ -43,14 +43,14 @@ s4grid:hasVendorId a owl:DatatypeProperty .
 
 s4grid:Firmware a owl:Class .
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 
 #################################################################
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     s4grid:hasFirmware ex:ActivePLCFirmware .
 
diff --git a/examples/Get.ttl b/examples/Get.ttl
index d242865..cd41263 100644
--- a/examples/Get.ttl
+++ b/examples/Get.ttl
@@ -57,7 +57,7 @@ s4grid:obtainToEntry a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:GetService a owl:Class .
 
@@ -86,7 +86,7 @@ s4grid:SelectiveAccess a owl:Class .
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     oneM2M:hasService ex:GetServiceIncrementalLoadProfile,
 			ex:GetServiceCapturePeriodIncrementalLoadProfile,
diff --git a/examples/Measurements.ttl b/examples/Measurements.ttl
index 3443db3..d530f36 100644
--- a/examples/Measurements.ttl
+++ b/examples/Measurements.ttl
@@ -55,7 +55,7 @@ saref:hasValue a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:PowerLine a owl:Class .
 
@@ -88,7 +88,7 @@ ex:MaximumDemandRegisterImportC1TP1Measurement136 a saref:Measurement,
     saref:isMeasuredIn om:watt ;
 	saref:relatesToProperty ex:MaximumDemandRegisterImportC1TP1 .
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     saref:makesMeasurement ex:TotalIncrementalActiveEnergyImportMeasurement123,
 			ex:MaximumDemandRegisterImportC1TP1Measurement136 .
diff --git a/examples/NetworkInterface.ttl b/examples/NetworkInterface.ttl
index b5768da..c3ba38d 100644
--- a/examples/NetworkInterface.ttl
+++ b/examples/NetworkInterface.ttl
@@ -37,7 +37,7 @@ s4grid:hasObis a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:NetworkInterface a owl:Class .
 
@@ -46,7 +46,7 @@ s4grid:NetworkInterface a owl:Class .
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     s4grid:hasNetworkInterface ex:MacAddress1234 .
 
diff --git a/examples/ProfileGeneric.ttl b/examples/ProfileGeneric.ttl
index a56ae5b..1b3531a 100644
--- a/examples/ProfileGeneric.ttl
+++ b/examples/ProfileGeneric.ttl
@@ -72,7 +72,7 @@ s4grid:hasTimeZone a owl:DatatypeProperty .
 
 s4grid:Clock a owl:Class .
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:PropertyValue a owl:Class .
 
@@ -105,7 +105,7 @@ ex:IncrementalLoadProfile1234 a s4grid:ProfileGeneric,
         ex:Measurement6 ;
     s4grid:relatedPropertyValue ex:PropertyValue1 .
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
 	s4grid:hasProfileGeneric ex:IncrementalLoadProfile1234 .
 
diff --git a/examples/PropertyValues.ttl b/examples/PropertyValues.ttl
index c674d67..d81c1c5 100644
--- a/examples/PropertyValues.ttl
+++ b/examples/PropertyValues.ttl
@@ -47,7 +47,7 @@ s4grid:hasValue a owl:DatatypeProperty .
 
 saref:UnitOfMeasure a owl:Class .
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:PropertyValue a owl:Class .
 
@@ -60,7 +60,7 @@ s4grid:MeterProperty a owl:Class ;
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     s4grid:hasPropertyValue ex:PropertyValue234,
 		ex:PropertyValue678.
diff --git a/examples/ScriptTable_SingleActionSchedule.ttl b/examples/ScriptTable_SingleActionSchedule.ttl
index 4687050..5f7595b 100644
--- a/examples/ScriptTable_SingleActionSchedule.ttl
+++ b/examples/ScriptTable_SingleActionSchedule.ttl
@@ -43,7 +43,7 @@ s4grid:hasObis a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:Script a owl:Class .
 
@@ -56,7 +56,7 @@ s4grid:SingleScheduledAction a owl:Class .
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     s4grid:hasScriptTable ex:DisconnectScriptTable ;
     s4grid:hasSingleScheduledAction ex:DisconnectControlScheduler .
diff --git a/examples/Set.ttl b/examples/Set.ttl
index d446c20..b4c40ab 100644
--- a/examples/Set.ttl
+++ b/examples/Set.ttl
@@ -45,7 +45,7 @@ s4grid:hasInputDataType a owl:DatatypeProperty .
 #    Classes
 #################################################################
 
-s4grid:Meter a owl:Class .
+s4grid:GridMeter a owl:Class .
 
 s4grid:SetService a owl:Class .
 
@@ -62,7 +62,7 @@ s4grid:SetOperationDataInput a owl:Class .
 #    Individuals
 #################################################################
 
-ex:Meter1234 a s4grid:Meter,
+ex:Meter1234 a s4grid:GridMeter,
         owl:NamedIndividual ;
     oneM2M:hasService ex:SetMulticastCommunicationIdentifier,
 			ex:SetServiceCapturePeriodIncrementalLoadProfile,
diff --git a/ontology/saref4grid.ttl b/ontology/saref4grid.ttl
index 0fc44fa..395543e 100644
--- a/ontology/saref4grid.ttl
+++ b/ontology/saref4grid.ttl
@@ -217,13 +217,13 @@ s4grid:hasActiveSeasonProfile a owl:ObjectProperty ;
 s4grid:hasActivityCalendar a owl:ObjectProperty ;
 	rdfs:comment "The activity calendar of a meter"@en ;
     rdfs:label "has activity calendar"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:ActivityCalendar .
 
 s4grid:hasClock a owl:ObjectProperty ;
 	rdfs:comment "The clock of the meter"@en ;
     rdfs:label "has clock"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:Clock .
 
 s4grid:hasDayProfile a owl:ObjectProperty ;
@@ -241,7 +241,7 @@ s4grid:hasDaySchedule a owl:ObjectProperty ;
 s4grid:hasFirmware a owl:ObjectProperty ;
 	rdfs:comment "The firmware of the meter"@en ;
     rdfs:label "has firmware"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:Firmware .
 
 s4grid:hasFridayProfile a owl:ObjectProperty ;
@@ -257,7 +257,7 @@ s4grid:hasMondayProfile a owl:ObjectProperty ;
 s4grid:hasNetworkInterface a owl:ObjectProperty ;
 	rdfs:comment "The network interface of the meter"@en ;
     rdfs:label "has network interface"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:NetworkInterface .
 
 s4grid:hasPassiveSeasonProfile a owl:ObjectProperty ;
@@ -269,7 +269,7 @@ s4grid:hasPassiveSeasonProfile a owl:ObjectProperty ;
 s4grid:hasProfileGeneric a owl:ObjectProperty ;
 	rdfs:comment "The profile generic of a meter"@en ;
     rdfs:label "has profile generic"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:ProfileGeneric .
 	
 s4grid:hasProperty a owl:ObjectProperty ;
@@ -281,7 +281,7 @@ s4grid:hasProperty a owl:ObjectProperty ;
 s4grid:hasPropertyValue a owl:ObjectProperty ;
 	rdfs:comment "The property value of a meter"@en ;
     rdfs:label "has property value"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:PropertyValue .
 
 s4grid:hasSaturdayProfile a owl:ObjectProperty ;
@@ -292,7 +292,7 @@ s4grid:hasSaturdayProfile a owl:ObjectProperty ;
 s4grid:hasScriptTable a owl:ObjectProperty ;
 	rdfs:comment "The script table of a meter"@en ;
     rdfs:label "has script table"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:ScriptTable .
 
 s4grid:hasSelectiveAccess a owl:ObjectProperty ;
@@ -304,7 +304,7 @@ s4grid:hasSelectiveAccess a owl:ObjectProperty ;
 s4grid:hasSingleScheduledAction a owl:ObjectProperty ;
 	rdfs:comment "The single scheduled action of a meter"@en ;
     rdfs:label "has single scheduled action"@en ;
-    rdfs:domain s4grid:Meter ;
+    rdfs:domain s4grid:GridMeter ;
     rdfs:range s4grid:SingleScheduledAction .
 
 s4grid:hasSpecialDayProfile a owl:ObjectProperty ;
@@ -858,7 +858,7 @@ s4grid:MeterProperty a owl:Class ;
     rdfs:label "Meter Property"@en ;
     rdfs:subClassOf saref:Property .
 
-s4grid:Meter a owl:Class ;
+s4grid:GridMeter a owl:Class ;
 	rdfs:comment "Metering device that remotely records real electricity consumption. This device allows to control all the information regarding consumption for any time range, automatically and remotely"@en ;
     rdfs:label "Meter"@en ;
     rdfs:subClassOf [ a owl:Restriction ;
diff --git a/tests/tests.csv b/tests/tests.csv
index a7960d4..bf1f27e 100644
--- a/tests/tests.csv
+++ b/tests/tests.csv
@@ -1,54 +1,54 @@
 Id;Requirement;Category;Test
-GRID-TEST-1;GRID-1;Remote management of meters;Meter hasPropertyValue PropertyValue
+GRID-TEST-1;GRID-1;Remote management of meters;GridMeter hasPropertyValue PropertyValue
 GRID-TEST-2;GRID-1;Remote management of meters;PropertyValue hasProperty MeterProperty
 GRID-TEST-3;GRID-1;Remote management of meters;Manufacturer type MeterProperty
 GRID-TEST-4;GRID-2;Remote management of meters;ScreenDisplay type MeterProperty
 GRID-TEST-5;GRID-3;Remote management of meters;TransformerRatio type MeterProperty
 GRID-TEST-6;GRID-4;Remote management of meters;TransformerRatio type MeterProperty
-GRID-TEST-7;GRID-5;Remote management of meters;Meter hasFirmware Firmware
+GRID-TEST-7;GRID-5;Remote management of meters;GridMeter hasFirmware Firmware
 GRID-TEST-8;GRID-6;Remote management of meters;Network type MeterProperty
 GRID-TEST-9;GRID-7;Remote management of meters;MeterProperty hasObis string
-GRID-TEST-10;GRID-7;Remote management of meters;Meter hasService GetService
+GRID-TEST-10;GRID-7;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-11;GRID-7;Remote management of meters;GetService hasOperation GetOperation
 GRID-TEST-12;GRID-7;Remote management of meters;GetService hasInput GetOperationPropertyInput
 GRID-TEST-13;GRID-7;Remote management of meters;GetOperationPropertyInput obtainInputFromObis string
 GRID-TEST-14;GRID-7;Remote management of meters;GetOperationPropertyInput obtainInputForProperty string
 GRID-TEST-15;GRID-7;Remote management of meters;GetService hasOutput GetOperationObjectOutput
 GRID-TEST-16;GRID-7;Remote management of meters;GetOperationObjectOutput hasOutputObjectType string
-GRID-TEST-17;GRID-8;Remote management of meters;Meter hasService SetService
+GRID-TEST-17;GRID-8;Remote management of meters;GridMeter hasService SetService
 GRID-TEST-18;GRID-8;Remote management of meters;SetService hasOperation SetOperation
 GRID-TEST-19;GRID-8;Remote management of meters;SetOperation hasInput SetOperationObjectInput
 GRID-TEST-20;GRID-8;Remote management of meters;SetOperationObjectInput obtainInputFromObis string
 GRID-TEST-21;GRID-8;Remote management of meters;SetOperationObjectInput obtainInputForProperty string
 GRID-TEST-22;GRID-8;Remote management of meters;SetOperationObjectInput hasInputObjectType string
-GRID-TEST-23;GRID-8;Remote management of meters;Meter hasService GetService
-GRID-TEST-24;GRID-9;Remote management of meters;Meter hasService SetService
-GRID-TEST-25;GRID-9;Remote management of meters;Meter hasService GetService
-GRID-TEST-26;GRID-10;Remote management of meters;Meter hasService SetService
-GRID-TEST-27;GRID-10;Remote management of meters;Meter hasService GetService
-GRID-TEST-28;GRID-11;Remote management of meters;Meter hasService SetService
-GRID-TEST-29;GRID-11;Remote management of meters;Meter hasService GetService
+GRID-TEST-23;GRID-8;Remote management of meters;GridMeter hasService GetService
+GRID-TEST-24;GRID-9;Remote management of meters;GridMeter hasService SetService
+GRID-TEST-25;GRID-9;Remote management of meters;GridMeter hasService GetService
+GRID-TEST-26;GRID-10;Remote management of meters;GridMeter hasService SetService
+GRID-TEST-27;GRID-10;Remote management of meters;GridMeter hasService GetService
+GRID-TEST-28;GRID-11;Remote management of meters;GridMeter hasService SetService
+GRID-TEST-29;GRID-11;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-30;GRID-12;Remote management of meters;SetOperation hasInput SetOperationDataInput
 GRID-TEST-31;GRID-12;Remote management of meters;SetOperationDataInput obtainInputFromObis string
 GRID-TEST-32;GRID-12;Remote management of meters;SetOperationDataInput obtainInputForProperty string
 GRID-TEST-33;GRID-12;Remote management of meters;SetOperationDataInput hasInputDataType string
-GRID-TEST-34;GRID-13;Remote management of meters;Meter hasState BreakerState
+GRID-TEST-34;GRID-13;Remote management of meters;GridMeter hasState BreakerState
 GRID-TEST-35;GRID-14;Remote management of meters;Threshold type MeterProperty
 GRID-TEST-36;GRID-15;Remote management of meters;MeterProperty isMeasuredIn UnitOfMeasure
-GRID-TEST-37;GRID-16;Remote management of meters;Meter hasSingleScheduledAction SingleScheduledAction
+GRID-TEST-37;GRID-16;Remote management of meters;GridMeter hasSingleScheduledAction SingleScheduledAction
 GRID-TEST-38;GRID-17;Remote management of meters;SetOperation hasInput SetOperationObisInput
 GRID-TEST-39;GRID-17;Remote management of meters;SetOperationObisInput obtainInputFromObis string
 GRID-TEST-40;GRID-17;Remote management of meters;SetOperationObisInput hasInputObjectType string
 GRID-TEST-41;GRID-18;Remote management of meters;SingleScheduledAction executesScript Script
 GRID-TEST-42;GRID-18;Remote management of meters;SingleScheduledAction hasExecutionTime dateTime
-GRID-TEST-43;GRID-19;Remote management of meters;Meter hasActivityCalendar ActivityCalendar
-GRID-TEST-44;GRID-20;Remote management of meters;Meter hasActivityCalendar ActivityCalendar
+GRID-TEST-43;GRID-19;Remote management of meters;GridMeter hasActivityCalendar ActivityCalendar
+GRID-TEST-44;GRID-20;Remote management of meters;GridMeter hasActivityCalendar ActivityCalendar
 GRID-TEST-45;GRID-21;Remote management of meters;PowerLimit type MeterProperty
 GRID-TEST-46;GRID-22;Remote management of meters;PropertyValue hasValue string
 GRID-TEST-47;GRID-23;Remote management of meters;MeterProperty isMeasuredIn UnitOfMeasure
-GRID-TEST-48;GRID-24;Remote management of meters;Meter hasService SetService
-GRID-TEST-49;GRID-25;Remote management of meters;Meter hasService SetService
-GRID-TEST-50;GRID-26;Remote management of meters;Meter measuresProperty EnergyAndPowerProperty
+GRID-TEST-48;GRID-24;Remote management of meters;GridMeter hasService SetService
+GRID-TEST-49;GRID-25;Remote management of meters;GridMeter hasService SetService
+GRID-TEST-50;GRID-26;Remote management of meters;GridMeter measuresProperty EnergyAndPowerProperty
 GRID-TEST-51;GRID-26;Remote management of meters;EnergyAndPowerProperty isPropertyOf PowerLine
 GRID-TEST-52;GRID-26;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty
 GRID-TEST-53;GRID-27;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty
@@ -58,16 +58,16 @@ GRID-TEST-56;GRID-30;Remote management of meters;EnergyAndPowerProperty isMeasur
 GRID-TEST-57;GRID-31;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty
 GRID-TEST-58;GRID-31;Remote management of meters;ReactiveEnergy type EnergyAndPowerProperty
 GRID-TEST-59;GRID-32;Remote management of meters;Measurement hasTimestamp dateTime
-GRID-TEST-60;GRID-33;Remote management of meters;Meter hasProfileGeneric ProfileGeneric
+GRID-TEST-60;GRID-33;Remote management of meters;GridMeter hasProfileGeneric ProfileGeneric
 GRID-TEST-61;GRID-34;Remote management of meters;ProfileGeneric hasCapturePeriod integer
 GRID-TEST-62;GRID-34;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
-GRID-TEST-63;GRID-35;Remote management of meters;Meter hasService GetService
+GRID-TEST-63;GRID-35;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-64;GRID-36;Remote management of meters;ProfileGeneric hasCapturePeriod integer
 GRID-TEST-65;GRID-36;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
-GRID-TEST-66;GRID-37;Remote management of meters;Meter hasService GetService
+GRID-TEST-66;GRID-37;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-67;GRID-38;Remote management of meters;ProfileGeneric hasCapturePeriod integer
 GRID-TEST-68;GRID-38;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
-GRID-TEST-69;GRID-39;Remote management of meters;Meter hasService GetService
+GRID-TEST-69;GRID-39;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-70;GRID-40;Remote management of meters;ProfileGeneric hasCapturePeriod integer
 GRID-TEST-71;GRID-40;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-72;GRID-41;Remote management of meters;Threshold type MeterProperty
@@ -77,59 +77,59 @@ GRID-TEST-75;GRID-44;Remote management of meters;MeterProperty isMeasuredIn Unit
 GRID-TEST-76;GRID-45;Remote management of meters;VoltageSagNumber type MeterProperty
 GRID-TEST-77;GRID-45;Remote management of meters;VoltageSwellNumber type MeterProperty
 GRID-TEST-78;GRID-45;Remote management of meters;LongPowerFailuresNumber type MeterProperty
-GRID-TEST-79;GRID-46;Remote management of meters;Meter measuresProperty QualityProperty
+GRID-TEST-79;GRID-46;Remote management of meters;GridMeter measuresProperty QualityProperty
 GRID-TEST-80;GRID-46;Remote management of meters;QualityProperty isPropertyOf PowerLine
 GRID-TEST-81;GRID-46;Remote management of meters;DurationVoltageSag type QualityProperty
 GRID-TEST-82;GRID-46;Remote management of meters;DurationVoltageSwell type QualityProperty
 GRID-TEST-83;GRID-46;Remote management of meters;DurationLongPowerFailure type QualityProperty
 GRID-TEST-84;GRID-47;Remote management of meters;QualityProperty isMeasuredIn UnitOfMeasure
-GRID-TEST-85;GRID-48;Remote management of meters;Meter hasService GetService
+GRID-TEST-85;GRID-48;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-86;GRID-49;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-87;GRID-49;Remote management of meters;ProfileGeneric relatedPropertyValue PropertyValue
-GRID-TEST-88;GRID-50;Remote management of meters;Meter hasService GetService
+GRID-TEST-88;GRID-50;Remote management of meters;GridMeter hasService GetService
 GRID-TEST-89;GRID-51;Remote management of meters;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-90;GRID-51;Remote management of meters;ProfileGeneric relatedPropertyValue PropertyValue
-GRID-TEST-91;GRID-54;Management of tertiary sensor devices;Meter hasService GetService
+GRID-TEST-91;GRID-54;Management of tertiary sensor devices;GridMeter hasService GetService
 GRID-TEST-92;GRID-55;Management of tertiary sensor devices;Manufacturer type MeterProperty
-GRID-TEST-93;GRID-56;Management of tertiary sensor devices;Meter hasFirmware Firmware
+GRID-TEST-93;GRID-56;Management of tertiary sensor devices;GridMeter hasFirmware Firmware
 GRID-TEST-94;GRID-57;Management of tertiary sensor devices;Network type MeterProperty
-GRID-TEST-95;GRID-58;Management of tertiary sensor devices;Meter hasSingleScheduledAction SingleScheduledAction
-GRID-TEST-96;GRID-59;Management of tertiary sensor devices;Meter hasPropertyValue PropertyValue
+GRID-TEST-95;GRID-58;Management of tertiary sensor devices;GridMeter hasSingleScheduledAction SingleScheduledAction
+GRID-TEST-96;GRID-59;Management of tertiary sensor devices;GridMeter hasPropertyValue PropertyValue
 GRID-TEST-97;GRID-59;Management of tertiary sensor devices;PropertyValue hasProperty MeterProperty
-GRID-TEST-98;GRID-61;Management of tertiary sensor devices;Meter hasService SetService
+GRID-TEST-98;GRID-61;Management of tertiary sensor devices;GridMeter hasService SetService
 GRID-TEST-99;GRID-62;Management of tertiary sensor devices;SingleScheduledAction executesScript Script
 GRID-TEST-100;GRID-63;Management of tertiary sensor devices;SingleScheduledAction executesScript Script
-GRID-TEST-101;GRID-64;Management of tertiary sensor devices;Meter hasService SetService
-GRID-TEST-102;GRID-65;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-103;GRID-67;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-104;GRID-68;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-105;GRID-69;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-106;GRID-70;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-107;GRID-71;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-108;GRID-72;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-109;GRID-73;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-110;GRID-74;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-111;GRID-75;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-112;GRID-76;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric
+GRID-TEST-101;GRID-64;Management of tertiary sensor devices;GridMeter hasService SetService
+GRID-TEST-102;GRID-65;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-103;GRID-67;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-104;GRID-68;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-105;GRID-69;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-106;GRID-70;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-107;GRID-71;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-108;GRID-72;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-109;GRID-73;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-110;GRID-74;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-111;GRID-75;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-112;GRID-76;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric
 GRID-TEST-113;GRID-77;Management of tertiary sensor devices;Manufacturer type MeterProperty
-GRID-TEST-114;GRID-78;Management of tertiary sensor devices;Meter hasFirmware Firmware
+GRID-TEST-114;GRID-78;Management of tertiary sensor devices;GridMeter hasFirmware Firmware
 GRID-TEST-115;GRID-79;Management of tertiary sensor devices;Network type MeterProperty
-GRID-TEST-116;GRID-80;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-117;GRID-81;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-118;GRID-82;Management of tertiary sensor devices;Meter hasService SetService
-GRID-TEST-119;GRID-83;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-120;GRID-84;Management of tertiary sensor devices;Meter hasService SetService
-GRID-TEST-121;GRID-87;Management of tertiary sensor devices;Meter hasService GetService
+GRID-TEST-116;GRID-80;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-117;GRID-81;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-118;GRID-82;Management of tertiary sensor devices;GridMeter hasService SetService
+GRID-TEST-119;GRID-83;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-120;GRID-84;Management of tertiary sensor devices;GridMeter hasService SetService
+GRID-TEST-121;GRID-87;Management of tertiary sensor devices;GridMeter hasService GetService
 GRID-TEST-122;GRID-88;Management of tertiary sensor devices;Manufacturer type MeterProperty
-GRID-TEST-123;GRID-89;Management of tertiary sensor devices;Meter hasFirmware Firmware
-GRID-TEST-124;GRID-90;Management of tertiary sensor devices;Meter hasSingleScheduledAction SingleScheduledAction
-GRID-TEST-125;GRID-91;Management of tertiary sensor devices;Meter hasPropertyValue PropertyValue
+GRID-TEST-123;GRID-89;Management of tertiary sensor devices;GridMeter hasFirmware Firmware
+GRID-TEST-124;GRID-90;Management of tertiary sensor devices;GridMeter hasSingleScheduledAction SingleScheduledAction
+GRID-TEST-125;GRID-91;Management of tertiary sensor devices;GridMeter hasPropertyValue PropertyValue
 GRID-TEST-126;GRID-91;Management of tertiary sensor devices;PropertyValue hasProperty MeterProperty
-GRID-TEST-127;GRID-93;Management of tertiary sensor devices;Meter hasService SetService
-GRID-TEST-128;GRID-94;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-129;GRID-95;Management of tertiary sensor devices;Meter hasService SetService
-GRID-TEST-130;GRID-96;Management of tertiary sensor devices;Meter hasService GetService
-GRID-TEST-131;GRID-97;Management of tertiary sensor devices;Meter hasService GetService
+GRID-TEST-127;GRID-93;Management of tertiary sensor devices;GridMeter hasService SetService
+GRID-TEST-128;GRID-94;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-129;GRID-95;Management of tertiary sensor devices;GridMeter hasService SetService
+GRID-TEST-130;GRID-96;Management of tertiary sensor devices;GridMeter hasService GetService
+GRID-TEST-131;GRID-97;Management of tertiary sensor devices;GridMeter hasService GetService
 GRID-TEST-132;GRID-99;Management of OLTC transformers;Current type EnergyAndPowerProperty
 GRID-TEST-133;GRID-99;Management of OLTC transformers;Voltage type EnergyAndPowerProperty
 GRID-TEST-134;GRID-99;Management of OLTC transformers;ActivePower type EnergyAndPowerProperty
@@ -140,36 +140,36 @@ GRID-TEST-138;GRID-100;Management of OLTC transformers;ActivePower type EnergyAn
 GRID-TEST-139;GRID-100;Management of OLTC transformers;ReactivePower type EnergyAndPowerProperty
 GRID-TEST-140;GRID-101;Management of OLTC transformers;Voltage type EnergyAndPowerProperty
 GRID-TEST-141;GRID-102;Management of OLTC transformers;Voltage type EnergyAndPowerProperty
-GRID-TEST-142;GRID-103;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-142;GRID-103;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-143;GRID-104;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
-GRID-TEST-144;GRID-105;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-144;GRID-105;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-145;GRID-106;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-146;GRID-106;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-147;GRID-107;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-147;GRID-107;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-148;GRID-108;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-149;GRID-108;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-150;GRID-109;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-150;GRID-109;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-151;GRID-110;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-152;GRID-110;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-153;GRID-111;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-153;GRID-111;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-154;GRID-112;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-155;GRID-112;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-156;GRID-113;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-156;GRID-113;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-157;GRID-114;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-158;GRID-114;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-159;GRID-115;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-159;GRID-115;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-160;GRID-116;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-161;GRID-116;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-162;GRID-117;Management of OLTC transformers;Meter hasService GetService
-GRID-TEST-163;GRID-118;Management of OLTC transformers;Meter hasService GetService
+GRID-TEST-162;GRID-117;Management of OLTC transformers;GridMeter hasService GetService
+GRID-TEST-163;GRID-118;Management of OLTC transformers;GridMeter hasService GetService
 GRID-TEST-164;GRID-119;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-165;GRID-119;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-166;GRID-120;Detection of meters connectivity;Meter hasState BreakerState
-GRID-TEST-167;GRID-121;Detection of meters connectivity;Meter hasState BreakerState
-GRID-TEST-168;GRID-122;Detection of meters connectivity;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-169;GRID-123;Detection of meters connectivity;Meter hasService GetService
-GRID-TEST-170;GRID-124;Detection of meters connectivity;Meter hasProfileGeneric ProfileGeneric
-GRID-TEST-171;GRID-124;Detection of meters connectivity;Meter hasService GetService
+GRID-TEST-166;GRID-120;Detection of meters connectivity;GridMeter hasState BreakerState
+GRID-TEST-167;GRID-121;Detection of meters connectivity;GridMeter hasState BreakerState
+GRID-TEST-168;GRID-122;Detection of meters connectivity;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-169;GRID-123;Detection of meters connectivity;GridMeter hasService GetService
+GRID-TEST-170;GRID-124;Detection of meters connectivity;GridMeter hasProfileGeneric ProfileGeneric
+GRID-TEST-171;GRID-124;Detection of meters connectivity;GridMeter hasService GetService
 GRID-TEST-172;GRID-125;Detection of meters connectivity;ProfileGeneric relatedMeasurement Measurement
 GRID-TEST-173;GRID-125;Detection of meters connectivity;ProfileGeneric hasCapturePeriod integer
-GRID-TEST-174;GRID-126;Detection of meters connectivity;Meter hasService GetService
+GRID-TEST-174;GRID-126;Detection of meters connectivity;GridMeter hasService GetService
-- 
GitLab