diff --git a/doc/sceneClasses.graphml b/doc/sceneClasses.graphml
index 734066d..a199776 100644
--- a/doc/sceneClasses.graphml
+++ b/doc/sceneClasses.graphml
@@ -17,7 +17,7 @@
     <node id="n0">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="107.0" x="432.89516216216185" y="0.0"/>
+          <y:Geometry height="37.0" width="107.0" x="123.625" y="0.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="66.712890625" x="20.1435546875" y="9.1494140625">SceneNode<y:LabelModel>
@@ -34,7 +34,7 @@
     <node id="n1">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="107.0" x="309.27016216216185" y="77.0"/>
+          <y:Geometry height="37.0" width="107.0" x="137.0" y="77.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="74.705078125" x="16.1474609375" y="9.1494140625">GraphicNode<y:LabelModel>
@@ -51,10 +51,10 @@
     <node id="n2">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="153.0" x="208.14516216216188" y="154.0"/>
+          <y:Geometry height="37.0" width="153.0" x="122.4170634920635" y="154.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="126.736328125" x="13.131835937500028" y="9.1494140625">GraphicContainerNode<y:LabelModel>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="126.736328125" x="13.1318359375" y="9.1494140625">GraphicContainerNode<y:LabelModel>
               <y:SmartNodeLabelModel distance="4.0"/>
             </y:LabelModel>
             <y:ModelParameter>
@@ -68,7 +68,7 @@
     <node id="n3">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="107.0" x="446.27016216216185" y="77.0"/>
+          <y:Geometry height="37.0" width="107.0" x="0.0" y="77.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="84.71875" x="11.140625" y="9.1494140625">ContainerNode<y:LabelModel>
@@ -85,7 +85,7 @@
     <node id="n4">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="81.0" x="271.4927812097809" y="524.4875675675677"/>
+          <y:Geometry height="37.0" width="81.0" x="328.7027777777778" y="510.3464864864866"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="62.03125" x="9.484375" y="9.1494140625">MeshNode<y:LabelModel>
@@ -102,7 +102,7 @@
     <node id="n5">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="81.0" x="391.14516216216185" y="154.0"/>
+          <y:Geometry height="37.0" width="81.0" x="11.417063492063491" y="154.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="58.708984375" x="11.1455078125" y="9.1494140625">LightNode<y:LabelModel>
@@ -119,7 +119,7 @@
     <node id="n6">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="107.0" x="583.2701621621619" y="77.0"/>
+          <y:Geometry height="37.0" width="107.0" x="274.0" y="77.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="75.3671875" x="15.81640625" y="9.1494140625">CameraNode<y:LabelModel>
@@ -136,10 +136,10 @@
     <node id="n7">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="81.0" x="27.67016216216188" y="591.4875675675677"/>
+          <y:Geometry height="37.0" width="81.0" x="182.37698412698413" y="577.3464864864866"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.025390625" x="12.487304687500007" y="9.1494140625">TextNode<y:LabelModel>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.025390625" x="12.4873046875" y="9.1494140625">TextNode<y:LabelModel>
               <y:SmartNodeLabelModel distance="4.0"/>
             </y:LabelModel>
             <y:ModelParameter>
@@ -151,10 +151,9 @@
       </data>
     </node>
     <node id="n8">
-      <data key="d5"/>
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="45.282162162162194" width="95.84032432432377" x="0.0" y="381.5643243243244"/>
+          <y:Geometry height="45.282162162162194" width="95.84032432432377" x="174.95682196482224" y="367.4232432432433"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="62.048828125" x="16.895748099661887" y="13.290495143581097">LabelNode<y:LabelModel>
@@ -169,10 +168,9 @@
       </data>
     </node>
     <node id="n9">
-      <data key="d5"/>
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="45.282162162162194" width="98.30464864864814" x="186.39998069498068" y="221.0"/>
+          <y:Geometry height="45.282162162162194" width="98.30464864864814" x="149.76473916773944" y="211.0"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="54.021484375" x="22.14158213682407" y="13.290495143581097">GUINode<y:LabelModel>
@@ -187,10 +185,9 @@
       </data>
     </node>
     <node id="n10">
-      <data key="d5"/>
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="45.282162162162194" width="107.0" x="99.09040025739998" y="306.2821621621622"/>
+          <y:Geometry height="45.282162162162194" width="107.0" x="220.08690476190475" y="296.2821621621622"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="67.380859375" x="19.8095703125" y="13.290495143581097">ButtonNode<y:LabelModel>
@@ -207,7 +204,7 @@
     <node id="n11">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="45.282162162162194" width="117.18810810810805" x="159.94912398112373" y="449.2054054054055"/>
+          <y:Geometry height="45.282162162162194" width="117.18810810810805" x="310.60872372372376" y="435.0643243243244"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="99.390625" x="8.898741554054027" y="13.290495143581097">BackGroundNode<y:LabelModel>
@@ -224,7 +221,7 @@
     <node id="n12">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="37.0" width="98.30464864864814" x="262.84045688545683" y="310.4232432432433"/>
+          <y:Geometry height="37.0" width="98.30464864864814" x="46.652040755041014" y="371.5643243243244"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="81.3671875" x="8.46873057432407" y="9.1494140625">ScrollBarNode<y:LabelModel>
@@ -241,7 +238,7 @@
     <node id="n13">
       <data key="d6">
         <y:ShapeNode>
-          <y:Geometry height="30.0" width="107.0" x="125.84040025739998" y="389.2054054054055"/>
+          <y:Geometry height="30.0" width="107.0" x="300.7972222222222" y="375.0643243243244"/>
           <y:Fill color="#FFCC00" transparent="false"/>
           <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="73.392578125" x="16.8037109375" y="5.6494140625">ButtonShape<y:LabelModel>
@@ -255,16 +252,34 @@
         </y:ShapeNode>
       </data>
     </node>
-    <node id="n14" yfiles.foldertype="group">
+    <node id="n14">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="45.282162162162194" width="126.60681114551085" x="1.6585581600736532E-4" y="296.2821621621622"/>
+          <y:Fill color="#FFCC00" transparent="false"/>
+          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="98.72265625" x="13.942077447755423" y="13.290495143581097">ScrollableContent<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n15" yfiles.foldertype="group">
       <data key="d4"/>
       <data key="d6">
         <y:ProxyAutoBoundsNode>
           <y:Realizers active="0">
             <y:GroupNode>
-              <y:Geometry height="171.37646484375" width="317.7119140625002" x="817.5072933549434" y="221.0"/>
+              <y:Geometry height="171.37646484375" width="317.7119140625001" x="596.5516689999382" y="200.0"/>
               <y:Fill color="#F5F5F5" transparent="false"/>
               <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
-              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="317.7119140625002" x="0.0" y="0.0">Legend</y:NodeLabel>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="317.7119140625001" x="0.0" y="0.0">Legend</y:NodeLabel>
               <y:Shape type="roundrectangle"/>
               <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
               <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@@ -283,11 +298,11 @@
           </y:Realizers>
         </y:ProxyAutoBoundsNode>
       </data>
-      <graph edgedefault="directed" id="n14:">
-        <node id="n14::n0">
+      <graph edgedefault="directed" id="n15:">
+        <node id="n15::n0">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="27.0" width="26.0" x="838.5072933549434" y="258.37646484375"/>
+              <y:Geometry height="27.0" width="26.0" x="617.5516689999382" y="237.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="6.998046875" y="4.1494140625">A<y:LabelModel>
@@ -301,10 +316,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n1">
+        <node id="n15::n1">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="27.0" width="26.0" x="902.5072933549434" y="258.37646484375"/>
+              <y:Geometry height="27.0" width="26.0" x="681.5516689999382" y="237.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="6.998046875" y="4.1494140625">B<y:LabelModel>
@@ -318,10 +333,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n2">
+        <node id="n15::n2">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="30.0" width="30.0" x="980.5072933549435" y="258.37646484375"/>
+              <y:Geometry height="30.0" width="30.0" x="759.5516689999383" y="237.37646484375"/>
               <y:Fill hasColor="false" transparent="false"/>
               <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="65.359375" x="-17.6796875" y="5.6494140625">B inherits A<y:LabelModel>
@@ -335,10 +350,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n3">
+        <node id="n15::n3">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="30.0" width="30.0" x="836.5072933549434" y="301.37646484375"/>
+              <y:Geometry height="30.0" width="30.0" x="615.5516689999382" y="280.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="8.998046875" y="5.6494140625">A<y:LabelModel>
@@ -352,10 +367,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n4">
+        <node id="n15::n4">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="30.0" width="30.0" x="900.5072933549434" y="301.37646484375"/>
+              <y:Geometry height="30.0" width="30.0" x="679.5516689999382" y="280.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="8.998046875" y="5.6494140625">B<y:LabelModel>
@@ -369,10 +384,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n5">
+        <node id="n15::n5">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="30.0" width="30.0" x="980.5072933549435" y="301.37646484375"/>
+              <y:Geometry height="30.0" width="30.0" x="759.5516689999383" y="280.37646484375"/>
               <y:Fill hasColor="false" transparent="false"/>
               <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="155.423828125" x="-15.7119140625" y="7.298828125">A can contain instances of B<y:LabelModel>
@@ -386,10 +401,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n6">
+        <node id="n15::n6">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="27.0" width="26.0" x="838.5072933549433" y="347.37646484375"/>
+              <y:Geometry height="27.0" width="26.0" x="617.5516689999381" y="326.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="6.998046875" y="4.1494140625">A<y:LabelModel>
@@ -403,10 +418,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n7">
+        <node id="n15::n7">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="27.0" width="26.0" x="902.5072933549433" y="347.37646484375"/>
+              <y:Geometry height="27.0" width="26.0" x="681.5516689999381" y="326.37646484375"/>
               <y:Fill color="#FFCC00" transparent="false"/>
               <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.00390625" x="6.998046875" y="4.1494140625">B<y:LabelModel>
@@ -420,10 +435,10 @@
             </y:ShapeNode>
           </data>
         </node>
-        <node id="n14::n8">
+        <node id="n15::n8">
           <data key="d6">
             <y:ShapeNode>
-              <y:Geometry height="30.0" width="150.0" x="966.5072933549433" y="347.37646484375"/>
+              <y:Geometry height="30.0" width="150.0" x="745.5516689999381" y="326.37646484375"/>
               <y:Fill hasColor="false" transparent="false"/>
               <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
               <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="150.09765625" x="-0.048828125" y="5.6494140625">A contain one instance of B<y:LabelModel>
@@ -442,9 +457,9 @@
     <edge id="e0" source="n1" target="n2">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-40.125" sy="18.5" tx="-38.25" ty="-18.5">
-            <y:Point x="322.64516216216185" y="124.0"/>
-            <y:Point x="246.39516216216188" y="124.0"/>
+          <y:Path sx="-13.375" sy="18.5" tx="-38.25" ty="-18.5">
+            <y:Point x="177.125" y="124.0"/>
+            <y:Point x="160.6670634920635" y="124.0"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -455,7 +470,10 @@
     <edge id="e1" source="n0" target="n3">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-13.375" sy="18.5" tx="-26.75" ty="-18.5"/>
+          <y:Path sx="-40.125" sy="18.5" tx="-26.75" ty="-18.5">
+            <y:Point x="137.0" y="47.0"/>
+            <y:Point x="26.75" y="47.0"/>
+          </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -465,9 +483,11 @@
     <edge id="e2" source="n1" target="n4">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="13.375" sy="18.5" tx="27.0" ty="-18.5">
-            <y:Point x="376.14516216216185" y="481.8464864864866"/>
-            <y:Point x="338.9927812097809" y="481.8464864864866"/>
+          <y:Path sx="40.125" sy="18.5" tx="27.0" ty="-18.5">
+            <y:Point x="230.625" y="124.0"/>
+            <y:Point x="442.7972222222222" y="124.0"/>
+            <y:Point x="442.7972222222222" y="490.3464864864866"/>
+            <y:Point x="396.2027777777778" y="490.3464864864866"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -478,9 +498,9 @@
     <edge id="e3" source="n1" target="n5">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="40.125" sy="18.5" tx="0.0" ty="-18.5">
-            <y:Point x="402.89516216216185" y="124.0"/>
-            <y:Point x="431.64516216216185" y="124.0"/>
+          <y:Path sx="-40.125" sy="18.5" tx="0.0" ty="-18.5">
+            <y:Point x="150.375" y="124.0"/>
+            <y:Point x="51.91706349206349" y="124.0"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -491,10 +511,7 @@
     <edge id="e4" source="n0" target="n1">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-40.125" sy="18.5" tx="0.0" ty="-18.5">
-            <y:Point x="446.27016216216185" y="47.0"/>
-            <y:Point x="362.77016216216185" y="47.0"/>
-          </y:Path>
+          <y:Path sx="13.375" sy="18.5" tx="0.0" ty="-18.5"/>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -505,8 +522,8 @@
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="40.125" sy="18.5" tx="0.0" ty="-18.5">
-            <y:Point x="526.5201621621618" y="47.0"/>
-            <y:Point x="636.7701621621619" y="47.0"/>
+            <y:Point x="217.25" y="47.0"/>
+            <y:Point x="327.5" y="47.0"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -517,9 +534,9 @@
     <edge id="e6" source="n4" target="n7">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="18.5" tx="20.25" ty="-18.5">
-            <y:Point x="311.9927812097809" y="571.4875675675677"/>
-            <y:Point x="88.42016216216189" y="571.4875675675677"/>
+          <y:Path sx="0.0" sy="18.5" tx="27.0" ty="-18.5">
+            <y:Point x="369.2027777777778" y="557.3464864864866"/>
+            <y:Point x="249.8769841269841" y="557.3464864864866"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -528,13 +545,9 @@
       </data>
     </edge>
     <edge id="e7" source="n2" target="n9">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="18.5" tx="0.0" ty="-22.641081081081097">
-            <y:Point x="284.64516216216185" y="201.0"/>
-            <y:Point x="235.55230501930475" y="201.0"/>
-          </y:Path>
+          <y:Path sx="0.0" sy="18.5" tx="0.0" ty="-22.641081081081097"/>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -542,13 +555,9 @@
       </data>
     </edge>
     <edge id="e8" source="n9" target="n8">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-36.86424324324307" sy="22.641081081081097" tx="-23.960081081080943" ty="-22.641081081081097">
-            <y:Point x="198.6880617760617" y="276.2821621621622"/>
-            <y:Point x="23.96024152724125" y="276.2821621621622"/>
-          </y:Path>
+          <y:Path sx="0.0" sy="22.641081081081097" tx="-23.960081081080943" ty="-22.641081081081097"/>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -556,12 +565,11 @@
       </data>
     </edge>
     <edge id="e9" source="n9" target="n10">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-12.288081081081017" sy="22.641081081081097" tx="0.0" ty="-22.641081081081097">
-            <y:Point x="223.26422393822375" y="286.2821621621622"/>
-            <y:Point x="152.59040025739998" y="286.2821621621622"/>
+          <y:Path sx="19.66092972972963" sy="22.641081081081097" tx="0.0" ty="-22.641081081081097">
+            <y:Point x="218.57799322179312" y="276.2821621621622"/>
+            <y:Point x="273.58690476190475" y="276.2821621621622"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -572,10 +580,7 @@
     <edge id="e10" source="n10" target="n8">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="-26.75" sy="22.641081081081097" tx="23.960081081080943" ty="-22.641081081081097">
-            <y:Point x="125.84040025739998" y="361.5643243243244"/>
-            <y:Point x="71.88024324324283" y="361.5643243243244"/>
-          </y:Path>
+          <y:Path sx="-26.75" sy="22.641081081081097" tx="23.960081081080943" ty="-22.641081081081097"/>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -585,7 +590,12 @@
     <edge id="e11" source="n9" target="n11">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="12.288081081081003" sy="22.641081081081097" tx="29.297027027027013" ty="-22.641081081081097"/>
+          <y:Path sx="39.32185945945926" sy="22.641081081081097" tx="29.297027027027013" ty="-22.641081081081097">
+            <y:Point x="238.23892295152277" y="266.2821621621622"/>
+            <y:Point x="422.7972222222222" y="266.2821621621622"/>
+            <y:Point x="422.7972222222222" y="415.0643243243244"/>
+            <y:Point x="398.4998048048048" y="415.0643243243244"/>
+          </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -593,12 +603,11 @@
       </data>
     </edge>
     <edge id="e12" source="n2" target="n1">
-      <data key="d9"/>
       <data key="d10">
         <y:GenericEdge configuration="com.yworks.edge.framed">
-          <y:Path sx="38.25" sy="-18.5" tx="-13.375" ty="18.5">
-            <y:Point x="322.89516216216185" y="134.0"/>
-            <y:Point x="349.39516216216185" y="134.0"/>
+          <y:Path sx="38.25" sy="-18.5" tx="13.375" ty="18.5">
+            <y:Point x="237.1670634920635" y="134.0"/>
+            <y:Point x="203.875" y="134.0"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="3.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -606,12 +615,11 @@
       </data>
     </edge>
     <edge id="e13" source="n3" target="n0">
-      <data key="d9"/>
       <data key="d10">
         <y:GenericEdge configuration="com.yworks.edge.framed">
-          <y:Path sx="26.75" sy="-18.5" tx="13.375" ty="18.5">
-            <y:Point x="526.5201621621618" y="57.0"/>
-            <y:Point x="499.77016216216185" y="57.0"/>
+          <y:Path sx="26.75" sy="-18.5" tx="-13.375" ty="18.5">
+            <y:Point x="80.25" y="57.0"/>
+            <y:Point x="163.75" y="57.0"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="3.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -621,7 +629,7 @@
     <edge id="e14" source="n8" target="n7">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="22.641081081081097" tx="-20.25" ty="-18.5"/>
+          <y:Path sx="0.0" sy="22.641081081081097" tx="0.0" ty="-18.5"/>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -631,10 +639,7 @@
     <edge id="e15" source="n11" target="n4">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="22.641081081081097" tx="-27.0" ty="-18.5">
-            <y:Point x="218.54317803517776" y="504.4875675675677"/>
-            <y:Point x="284.9927812097809" y="504.4875675675677"/>
-          </y:Path>
+          <y:Path sx="0.0" sy="22.641081081081097" tx="0.0" ty="-18.5"/>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -644,9 +649,11 @@
     <edge id="e16" source="n9" target="n12">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="36.86424324324305" sy="22.641081081081097" tx="0.0" ty="-18.5">
-            <y:Point x="272.4165482625478" y="276.2821621621622"/>
-            <y:Point x="311.9927812097809" y="276.2821621621622"/>
+          <y:Path sx="-19.660929729729617" sy="22.641081081081097" tx="24.576162162162035" ty="-18.5">
+            <y:Point x="179.2561337623339" y="276.2821621621622"/>
+            <y:Point x="141.60714285714286" y="276.2821621621622"/>
+            <y:Point x="141.60714285714286" y="351.5643243243244"/>
+            <y:Point x="120.38052724152712" y="351.5643243243244"/>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -657,7 +664,10 @@
     <edge id="e17" source="n12" target="n4">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="18.5" tx="0.0" ty="-18.5"/>
+          <y:Path sx="0.0" sy="18.5" tx="-27.0" ty="-18.5">
+            <y:Point x="95.80436507936508" y="490.3464864864866"/>
+            <y:Point x="342.2027777777778" y="490.3464864864866"/>
+          </y:Path>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -667,7 +677,10 @@
     <edge id="e18" source="n10" target="n13">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="26.75" sy="22.641081081081097" tx="0.0" ty="-15.0"/>
+          <y:Path sx="26.75" sy="22.641081081081097" tx="0.0" ty="-15.0">
+            <y:Point x="300.33690476190475" y="351.5643243243244"/>
+            <y:Point x="354.2972222222222" y="351.5643243243244"/>
+          </y:Path>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
           <y:BendStyle smoothed="false"/>
@@ -678,8 +691,8 @@
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="15.0" tx="-29.297027027027013" ty="-22.641081081081097">
-            <y:Point x="179.34040025739998" y="429.2054054054055"/>
-            <y:Point x="189.24615100815075" y="429.2054054054055"/>
+            <y:Point x="354.2972222222222" y="415.0643243243244"/>
+            <y:Point x="339.90575075075077" y="415.0643243243244"/>
           </y:Path>
           <y:LineStyle color="#FF6600" type="line" width="1.0"/>
           <y:Arrows source="none" target="standard"/>
@@ -687,7 +700,45 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="n14::e0" source="n14::n0" target="n14::n1">
+    <edge id="e20" source="n9" target="n14">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-39.32185945945926" sy="22.641081081081097" tx="0.0" ty="-22.641081081081097">
+            <y:Point x="159.59520403260424" y="266.2821621621622"/>
+            <y:Point x="63.30357142857143" y="266.2821621621622"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e21" source="n14" target="n12">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="31.65170278637771" sy="22.641081081081097" tx="-24.576162162162035" ty="-18.5">
+            <y:Point x="94.95527421494914" y="351.5643243243244"/>
+            <y:Point x="71.22820291720305" y="351.5643243243244"/>
+          </y:Path>
+          <y:LineStyle color="#FF6600" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e22" source="n14" target="n7">
+      <data key="d10">
+        <y:GenericEdge configuration="com.yworks.edge.framed">
+          <y:Path sx="-31.65170278637771" sy="22.641081081081097" tx="-27.0" ty="-18.5">
+            <y:Point x="31.651984126984125" y="538.8464864864866"/>
+            <y:Point x="195.87698412698413" y="538.8464864864866"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="3.0"/>
+          <y:Arrows source="none" target="standard"/>
+        </y:GenericEdge>
+      </data>
+    </edge>
+    <edge id="n15::e0" source="n15::n0" target="n15::n1">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -697,8 +748,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="n14::e1" source="n14::n3" target="n14::n4">
-      <data key="d9"/>
+    <edge id="n15::e1" source="n15::n3" target="n15::n4">
       <data key="d10">
         <y:GenericEdge configuration="com.yworks.edge.framed">
           <y:Path sx="0.0" sy="0.0" tx="-1.0" ty="0.0"/>
@@ -707,7 +757,7 @@
         </y:GenericEdge>
       </data>
     </edge>
-    <edge id="n14::e2" source="n14::n6" target="n14::n7">
+    <edge id="n15::e2" source="n15::n6" target="n15::n7">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>