diff --git a/docs/diagrams/architecture.drawio b/docs/diagrams/architecture.drawio
index 9c635db2c..db066bd0e 100644
--- a/docs/diagrams/architecture.drawio
+++ b/docs/diagrams/architecture.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2023-08-17T09:04:53.466Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.6.8 Chrome/114.0.5735.289 Electron/25.5.0 Safari/537.36" etag="PjPOyUJyv6u9pZ0SiVhN" version="21.6.8" type="device">
+<mxfile host="Electron" modified="2023-08-21T15:41:11.488Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.6.8 Chrome/114.0.5735.289 Electron/25.5.0 Safari/537.36" etag="ilk4qmY4BQefRYjYuJLj" version="21.6.8" type="device">
   <diagram name="Page-1" id="c7558073-3199-34d8-9f00-42111426c3f3">
-    <mxGraphModel dx="1633" dy="857" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="4681" pageHeight="3300" background="none" math="0" shadow="0">
+    <mxGraphModel dx="1307" dy="685" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="4681" pageHeight="3300" background="none" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -311,7 +311,7 @@
         <mxCell id="1qYccRmLHqD2nOXxJYSw-283" value="+ openReplicaTransaction() : IReadTransaction" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="1qYccRmLHqD2nOXxJYSw-274" vertex="1">
           <mxGeometry y="130" width="366" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="1qYccRmLHqD2nOXxJYSw-284" value="+ openMasterTransaction() : IReadWriteTransaction" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="1qYccRmLHqD2nOXxJYSw-274" vertex="1">
+        <mxCell id="1qYccRmLHqD2nOXxJYSw-284" value="+ openMasterTransaction() : IMasterTransaction" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="1qYccRmLHqD2nOXxJYSw-274" vertex="1">
           <mxGeometry y="156" width="366" height="26" as="geometry" />
         </mxCell>
         <mxCell id="1qYccRmLHqD2nOXxJYSw-289" value="When a plugin opens a storage context to access a storage it must first set the application-id and author to be used for all queries. Ones that has been done it may open a new read- or read/write connection to the storage. This connection is linked with the set credentials, chaning the credentials will not effect any open connection." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="veuHkW8nXqJATqobilVs-76" vertex="1">
diff --git a/docs/diagrams/flow.drawio b/docs/diagrams/flow.drawio
index 84ea43057..7792bf155 100644
--- a/docs/diagrams/flow.drawio
+++ b/docs/diagrams/flow.drawio
@@ -1,14 +1,14 @@
-<mxfile host="Electron" modified="2023-08-17T11:21:09.403Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.6.8 Chrome/114.0.5735.289 Electron/25.5.0 Safari/537.36" etag="gg9sb93Nribe3QWU-AWM" version="21.6.8" type="device">
+<mxfile host="Electron" modified="2023-08-21T15:41:07.607Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.6.8 Chrome/114.0.5735.289 Electron/25.5.0 Safari/537.36" etag="n11w2zWF8kbTulI5-bLS" version="21.6.8" type="device">
   <diagram name="Page-1" id="c7558073-3199-34d8-9f00-42111426c3f3">
-    <mxGraphModel dx="1867" dy="979" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="4681" pageHeight="3300" background="none" math="0" shadow="0">
+    <mxGraphModel dx="3015" dy="1582" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="4681" pageHeight="3300" background="none" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="LxGrSM87_I9BfTGoM96F-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="IS7OfrcVgxXRb15TEPke-10" target="LxGrSM87_I9BfTGoM96F-46">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-10" target="LxGrSM87_I9BfTGoM96F-46" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="790" />
+              <mxPoint x="1200" y="555" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -16,7 +16,7 @@
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="1270" />
+              <mxPoint x="1200" y="1470" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -24,7 +24,7 @@
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="1150" />
+              <mxPoint x="1200" y="1350" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -32,10 +32,10 @@
           <mxGeometry x="60" y="545" width="30" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-5" value="Naksha" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="1250" y="190" width="2640" height="2280" as="geometry" />
+          <mxGeometry x="1250" y="190" width="2640" height="2590" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-6" value="Extensions" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;width=73;height=36;fillColor=none;dashed=1;strokeColor=#82b366;strokeWidth=2;" parent="1" vertex="1">
-          <mxGeometry x="2760" y="800" width="410" height="290" as="geometry" />
+          <mxGeometry x="2310" y="800" width="870" height="200" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-9" value="Moderation DB" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="920" y="500" width="70" height="70" as="geometry" />
@@ -46,8 +46,8 @@
         <mxCell id="IS7OfrcVgxXRb15TEPke-109" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-10" target="IS7OfrcVgxXRb15TEPke-41" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1150" y="905" />
-              <mxPoint x="1150" y="905" />
+              <mxPoint x="1200" y="905" />
+              <mxPoint x="1200" y="670" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -56,22 +56,14 @@
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-1" value="Do authentication" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-124" vertex="1" connectable="0">
           <mxGeometry x="-0.1576" y="1" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-146" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-10" target="IS7OfrcVgxXRb15TEPke-139" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="430" />
-            </Array>
+            <mxPoint x="51" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-147" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-10" target="IS7OfrcVgxXRb15TEPke-43" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="631" />
+              <mxPoint x="1200" y="396" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -79,36 +71,43 @@
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="1200" y="905" />
-              <mxPoint x="1200" y="1025" />
+              <mxPoint x="1200" y="790" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-2" value="&amp;lt; Send request with signed JWT token with access rights of user &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-148" vertex="1" connectable="0">
           <mxGeometry x="-0.6062" y="1" relative="1" as="geometry">
-            <mxPoint x="62" y="1" as="offset" />
+            <mxPoint x="53" y="1" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-10" value="Naksha Proxy" style="shape=module;align=left;spacingLeft=20;align=center;verticalAlign=top;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="470" y="880" width="220" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-128" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;entryX=0;entryY=0.3;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-15" target="IS7OfrcVgxXRb15TEPke-50" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+        <mxCell id="IS7OfrcVgxXRb15TEPke-128" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;entryX=0.007;entryY=0.38;entryDx=0;entryDy=0;exitX=0.556;exitY=0.833;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-15" target="IS7OfrcVgxXRb15TEPke-50" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="2470" y="970" />
+              <mxPoint x="4010" y="970" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-15" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DCUHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="2880" y="930" width="180" height="90" as="geometry" />
+          <mxGeometry x="2370" y="845" width="180" height="90" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-16" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-15" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-129" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.7;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" source="IS7OfrcVgxXRb15TEPke-33" target="IS7OfrcVgxXRb15TEPke-50" edge="1">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-129" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" source="IS7OfrcVgxXRb15TEPke-33" target="IS7OfrcVgxXRb15TEPke-50" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <Array as="points" />
+            <Array as="points">
+              <mxPoint x="4040" y="790" />
+            </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-33" value="«IStorage»&lt;br&gt;&lt;b&gt;ConsistentStore&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="2520" y="1082" width="160" height="60" as="geometry" />
+          <mxGeometry x="2115" y="759.75" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-34" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-33" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -122,7 +121,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-41" value="«Space»&lt;br&gt;&lt;b&gt;Topology-View&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="870" width="205" height="60" as="geometry" />
+          <mxGeometry x="1270" y="639.5" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-42" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-41" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -133,28 +132,27 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-43" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Delta&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="601.25" width="205" height="60" as="geometry" />
+          <mxGeometry x="1270" y="366" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-44" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-43" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-149" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" source="IS7OfrcVgxXRb15TEPke-45" target="IS7OfrcVgxXRb15TEPke-122" edge="1">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-149" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" source="IS7OfrcVgxXRb15TEPke-45" target="IS7OfrcVgxXRb15TEPke-122" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="2030" y="1010" />
-              <mxPoint x="2030" y="1010" />
+              <mxPoint x="1372" y="860" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-151" value="&amp;lt; alternative short term solution &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-149" vertex="1" connectable="0">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-151" value="&amp;lt; alternative solution &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-149" vertex="1" connectable="0">
           <mxGeometry x="-0.1334" y="1" relative="1" as="geometry">
-            <mxPoint x="257" y="1" as="offset" />
+            <mxPoint x="115" y="1" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-45" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Base&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="995" width="205" height="60" as="geometry" />
+          <mxGeometry x="1270" y="759.75" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-46" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-45" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -162,36 +160,20 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-49" value="DCU" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="3930" y="970" width="620" height="620" as="geometry" />
+          <mxGeometry x="3930" y="848" width="620" height="620" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-50" value="Consistent&lt;br&gt;Store" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="4010" y="1070" width="60" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-103" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="IS7OfrcVgxXRb15TEPke-51" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1130" y="330" />
-              <mxPoint x="1130" y="535" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-51" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1587.5" y="300" width="160" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-52" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-51" vertex="1">
-          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
-            <mxPoint x="-27" y="7" as="offset" />
-          </mxGeometry>
+          <mxGeometry x="4010" y="948" width="60" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-53" target="IS7OfrcVgxXRb15TEPke-131" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="4090" y="1040" />
+              <mxPoint x="4090" y="918" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-53" value="«DCU»&lt;br&gt;&lt;b&gt;BucketProcessor&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="4160" y="1130" width="180" height="90" as="geometry" />
+          <mxGeometry x="4160" y="1008" width="180" height="90" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-54" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-53" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -201,13 +183,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-72" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-55" target="IS7OfrcVgxXRb15TEPke-131" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="4440" y="1304" />
-              <mxPoint x="4440" y="1010" />
+              <mxPoint x="4440" y="1182" />
+              <mxPoint x="4440" y="888" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-55" value="«DCU»&lt;br&gt;&lt;b&gt;Change-Set-Publisher&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="4160" y="1259" width="180" height="90" as="geometry" />
+          <mxGeometry x="4160" y="1137" width="180" height="90" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-56" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-55" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -218,20 +200,24 @@
           <mxGeometry x="480" y="440" width="580" height="520" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-58" value="Wikvaya DB" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="770" y="500" width="70" height="70" as="geometry" />
+          <mxGeometry x="785" y="550" width="70" height="70" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-67" value="UTM" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;fillColor=#e1d5e7;strokeColor=#9673a6;strokeWidth=3;" parent="1" vertex="1">
           <mxGeometry x="480" y="1070" width="580" height="760" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-73" value="Two options:&lt;br&gt;1. Implement open source IStorage, then use default storage handler.&lt;br&gt;2. Implement using proprietary library and code, then use an extension handler." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="1830" y="860" width="540" height="90" as="geometry" />
+          <mxGeometry x="1894.95" y="574" width="385.05" height="166" as="geometry" />
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-82" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.15;entryY=0.95;entryDx=0;entryDy=0;entryPerimeter=0;exitX=1;exitY=0.25;exitDx=0;exitDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-76" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+        <mxCell id="IS7OfrcVgxXRb15TEPke-82" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-76" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="810" y="703" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-101" value="Generate access matrix" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-82" vertex="1" connectable="0">
           <mxGeometry x="-0.646" y="1" relative="1" as="geometry">
-            <mxPoint x="-10" y="-31" as="offset" />
+            <mxPoint x="14" y="-28" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-90" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-76" target="IS7OfrcVgxXRb15TEPke-80" edge="1">
@@ -239,26 +225,30 @@
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-100" value="Create temporary token with access matrix" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-90" vertex="1" connectable="0">
           <mxGeometry x="-0.2614" y="-1" relative="1" as="geometry">
-            <mxPoint x="61" y="5" as="offset" />
+            <mxPoint x="111" y="1" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-76" value="UPM API&lt;br&gt;&lt;i&gt;&lt;font style=&quot;font-size: 11px;&quot;&gt;User Permission Management&lt;/font&gt;&lt;/i&gt;" style="shape=module;align=left;spacingLeft=20;align=center;verticalAlign=top;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="470" y="690" width="220" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-102" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-77" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-102" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-77" target="tEJrlQ6ppj-9RkD4eFKq-27" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-77" value="Map Feedback API" style="shape=module;align=left;spacingLeft=20;align=center;verticalAlign=top;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="470" y="570" width="220" height="50" as="geometry" />
+          <mxGeometry x="470" y="482" width="220" height="50" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-81" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-78" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-78" value="Geospace API" style="shape=module;align=left;spacingLeft=20;align=center;verticalAlign=top;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="470" y="510" width="220" height="50" as="geometry" />
+          <mxGeometry x="470" y="560" width="220" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-83" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-80" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+        <mxCell id="IS7OfrcVgxXRb15TEPke-83" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-80" target="IS7OfrcVgxXRb15TEPke-58" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="840" y="805" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-80" value="Token API" style="shape=module;align=left;spacingLeft=20;align=center;verticalAlign=top;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="470" y="780" width="220" height="50" as="geometry" />
@@ -315,7 +305,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-98" value="&amp;lt; Resolve HERE token to user details &amp;gt;" style="html=1;verticalAlign=bottom;endArrow=block;edgeStyle=elbowEdgeStyle;elbow=vertical;curved=0;rounded=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=none;startFill=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-76" target="IS7OfrcVgxXRb15TEPke-95" edge="1">
-          <mxGeometry x="-0.6492" y="-5" width="80" relative="1" as="geometry">
+          <mxGeometry x="-0.5953" y="-5" width="80" relative="1" as="geometry">
             <mxPoint x="1060" y="550.3333333333333" as="sourcePoint" />
             <mxPoint x="1280" y="550" as="targetPoint" />
             <Array as="points">
@@ -327,38 +317,32 @@
         <mxCell id="IS7OfrcVgxXRb15TEPke-111" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-105" target="IS7OfrcVgxXRb15TEPke-45" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1620" y="960" />
-              <mxPoint x="1372" y="960" />
+              <mxPoint x="1730" y="725" />
+              <mxPoint x="1372" y="725" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-115" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-105" target="IS7OfrcVgxXRb15TEPke-43" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1620" y="720" />
-              <mxPoint x="1373" y="720" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-145" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-105" target="IS7OfrcVgxXRb15TEPke-139" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1650" y="500" />
-              <mxPoint x="1373" y="500" />
+              <mxPoint x="1730" y="600" />
+              <mxPoint x="1540" y="600" />
+              <mxPoint x="1540" y="485" />
+              <mxPoint x="1373" y="485" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="IS7OfrcVgxXRb15TEPke-105">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-105" edge="1" target="LxGrSM87_I9BfTGoM96F-46">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="1475" y="800" as="targetPoint" />
+            <mxPoint x="1475" y="564.75" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="1600" y="800" />
-              <mxPoint x="1475" y="800" />
+              <mxPoint x="1770" y="620" />
+              <mxPoint x="1373" y="620" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-105" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ViewHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1580" y="870" width="160" height="60" as="geometry" />
+          <mxGeometry x="1690" y="639.5" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-106" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-105" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -369,7 +353,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-118" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="2299.95" y="1082" width="160" height="60" as="geometry" />
+          <mxGeometry x="1894.95" y="759.75" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-119" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-118" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -377,42 +361,44 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-122" target="IS7OfrcVgxXRb15TEPke-15" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="2210" y="870" />
+              <mxPoint x="2210" y="870" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-122" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ExtensionHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="2300" y="980" width="160" height="60" as="geometry" />
+          <mxGeometry x="1894.9500000000003" y="840" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-123" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-122" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-120" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" source="IS7OfrcVgxXRb15TEPke-45" target="IS7OfrcVgxXRb15TEPke-118" edge="1">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-120" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" source="IS7OfrcVgxXRb15TEPke-45" target="IS7OfrcVgxXRb15TEPke-118" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="2240" y="1040" />
-              <mxPoint x="2240" y="1060" />
-              <mxPoint x="2380" y="1060" />
-            </Array>
+            <Array as="points" />
+            <mxPoint x="1831" y="790" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-150" value="&amp;lt; recommended medium term solution &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="IS7OfrcVgxXRb15TEPke-120" vertex="1" connectable="0">
           <mxGeometry x="-0.0039" y="4" relative="1" as="geometry">
-            <mxPoint x="163" y="4" as="offset" />
+            <mxPoint x="7" y="4" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-134" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0.005;exitY=0.329;exitDx=0;exitDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;exitPerimeter=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-131" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
+        <mxCell id="IS7OfrcVgxXRb15TEPke-134" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="IS7OfrcVgxXRb15TEPke-131" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="4120" y="1027" />
-              <mxPoint x="4120" y="40" />
+              <mxPoint x="3910" y="900" />
+              <mxPoint x="3910" y="40" />
               <mxPoint x="1130" y="40" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-131" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="4040" y="992" width="160" height="60" as="geometry" />
+          <mxGeometry x="4080" y="870" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-132" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-131" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -420,32 +406,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-137" value="The bucket processor is expected to read from the moderation database delta collection (alias DLB - dead letter bucket). It should simply fetch all features being in the review-state &lt;b&gt;ENDORSED&lt;/b&gt;.&lt;br&gt;&lt;br&gt;The change-set-publisher should write all features where the integration has failed with the review-state &lt;b&gt;FAILED&lt;/b&gt; back into the delta collection (DLB). Additionally (in the same transaction) it should write all violations into the violation collection. It is expected as well, that all features that where successfully integrated are removed from delta collection (DLB).&lt;br&gt;&lt;br&gt;Conflicts can be handled by the provided Naksha library." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="4140" y="770" width="620" height="190" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-138" value="DCU can use a template provided by Naksha and implement a handler that performs the database access. Deployment is controlled by DUC, changed whenever wanted.&lt;br&gt;This method has the disadvantage, that Naksha will not be able to know that this is a storage, so no subscriptions are available for the consistent store." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="2380" y="820" width="349" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-143" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-139" target="IS7OfrcVgxXRb15TEPke-141" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-139" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Violations&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="400" width="205" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-140" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-139" vertex="1">
-          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
-            <mxPoint x="-27" y="7" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-144" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="IS7OfrcVgxXRb15TEPke-141" target="IS7OfrcVgxXRb15TEPke-51" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-141" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1587.5" y="400" width="160" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IS7OfrcVgxXRb15TEPke-142" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="IS7OfrcVgxXRb15TEPke-141" vertex="1">
-          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
-            <mxPoint x="-27" y="7" as="offset" />
-          </mxGeometry>
+          <mxGeometry x="4060" y="620" width="600" height="220" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-152" value="Event Pipeline" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;width=70;height=40;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=3;" parent="1" vertex="1">
           <mxGeometry x="2310" y="240" width="1540" height="530" as="geometry" />
@@ -457,13 +418,13 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="IS7OfrcVgxXRb15TEPke-153">
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="IS7OfrcVgxXRb15TEPke-153">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="1530" y="430" as="targetPoint" />
+            <mxPoint x="1560" y="390" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-153" value="Event Pipeline Details" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1790" y="230" width="140" height="70" as="geometry" />
+          <mxGeometry x="1925" y="230" width="140" height="70" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-219" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-164" target="IS7OfrcVgxXRb15TEPke-181" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -541,8 +502,7 @@
         <mxCell id="IS7OfrcVgxXRb15TEPke-221" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="IS7OfrcVgxXRb15TEPke-181" target="IS7OfrcVgxXRb15TEPke-185" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="3640" y="560" />
-              <mxPoint x="3640" y="560" />
+              <mxPoint x="3640" y="546" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -553,7 +513,7 @@
           <mxGeometry y="37" width="250" height="26" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-185" value="&lt;i style=&quot;border-color: var(--border-color);&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;&amp;lt;&amp;lt;&amp;lt;&amp;nbsp;&lt;/font&gt;&lt;font style=&quot;font-size: 12px;&quot;&gt;IStorage&amp;nbsp;&lt;/font&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;&amp;gt;&amp;gt;&amp;gt;&lt;/font&gt;&lt;/i&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;PsqlStorage&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=37;fillColor=#60a917;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="3230" y="590" width="320" height="89" as="geometry" />
+          <mxGeometry x="3230" y="501.25" width="320" height="89" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-186" value="+ new(naksha : INaksha, eventHandler: EventHandler)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="IS7OfrcVgxXRb15TEPke-185" vertex="1">
           <mxGeometry y="37" width="320" height="26" as="geometry" />
@@ -588,7 +548,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-217" value="The &lt;b&gt;default storage handler&lt;/b&gt; reads the &lt;b&gt;space&lt;/b&gt; from the &lt;b&gt;event&lt;/b&gt;. Then it asks &lt;b&gt;Naksha&lt;/b&gt; for the &lt;b&gt;storage&lt;/b&gt; implementation. Naksha does return an object implementing the &lt;b&gt;IStorage&lt;/b&gt; interface. It does so, by reading the user defined &lt;b&gt;storage&lt;/b&gt; configuration, in which it find the className, while the properties are arbitrary configuration details defined by the implementation.&lt;br&gt;&lt;br&gt;For example, the default &lt;b&gt;PsqlStorage&lt;/b&gt; implementation will require a &lt;b&gt;url&lt;/b&gt; property storing the JDBC URL of the database to connect to, and some other properties for details like statement- and lock-timeout." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="3190" y="690" width="660" height="170" as="geometry" />
+          <mxGeometry x="3180" y="586" width="660" height="170" as="geometry" />
         </mxCell>
         <mxCell id="IS7OfrcVgxXRb15TEPke-222" value="IStorage" style="html=1;verticalAlign=bottom;endArrow=open;dashed=1;endSize=8;edgeStyle=elbowEdgeStyle;elbow=vertical;curved=0;rounded=0;entryX=1.004;entryY=0.929;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" target="IS7OfrcVgxXRb15TEPke-165" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -647,7 +607,7 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-5" value="This is the default storage handler provided by Naksha out of the box. It reads the &lt;b&gt;storageId&lt;/b&gt; from the &lt;b&gt;space&lt;/b&gt; and will apply read/write actions to the first collection of that storage.&lt;br&gt;For this it will ask the Naksha host to resolve the &lt;b&gt;storageId&lt;/b&gt; into a concrete implementation providing the &lt;b&gt;&lt;i&gt;IStorage&lt;/i&gt;&lt;/b&gt; interface, which it will use the fullfil the event.&lt;br&gt;This handler consumes the event, if it handles it and forward unhandled events further down the pipeline. In this example the final handler would then return a UnsupportedEventResponse." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="QiJwT_M8jZvrQRE63DZS-9" vertex="1">
           <mxGeometry width="460" height="160" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-62" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-10" target="LxGrSM87_I9BfTGoM96F-60">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-62" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-10" target="LxGrSM87_I9BfTGoM96F-60" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-10" value="" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=#232F3E;gradientColor=#FF4F8B;gradientDirection=north;fillColor=#BC1356;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.sns;" parent="1" vertex="1">
@@ -662,7 +622,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-11" value="«Subscription»&lt;br&gt;&lt;b&gt;UTM-Topology-Subscription&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="1565" y="1790" width="205" height="60" as="geometry" />
+          <mxGeometry x="1565" y="1990" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-12" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-11" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -678,7 +638,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-13" value="«Subscription»&lt;br&gt;&lt;b&gt;Validation / Endorse Subscription&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1565" y="1920" width="205" height="60" as="geometry" />
+          <mxGeometry x="1565" y="2120" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-14" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-13" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -697,24 +657,22 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-16" value="«IEventHandler»&lt;br&gt;&lt;b&gt;FeatureLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="1935" y="1790" width="160" height="60" as="geometry" />
+          <mxGeometry x="1935" y="1990" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-17" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-16" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#6a00ff;strokeColor=#3700CC;dashed=1;strokeWidth=2;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-18" target="QiJwT_M8jZvrQRE63DZS-10" edge="1">
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#6a00ff;strokeColor=#3700CC;dashed=1;strokeWidth=2;" parent="1" source="QiJwT_M8jZvrQRE63DZS-18" target="QiJwT_M8jZvrQRE63DZS-10" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="2360" y="1790" />
-              <mxPoint x="2360" y="1680" />
-              <mxPoint x="979" y="1680" />
+              <mxPoint x="2350" y="1680" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-18" value="«IEventHandler»&lt;br&gt;&lt;b&gt;SNSPublisher&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="2275" y="1790" width="160" height="60" as="geometry" />
+          <mxGeometry x="2275" y="1990" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-19" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-18" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -724,13 +682,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="QiJwT_M8jZvrQRE63DZS-20" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="2050" />
+              <mxPoint x="1130" y="2240" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-20" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1935" y="2010" width="160" height="60" as="geometry" />
+          <mxGeometry x="1935" y="2210" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-21" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-20" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -740,31 +698,31 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-107" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="QiJwT_M8jZvrQRE63DZS-26" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="2944" y="2020" />
-              <mxPoint x="2910" y="2020" />
+              <mxPoint x="2944" y="2220" />
+              <mxPoint x="2910" y="2220" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-108" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="QiJwT_M8jZvrQRE63DZS-24" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="LxGrSM87_I9BfTGoM96F-1">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="LxGrSM87_I9BfTGoM96F-1" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="2944" y="2020" />
-              <mxPoint x="3050" y="2020" />
+              <mxPoint x="2944" y="2220" />
+              <mxPoint x="3050" y="2220" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="LxGrSM87_I9BfTGoM96F-29">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-22" target="LxGrSM87_I9BfTGoM96F-29" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="2944" y="2020" />
+              <mxPoint x="2944" y="2220" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-22" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ValidationHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;" parent="1" vertex="1">
-          <mxGeometry x="2864" y="1920" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-22" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ValidationHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="2864" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-23" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-22" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -774,8 +732,8 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-112" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-24" target="QiJwT_M8jZvrQRE63DZS-73" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-24" value="«IEventHandler»&lt;br&gt;&lt;b&gt;EndorseHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;" parent="1" vertex="1">
-          <mxGeometry x="3280" y="1920" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-24" value="«IEventHandler»&lt;br&gt;&lt;b&gt;EndorseHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="3280" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-25" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-24" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -783,7 +741,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-26" value="« ? »&lt;br&gt;&lt;b&gt;Validation&lt;br&gt;Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="2830" y="2070" width="160" height="60" as="geometry" />
+          <mxGeometry x="2830" y="2270" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-27" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-26" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -793,13 +751,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="QiJwT_M8jZvrQRE63DZS-35" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="2100" />
+              <mxPoint x="1130" y="2300" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-35" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="2625" y="2070" width="160" height="60" as="geometry" />
+          <mxGeometry x="2625" y="2270" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-36" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-35" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -809,13 +767,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;dashed=1;strokeWidth=2;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" source="QiJwT_M8jZvrQRE63DZS-42" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="1740" />
+              <mxPoint x="1130" y="1930" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-42" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1935" y="1698" width="160" height="60" as="geometry" />
+          <mxGeometry x="1935" y="1898" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-43" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-42" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -826,22 +784,24 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-49" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1690" y="601.25" width="160" height="60" as="geometry" />
+          <mxGeometry x="1690" y="366" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-50" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-49" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-56" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="QiJwT_M8jZvrQRE63DZS-52" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-56" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;exitX=0.003;exitY=0.329;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-52" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1880" y="535" />
+              <mxPoint x="1691" y="310" />
+              <mxPoint x="1130" y="310" />
+              <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-52" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1690" y="515.25" width="160" height="60" as="geometry" />
+          <mxGeometry x="1690" y="280" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-53" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-52" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -849,21 +809,21 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-58" value="Subscriptions" style="shape=umlFrame;whiteSpace=wrap;html=1;pointerEvents=0;width=88;height=40;fillColor=#008a00;strokeColor=#005700;dashed=1;strokeWidth=2;fontColor=#ffffff;dashPattern=1 1;" parent="1" vertex="1">
-          <mxGeometry x="1262.5" y="1440" width="2527.5" height="950" as="geometry" />
+          <mxGeometry x="1262.5" y="1630" width="2527.5" height="1110" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-60" value="&lt;b&gt;TODO&lt;/b&gt;: We need to ensure that all necessary rules (default rules) are readable from the DCU libraries, for example &lt;i&gt;getDefaultRules()&lt;/i&gt; ? Otherwise it is easy to miss a change and to get DCU validation divergating away from Naksha." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="1520" y="1458" width="600" height="192" as="geometry" />
+          <mxGeometry x="1530" y="1700" width="760" height="192" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-68" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-61" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="1520" />
+              <mxPoint x="1130" y="1720" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-61" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="1490" width="160" height="60" as="geometry" />
+          <mxGeometry x="1280" y="1690" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-62" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-61" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -873,7 +833,7 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-69" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-64" target="QiJwT_M8jZvrQRE63DZS-13" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1330" y="1950" />
+              <mxPoint x="1330" y="2150" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -884,9 +844,9 @@
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-70" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-64" target="QiJwT_M8jZvrQRE63DZS-11" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="1595" y="1750" as="targetPoint" />
+            <mxPoint x="1595" y="1950" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="1368" y="1820" />
+              <mxPoint x="1368" y="2020" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -898,25 +858,25 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-148" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-64" target="QiJwT_M8jZvrQRE63DZS-61" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1500" y="1615" />
-              <mxPoint x="1500" y="1520" />
+              <mxPoint x="1500" y="1815" />
+              <mxPoint x="1500" y="1720" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-64" target="LxGrSM87_I9BfTGoM96F-11">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-64" target="LxGrSM87_I9BfTGoM96F-11" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1300" y="2220" />
+              <mxPoint x="1300" y="2420" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-14" value="&amp;lt; TransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="LxGrSM87_I9BfTGoM96F-13">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-14" value="&amp;lt; TransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="LxGrSM87_I9BfTGoM96F-13" vertex="1" connectable="0">
           <mxGeometry x="0.7106" y="3" relative="1" as="geometry">
             <mxPoint y="3" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-64" value="« INaksha »&lt;br&gt;&lt;b&gt;Naksha-Hub&lt;br&gt;Internal Storage Observer&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1280" y="1580" width="195" height="70" as="geometry" />
+          <mxGeometry x="1280" y="1780" width="195" height="70" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-65" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-64" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -927,7 +887,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-73" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="3520" y="1920" width="160" height="60" as="geometry" />
+          <mxGeometry x="3520" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-74" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-73" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -946,7 +906,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-80" value="«IEventHandler»&lt;br&gt;&lt;b&gt;FeatureLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="1935" y="1920" width="160" height="60" as="geometry" />
+          <mxGeometry x="1935" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-81" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-80" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -959,8 +919,8 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-106" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-82" target="QiJwT_M8jZvrQRE63DZS-22" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-82" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ContextLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;gradientDirection=south;" parent="1" vertex="1">
-          <mxGeometry x="2625" y="1920" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-82" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ContextLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;gradientDirection=south;" parent="1" vertex="1">
+          <mxGeometry x="2625" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-83" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-82" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -976,7 +936,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-85" value="«IEventHandler»&lt;br&gt;&lt;b&gt;TransactionEvent&lt;br&gt;to ModifyFeaturesEvent&lt;br&gt;Handler&lt;br&gt;&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="2275" y="1920" width="160" height="60" as="geometry" />
+          <mxGeometry x="2275" y="2120" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-86" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-85" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -984,7 +944,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-87" value="«IEventHandler»&lt;br&gt;&lt;b&gt;EchoHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="2630" y="1240" width="160" height="60" as="geometry" />
+          <mxGeometry x="2680" y="1440" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-88" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-87" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1000,7 +960,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-94" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Test&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="1240" width="205" height="60" as="geometry" />
+          <mxGeometry x="1270" y="1440" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-95" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-94" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1011,7 +971,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-96" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Test-View&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1270" y="1120" width="205" height="60" as="geometry" />
+          <mxGeometry x="1270" y="1320" width="205" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-97" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-96" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1021,13 +981,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-114" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;dashed=1;strokeWidth=2;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" source="QiJwT_M8jZvrQRE63DZS-109" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="2150" />
+              <mxPoint x="1130" y="2360" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-109" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="3520" y="2110" width="160" height="60" as="geometry" />
+          <mxGeometry x="3520" y="2310" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-110" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-109" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1040,29 +1000,28 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-135" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="QiJwT_M8jZvrQRE63DZS-116" target="QiJwT_M8jZvrQRE63DZS-120" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1940" y="1330" />
-              <mxPoint x="1900" y="1330" />
-              <mxPoint x="1900" y="1360" />
+              <mxPoint x="1990" y="1530" />
+              <mxPoint x="1960" y="1530" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-116" target="LxGrSM87_I9BfTGoM96F-7">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-116" target="LxGrSM87_I9BfTGoM96F-7" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1940" y="1330" />
-              <mxPoint x="2050" y="1330" />
+              <mxPoint x="1990" y="1530" />
+              <mxPoint x="2100" y="1530" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="QiJwT_M8jZvrQRE63DZS-116" target="LxGrSM87_I9BfTGoM96F-33">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-116" target="LxGrSM87_I9BfTGoM96F-33" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1940" y="1330" />
+              <mxPoint x="1990" y="1530" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-116" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ValidationHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;" parent="1" vertex="1">
-          <mxGeometry x="1860" y="1240" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-116" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ValidationHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="1910" y="1440" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-117" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-116" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1072,8 +1031,8 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-138" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-118" target="QiJwT_M8jZvrQRE63DZS-87" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-118" value="«IEventHandler»&lt;br&gt;&lt;b&gt;EndorseHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;" parent="1" vertex="1">
-          <mxGeometry x="2380" y="1240" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-118" value="«IEventHandler»&lt;br&gt;&lt;b&gt;EndorseHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="2430" y="1440" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-119" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-118" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1081,7 +1040,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-120" value="« ? »&lt;br&gt;&lt;b&gt;Validation&lt;br&gt;Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1830" y="1360" width="160" height="60" as="geometry" />
+          <mxGeometry x="1880" y="1560" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-121" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-120" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1091,13 +1050,13 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-137" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;dashed=1;strokeWidth=2;fillColor=#60a917;strokeColor=#2D7600;" parent="1" source="QiJwT_M8jZvrQRE63DZS-122" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="1390" />
+              <mxPoint x="1130" y="1590" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-122" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="1640" y="1360" width="160" height="60" as="geometry" />
+          <mxGeometry x="1690" y="1560" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-123" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-122" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1110,8 +1069,8 @@
         <mxCell id="QiJwT_M8jZvrQRE63DZS-136" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-126" target="QiJwT_M8jZvrQRE63DZS-122" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="QiJwT_M8jZvrQRE63DZS-126" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ContextLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#99CCFF;" parent="1" vertex="1">
-          <mxGeometry x="1640" y="1240" width="160" height="60" as="geometry" />
+        <mxCell id="QiJwT_M8jZvrQRE63DZS-126" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ContextLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="1690" y="1440" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-127" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-126" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
@@ -1119,211 +1078,323 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-139" value="TDB: Describe try-run and try-view" style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
-          <mxGeometry x="1780" y="1090" width="430" height="136" as="geometry" />
+          <mxGeometry x="1780" y="1290" width="430" height="136" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-143" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-140" target="QiJwT_M8jZvrQRE63DZS-94" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1660" y="1200" />
-              <mxPoint x="1372" y="1200" />
+              <mxPoint x="1660" y="1400" />
+              <mxPoint x="1372" y="1400" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-144" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;" parent="1" source="QiJwT_M8jZvrQRE63DZS-140" target="IS7OfrcVgxXRb15TEPke-41" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1660" y="1080" />
-              <mxPoint x="1220" y="1080" />
-              <mxPoint x="1220" y="920" />
+              <mxPoint x="1660" y="1300" />
+              <mxPoint x="1230" y="1300" />
+              <mxPoint x="1230" y="690" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-140" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ViewHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="1580" y="1120" width="160" height="60" as="geometry" />
+          <mxGeometry x="1580" y="1320" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="QiJwT_M8jZvrQRE63DZS-141" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="QiJwT_M8jZvrQRE63DZS-140" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=2;dashed=1;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-1" target="LxGrSM87_I9BfTGoM96F-5">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=2;dashed=1;" parent="1" source="LxGrSM87_I9BfTGoM96F-1" target="LxGrSM87_I9BfTGoM96F-5" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="4040" y="2090" />
+              <mxPoint x="4040" y="2290" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-1" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Management Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="3020" y="2070" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-1" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Management Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="3020" y="2270" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-2" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-1">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-2" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-1" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-5" value="Violation&lt;br&gt;Store" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
-          <mxGeometry x="4010" y="1166" width="60" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-5" value="Violation&lt;br&gt;Store" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+          <mxGeometry x="4010" y="1044" width="60" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-7" target="LxGrSM87_I9BfTGoM96F-5">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-7" target="LxGrSM87_I9BfTGoM96F-5" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-7" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Management Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="2020" y="1360" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-7" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Management Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="2070" y="1560" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-8" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-7">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-8" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-7" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-11" target="LxGrSM87_I9BfTGoM96F-15">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="LxGrSM87_I9BfTGoM96F-11" target="LxGrSM87_I9BfTGoM96F-15" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-18" value="&amp;lt; TransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="LxGrSM87_I9BfTGoM96F-17">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-18" value="&amp;lt; TransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="LxGrSM87_I9BfTGoM96F-17" vertex="1" connectable="0">
           <mxGeometry x="-0.1804" y="-3" relative="1" as="geometry">
             <mxPoint x="9" y="-3" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-11" value="«Subscription»&lt;br&gt;&lt;b&gt;DCU Event-Store Subscription&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
-          <mxGeometry x="1565" y="2190" width="205" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-11" value="«Subscription»&lt;br&gt;&lt;b&gt;DCU Event-Store Subscription&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
+          <mxGeometry x="1565" y="2390" width="205" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-12" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-11">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-12" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-11" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-15" target="LxGrSM87_I9BfTGoM96F-19">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="LxGrSM87_I9BfTGoM96F-15" target="LxGrSM87_I9BfTGoM96F-19" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-15" target="LxGrSM87_I9BfTGoM96F-23">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="LxGrSM87_I9BfTGoM96F-15" target="LxGrSM87_I9BfTGoM96F-23" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-26" value="&amp;lt; FullTransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="LxGrSM87_I9BfTGoM96F-25">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-26" value="&amp;lt; FullTransactionEvent &amp;gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="LxGrSM87_I9BfTGoM96F-25" vertex="1" connectable="0">
           <mxGeometry x="-0.0978" y="1" relative="1" as="geometry">
             <mxPoint x="3" y="1" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-15" value="«IEventHandler»&lt;br&gt;&lt;b&gt;FeatureLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="1">
-          <mxGeometry x="1937.5" y="2190" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-15" value="«IEventHandler»&lt;br&gt;&lt;b&gt;FeatureLoader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
+          <mxGeometry x="1937.5" y="2390" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-16" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-15">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-16" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-15" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-19" target="IS7OfrcVgxXRb15TEPke-9">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-19" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="2320" />
+              <mxPoint x="1130" y="2520" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-19" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="1937.5" y="2290" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-19" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="1937.5" y="2490" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-20" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-19">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-20" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-19" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-40" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-23" target="LxGrSM87_I9BfTGoM96F-39">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-40" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-23" target="LxGrSM87_I9BfTGoM96F-39" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="4600" y="2220" />
-              <mxPoint x="4600" y="1496" />
+              <mxPoint x="4630" y="2420" />
+              <mxPoint x="4630" y="1373" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-23" value="«IEventHandler»&lt;br&gt;&lt;b&gt;Event-Store S3 Uploader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
-          <mxGeometry x="2275" y="2190" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-23" value="«IEventHandler»&lt;br&gt;&lt;b&gt;Event-Store S3 Uploader&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+          <mxGeometry x="2275" y="2390" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-24" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-23">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-24" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-23" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-29" target="LxGrSM87_I9BfTGoM96F-5">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-29" target="LxGrSM87_I9BfTGoM96F-5" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-29" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Storage Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="3110" y="1990" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-29" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Storage Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="3110" y="2190" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-30" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-29">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-30" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-29" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-33" target="LxGrSM87_I9BfTGoM96F-5">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-33" target="LxGrSM87_I9BfTGoM96F-5" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-33" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Storage Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="2097.5" y="1289" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-33" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Storage Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="2147.5" y="1489" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-34" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-33">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-34" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-33" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-39" value="&lt;font style=&quot;font-size: 13px;&quot;&gt;Moderation Event Store&lt;/font&gt;" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.s3;fillColor=#E05243;gradientColor=none;" vertex="1" parent="1">
-          <mxGeometry x="4411.75" y="1450" width="76.5" height="93" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-39" value="&lt;font style=&quot;font-size: 13px;&quot;&gt;Moderation Event Store&lt;/font&gt;" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.s3;fillColor=#E05243;gradientColor=none;" parent="1" vertex="1">
+          <mxGeometry x="4411.75" y="1327" width="76.5" height="93" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-41" value="Naksha guarantees that this is only called for features being in the &lt;b&gt;ENDORSED&lt;/b&gt; review-state.&lt;br&gt;Call is guaranteed to be at least ones." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" vertex="1" parent="1">
-          <mxGeometry x="2130" y="2260" width="280" height="90" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-41" value="Naksha guarantees that this is only called for features being in the &lt;b&gt;ENDORSED&lt;/b&gt; review-state.&lt;br&gt;Call is guaranteed to be at least ones." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
+          <mxGeometry x="2130" y="2460" width="280" height="90" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-42" value="&lt;b&gt;Question&lt;/b&gt;: What happens for &quot;bad&quot; feature.&lt;br&gt;&lt;b&gt;Proposal&lt;/b&gt;: Flag the feature and lets not endorse it, need to be reviewed manually by moderator.&lt;br&gt;Is it right to set review-state into &lt;b&gt;AUTO_REVIEW_DEFERRED&lt;/b&gt; ?" style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" vertex="1" parent="1">
-          <mxGeometry x="2864" y="1810" width="576" height="110" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-42" value="&lt;b&gt;Question&lt;/b&gt;: What happens for &quot;bad&quot; feature.&lt;br&gt;&lt;b&gt;Proposal&lt;/b&gt;: Flag the feature and lets not endorse it, need to be reviewed manually by moderator.&lt;br&gt;Is it right to set review-state into &lt;b&gt;AUTO_REVIEW_DEFERRED&lt;/b&gt; ?" style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
+          <mxGeometry x="2864" y="2010" width="576" height="110" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-58" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-46" target="LxGrSM87_I9BfTGoM96F-53">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-58" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="LxGrSM87_I9BfTGoM96F-46" target="LxGrSM87_I9BfTGoM96F-53" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1580" y="780" />
-              <mxPoint x="1580" y="780" />
+              <mxPoint x="1580" y="544.75" />
+              <mxPoint x="1580" y="544.75" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-46" value="«Space»&lt;br&gt;&lt;b&gt;Topology-DLB&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
-          <mxGeometry x="1270" y="760" width="205" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-46" value="«Space»&lt;br&gt;&lt;b&gt;Topology-DLB&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
+          <mxGeometry x="1270" y="524.75" width="205" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-47" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-46">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-47" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-46" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-59" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-53" target="LxGrSM87_I9BfTGoM96F-55">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-59" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="LxGrSM87_I9BfTGoM96F-53" target="LxGrSM87_I9BfTGoM96F-55" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-53" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
-          <mxGeometry x="1690" y="760" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-53" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
+          <mxGeometry x="1690" y="524.75" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-54" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-53">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-54" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-53" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-57" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" edge="1" parent="1" source="LxGrSM87_I9BfTGoM96F-55" target="IS7OfrcVgxXRb15TEPke-9">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-57" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" parent="1" source="LxGrSM87_I9BfTGoM96F-55" target="IS7OfrcVgxXRb15TEPke-9" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1130" y="707" />
+              <mxPoint x="1130" y="460" />
               <mxPoint x="1130" y="535" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-55" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
-          <mxGeometry x="1690" y="676.5" width="160" height="60" as="geometry" />
+        <mxCell id="LxGrSM87_I9BfTGoM96F-55" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="1690" y="441.25" width="160" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-56" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-55">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-56" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-55" vertex="1">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-60" value="« ? »&lt;br&gt;&lt;b&gt;Map Task Creation&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="1">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-60" value="« ? »&lt;br&gt;&lt;b&gt;Map Task Creation&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
           <mxGeometry x="650" y="1490" width="205" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="LxGrSM87_I9BfTGoM96F-61" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="LxGrSM87_I9BfTGoM96F-60">
+        <mxCell id="LxGrSM87_I9BfTGoM96F-61" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="LxGrSM87_I9BfTGoM96F-60" vertex="1">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="0Ue8Aar7UCkjMRhmWFa_-1" target="0Ue8Aar7UCkjMRhmWFa_-3">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="0Ue8Aar7UCkjMRhmWFa_-1" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ValidationStoreConnector&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#DAE8FC;" parent="1" vertex="1">
+          <mxGeometry x="1690" y="1200" width="160" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0Ue8Aar7UCkjMRhmWFa_-2" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="0Ue8Aar7UCkjMRhmWFa_-1" vertex="1">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;strokeWidth=2;fillColor=#dae8fc;strokeColor=#6c8ebf;" edge="1" parent="1" source="0Ue8Aar7UCkjMRhmWFa_-3" target="LxGrSM87_I9BfTGoM96F-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="0Ue8Aar7UCkjMRhmWFa_-3" value="« ? »&lt;br&gt;&lt;b&gt;Violation&lt;br&gt;Storage Library&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#ffffff;" parent="1" vertex="1">
+          <mxGeometry x="1940" y="1200" width="160" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="0Ue8Aar7UCkjMRhmWFa_-4" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" parent="0Ue8Aar7UCkjMRhmWFa_-3" vertex="1">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="IS7OfrcVgxXRb15TEPke-138" value="DCU can use a template provided by Naksha and implement a handler that performs the database access. Deployment is controlled by DUC, changed whenever wanted.&lt;br&gt;This method has the disadvantage, that Naksha will not be able to know that this is a storage, so no subscriptions are available for the consistent store." style="html=1;shadow=0;dashed=0;shape=mxgraph.bootstrap.rrect;rSize=5;strokeColor=#999999;strokeWidth=1;fillColor=#FFFFFF;fontColor=#6C767D;whiteSpace=wrap;align=left;verticalAlign=middle;spacingLeft=10;fontSize=14;spacing=10;" parent="1" vertex="1">
+          <mxGeometry x="2550" y="815" width="349" height="130" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-2" target="tEJrlQ6ppj-9RkD4eFKq-11">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-2" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Violations-View&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="1270" y="1098" width="205" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-3" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-2">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-4" target="0Ue8Aar7UCkjMRhmWFa_-1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-4" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Violations-Base&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="1270" y="1200" width="205" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-5" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-4">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-6" target="tEJrlQ6ppj-9RkD4eFKq-20">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-6" value="«Space»&lt;br&gt;&lt;b&gt;Topology-Violations-Delta&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="1270" y="990" width="205" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-7" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-6">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-11" target="tEJrlQ6ppj-9RkD4eFKq-4">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1770" y="1180" />
+              <mxPoint x="1372" y="1180" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-11" target="tEJrlQ6ppj-9RkD4eFKq-6">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1770" y="1080" />
+              <mxPoint x="1372" y="1080" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-11" value="«IEventHandler»&lt;br&gt;&lt;b&gt;ViewHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="1690" y="1098" width="160" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-12" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-11">
           <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
             <mxPoint x="-27" y="7" as="offset" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;dashed=1;strokeWidth=2;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-18" target="IS7OfrcVgxXRb15TEPke-9">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1130" y="930" />
+              <mxPoint x="1130" y="535" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-18" value="«IStorage»&lt;br&gt;&lt;b&gt;PsqlStorage&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" vertex="1" parent="1">
+          <mxGeometry x="1690" y="900" width="160" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-19" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-18">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="tEJrlQ6ppj-9RkD4eFKq-20" target="tEJrlQ6ppj-9RkD4eFKq-18">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-20" value="«IEventHandler»&lt;br&gt;&lt;b&gt;DefaultStorageHandler&lt;/b&gt;" style="html=1;dropTarget=0;whiteSpace=wrap;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="1690" y="990" width="160" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-21" value="" style="shape=module;jettyWidth=8;jettyHeight=4;" vertex="1" parent="tEJrlQ6ppj-9RkD4eFKq-20">
+          <mxGeometry x="1" width="20" height="20" relative="1" as="geometry">
+            <mxPoint x="-27" y="7" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="tEJrlQ6ppj-9RkD4eFKq-27" value="Feedback DB" style="shape=datastore;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
+          <mxGeometry x="785" y="472" width="70" height="70" as="geometry" />
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>