TrafficLights_Basic update.

Updated profiles, diagrams, and logging code.

Change-Id: I5bec1ca57c67f7185ded9370191392834d831d5c
Signed-off-by: Charles Rivet <charles@zeligsoft.com>
diff --git a/models/samples/TrafficLights/TrafficLights_Basic.notation b/models/samples/TrafficLights/TrafficLights_Basic.notation
index 276fe40..7aaf900 100644
--- a/models/samples/TrafficLights/TrafficLights_Basic.notation
+++ b/models/samples/TrafficLights/TrafficLights_Basic.notation
@@ -21,7 +21,7 @@
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_skarY9MUEeSTQ_SPME0mCw" key="is_default_navigation" value="false"/>
           </eAnnotations>
           <children xmi:type="notation:DecorationNode" xmi:id="_uBPoYHGxEeSfbNhe044FSg" type="5126"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_uBPoYXGxEeSfbNhe044FSg" type="7077">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_uBPoYXGxEeSfbNhe044FSg" visible="false" type="7077">
             <children xmi:type="notation:Shape" xmi:id="_3IJRMAPaEeWyav08LGx7TQ" type="StereotypeComment">
               <styles xmi:type="notation:TitleStyle" xmi:id="_3IJRMQPaEeWyav08LGx7TQ" showTitle="true"/>
               <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3IJ4QAPaEeWyav08LGx7TQ" name="BASE_ELEMENT">
@@ -44,10 +44,10 @@
               <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ANuNQ9MVEeSTQ_SPME0mCw" key="is_default_navigation" value="true"/>
             </eAnnotations>
             <children xmi:type="notation:DecorationNode" xmi:id="_wDf0AnGxEeSfbNhe044FSg" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_wDf0A3GxEeSfbNhe044FSg" x="12" y="26"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_wDf0A3GxEeSfbNhe044FSg" x="12" y="31"/>
             </children>
             <children xmi:type="notation:DecorationNode" xmi:id="_wDf0BHGxEeSfbNhe044FSg" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_wDf0BXGxEeSfbNhe044FSg" x="25" y="16"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_wDf0BXGxEeSfbNhe044FSg" x="11" y="21"/>
             </children>
             <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_qinMIHDyEeSwWKwNKw1iAA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wDf0AXGxEeSfbNhe044FSg" x="163" y="64"/>
@@ -55,26 +55,6 @@
           <children xmi:type="notation:DecorationNode" xmi:id="_2orG8APaEeWyav08LGx7TQ" type="6054">
             <layoutConstraint xmi:type="notation:Location" xmi:id="_2orG8QPaEeWyav08LGx7TQ" y="5"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_ThJ1sJ3MEeWcqpdcWE1HVA" type="3069">
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThJ1sp3MEeWcqpdcWE1HVA" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThJ1s53MEeWcqpdcWE1HVA" x="25" y="3"/>
-            </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThJ1tJ3MEeWcqpdcWE1HVA" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThJ1tZ3MEeWcqpdcWE1HVA" x="25" y="-10"/>
-            </children>
-            <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThJ1sZ3MEeWcqpdcWE1HVA" x="-10" y="-10" width="20" height="20"/>
-          </children>
-          <children xmi:type="notation:Shape" xmi:id="_ThKcwJ3MEeWcqpdcWE1HVA" type="3069">
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThKcwp3MEeWcqpdcWE1HVA" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThKcw53MEeWcqpdcWE1HVA" x="25" y="3"/>
-            </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThKcxJ3MEeWcqpdcWE1HVA" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThKcxZ3MEeWcqpdcWE1HVA" x="25" y="-10"/>
-            </children>
-            <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThKcwZ3MEeWcqpdcWE1HVA" x="-10" y="-10" width="20" height="20"/>
-          </children>
           <children xmi:type="notation:DecorationNode" xmi:id="_Th9uAJ3MEeWcqpdcWE1HVA" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_Th9uAZ3MEeWcqpdcWE1HVA" name="stereotype" stringValue="UMLRealTime::CapsulePart"/>
             <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/>
@@ -107,7 +87,7 @@
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ubm2h9MUEeSTQ_SPME0mCw" key="is_default_navigation" value="false"/>
           </eAnnotations>
           <children xmi:type="notation:DecorationNode" xmi:id="_7K0GsHGxEeSfbNhe044FSg" type="5126"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_7K0GsXGxEeSfbNhe044FSg" type="7077">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_7K0GsXGxEeSfbNhe044FSg" visible="false" type="7077">
             <children xmi:type="notation:Shape" xmi:id="_3M2LAAPaEeWyav08LGx7TQ" type="StereotypeComment">
               <styles xmi:type="notation:TitleStyle" xmi:id="_3M2LAQPaEeWyav08LGx7TQ" showTitle="true"/>
               <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3M2yEAPaEeWyav08LGx7TQ" name="BASE_ELEMENT">
@@ -130,10 +110,10 @@
               <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D91o49MVEeSTQ_SPME0mCw" key="is_default_navigation" value="true"/>
             </eAnnotations>
             <children xmi:type="notation:DecorationNode" xmi:id="_D1rlEnGyEeSfbNhe044FSg" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_D1rlE3GyEeSfbNhe044FSg" x="-150" y="-12"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_D1rlE3GyEeSfbNhe044FSg" x="-154" y="-12"/>
             </children>
             <children xmi:type="notation:DecorationNode" xmi:id="_D1rlFHGyEeSfbNhe044FSg" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_D1rlFXGyEeSfbNhe044FSg" x="-31" y="-24"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_D1rlFXGyEeSfbNhe044FSg" x="-35" y="-23"/>
             </children>
             <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_qinMIHDyEeSwWKwNKw1iAA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1rlEXGyEeSfbNhe044FSg" x="-10" y="68"/>
@@ -141,26 +121,6 @@
           <children xmi:type="notation:DecorationNode" xmi:id="_2orG9APaEeWyav08LGx7TQ" type="6054">
             <layoutConstraint xmi:type="notation:Location" xmi:id="_2orG9QPaEeWyav08LGx7TQ" y="5"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_ThdXsJ3MEeWcqpdcWE1HVA" type="3069">
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThdXsp3MEeWcqpdcWE1HVA" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThdXs53MEeWcqpdcWE1HVA" x="25" y="3"/>
-            </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ThdXtJ3MEeWcqpdcWE1HVA" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ThdXtZ3MEeWcqpdcWE1HVA" x="25" y="-10"/>
-            </children>
-            <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThdXsZ3MEeWcqpdcWE1HVA" x="-10" y="-10" width="20" height="20"/>
-          </children>
-          <children xmi:type="notation:Shape" xmi:id="_Thd-wJ3MEeWcqpdcWE1HVA" type="3069">
-            <children xmi:type="notation:DecorationNode" xmi:id="_Thd-wp3MEeWcqpdcWE1HVA" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Thd-w53MEeWcqpdcWE1HVA" x="25" y="3"/>
-            </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_Thd-xJ3MEeWcqpdcWE1HVA" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Thd-xZ3MEeWcqpdcWE1HVA" x="25" y="-10"/>
-            </children>
-            <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Thd-wZ3MEeWcqpdcWE1HVA" x="-10" y="-10" width="20" height="20"/>
-          </children>
           <children xmi:type="notation:DecorationNode" xmi:id="_TivxIJ3MEeWcqpdcWE1HVA" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_TivxIZ3MEeWcqpdcWE1HVA" name="stereotype" stringValue="UMLRealTime::CapsulePart"/>
             <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/>
@@ -221,38 +181,6 @@
           <element xsi:nil="true"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3OkpUgPaEeWyav08LGx7TQ" x="100" y="100"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_TierYJ3MEeWcqpdcWE1HVA" type="StereotypeComment">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_TierYZ3MEeWcqpdcWE1HVA" showTitle="true"/>
-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TierY53MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-            <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-          </styles>
-          <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TierYp3MEeWcqpdcWE1HVA" x="190" y="-10"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TiqRlp3MEeWcqpdcWE1HVA" type="StereotypeComment">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_TiqRl53MEeWcqpdcWE1HVA" showTitle="true"/>
-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TiqRmZ3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-            <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-          </styles>
-          <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TiqRmJ3MEeWcqpdcWE1HVA" x="190" y="-10"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TjIytp3MEeWcqpdcWE1HVA" type="StereotypeComment">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_TjIyt53MEeWcqpdcWE1HVA" showTitle="true"/>
-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TjJZwJ3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-            <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-          </styles>
-          <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjIyuJ3MEeWcqpdcWE1HVA" x="190" y="-10"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TjXcM53MEeWcqpdcWE1HVA" type="StereotypeComment">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_TjXcNJ3MEeWcqpdcWE1HVA" showTitle="true"/>
-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TjXcNp3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-            <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-          </styles>
-          <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjXcNZ3MEeWcqpdcWE1HVA" x="190" y="-10"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_ppe4IWXjEeS_4daqvwyFrg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppe4ImXjEeS_4daqvwyFrg"/>
       </children>
@@ -337,46 +265,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3N23oAPaEeWyav08LGx7TQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3N23oQPaEeWyav08LGx7TQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TierZJ3MEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_ThJ1sJ3MEeWcqpdcWE1HVA" target="_TierYJ3MEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_TierZZ3MEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TieraZ3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TierZp3MEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TierZ53MEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TieraJ3MEeWcqpdcWE1HVA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TiqRmp3MEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_ThKcwJ3MEeWcqpdcWE1HVA" target="_TiqRlp3MEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_TiqRm53MEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Tiq4op3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TiqRnJ3MEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Tiq4oJ3MEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Tiq4oZ3MEeWcqpdcWE1HVA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TjJZwZ3MEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_ThdXsJ3MEeWcqpdcWE1HVA" target="_TjIytp3MEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_TjJZwp3MEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TjJZxp3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TjJZw53MEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TjJZxJ3MEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TjJZxZ3MEeWcqpdcWE1HVA"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TjXcN53MEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_Thd-wJ3MEeWcqpdcWE1HVA" target="_TjXcM53MEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_TjXcOJ3MEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TjYDQJ3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TjXcOZ3MEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TjXcOp3MEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TjXcO53MEeWcqpdcWE1HVA"/>
-    </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_yIHRIGW-EeS_4daqvwyFrg"/>
   <notation:Diagram xmi:id="_RkAs8GXjEeS_4daqvwyFrg" type="PapyrusUMLClassDiagram" name="cd | Base::TrafficLights" measurementUnit="Pixel">
@@ -476,11 +364,6 @@
       <children xmi:type="notation:DecorationNode" xmi:id="_DkWtcgSPEeWVBr36vWtS8Q" type="8510">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_DkWtcwSPEeWVBr36vWtS8Q" y="5"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Do-HsASPEeWVBr36vWtS8Q" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_Do-HsQSPEeWVBr36vWtS8Q" name="stereotype" stringValue="C_Cpp::Include"/>
-        <element xmi:type="uml:Stereotype" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_RwTdQByJEduN1bTiWJ0lyw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Do-HsgSPEeWVBr36vWtS8Q"/>
-      </children>
       <element xmi:type="uml:Class" href="TrafficLights_Basic.uml#_tj8ikGXjEeS_4daqvwyFrg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tj-XwWXjEeS_4daqvwyFrg" x="48" y="198"/>
     </children>
@@ -537,12 +420,30 @@
       <element xmi:type="uml:Class" href="TrafficLights_Basic.uml#_V5A-UGXjEeS_4daqvwyFrg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SHwhmXoEeS_4daqvwyFrg" x="101" y="33" width="500" height="250"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZYCGIKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ZYCGIaKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZYCtMKKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TrafficLights_Basic.uml#_V5A-UGXjEeS_4daqvwyFrg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZYCGIqKFEeWzz4qbGzYR8w" x="301" y="33"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_7SHwh2XoEeS_4daqvwyFrg" name="diagram_compatibility_version" stringValue="1.0.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_7SHwiGXoEeS_4daqvwyFrg"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7SHwiWXoEeS_4daqvwyFrg">
       <owner xmi:type="uml:Class" href="TrafficLights_Basic.uml#_V5A-UGXjEeS_4daqvwyFrg"/>
     </styles>
     <element xmi:type="uml:Class" href="TrafficLights_Basic.uml#_V5A-UGXjEeS_4daqvwyFrg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_ZYCtMaKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_7SHwgWXoEeS_4daqvwyFrg" target="_ZYCGIKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZYCtMqKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZYCtNqKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="TrafficLights_Basic.uml#_V5A-UGXjEeS_4daqvwyFrg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZYCtM6KFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZYCtNKKFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZYCtNaKFEeWzz4qbGzYR8w"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_cxK6MGXpEeS_4daqvwyFrg" type="PapyrusUMLClassDiagram" name="cd | BetweenLights" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_j45K0GXpEeS_4daqvwyFrg" type="2097">
@@ -804,7 +705,7 @@
           </children>
           <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EuBJEHDzEeSwWKwNKw1iAA" name="shapeVisibility" booleanValue="true"/>
           <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_mQmXIGXrEeS_4daqvwyFrg"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ac12sXDXEeS5e6HUI4-x1Q" x="134" y="220" width="200" height="29"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ac12sXDXEeS5e6HUI4-x1Q" x="6" y="115" width="143" height="29"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_pL148APbEeWyav08LGx7TQ" type="StereotypeComment">
           <styles xmi:type="notation:TitleStyle" xmi:id="_pL148QPbEeWyav08LGx7TQ" showTitle="true"/>
@@ -832,7 +733,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RGSYxQPcEeWyav08LGx7TQ"/>
           </children>
           <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_OC3EAAPcEeWyav08LGx7TQ"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RGRxsQPcEeWyav08LGx7TQ" x="348" y="221" width="163" height="28"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RGRxsQPcEeWyav08LGx7TQ" x="154" y="115" width="106" height="28"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_s_7loASLEeWVBr36vWtS8Q" type="3070">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zH0VQB83EeWH-6iI1-tDiQ" source="PapyrusHyperLink_Page" references="_GeZCMAR6EeWwIrWko-AbkA">
@@ -849,7 +750,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_8MtQSLEeWVBr36vWtS8Q"/>
           </children>
           <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_m7YpQASLEeWVBr36vWtS8Q"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_7loQSLEeWVBr36vWtS8Q" x="211" y="180" width="254" height="36"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_7loQSLEeWVBr36vWtS8Q" x="6" y="74" width="197" height="36"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_3AiH4ASLEeWVBr36vWtS8Q" type="StereotypeComment">
           <styles xmi:type="notation:TitleStyle" xmi:id="_3AiH4QSLEeWVBr36vWtS8Q" showTitle="true"/>
@@ -881,13 +782,13 @@
       </children>
       <children xmi:type="notation:Shape" xmi:id="_qi9KYHDyEeSwWKwNKw1iAA" type="3069">
         <children xmi:type="notation:DecorationNode" xmi:id="_qi9xcHDyEeSwWKwNKw1iAA" type="5125">
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qi9xcXDyEeSwWKwNKw1iAA" x="-152" y="-14"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qi9xcXDyEeSwWKwNKw1iAA" x="11" y="-12"/>
         </children>
         <children xmi:type="notation:DecorationNode" xmi:id="_qi-YgHDyEeSwWKwNKw1iAA" type="6029">
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qi-YgXDyEeSwWKwNKw1iAA" x="-35" y="24"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qi-YgXDyEeSwWKwNKw1iAA" x="13" y="-22"/>
         </children>
         <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_qinMIHDyEeSwWKwNKw1iAA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qi9KYXDyEeSwWKwNKw1iAA" x="-10" y="148" width="20" height="20"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qi9KYXDyEeSwWKwNKw1iAA" x="350" y="57" width="20" height="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_pG_1MAPbEeWyav08LGx7TQ" type="6089">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_pG_1MQPbEeWyav08LGx7TQ" y="5"/>
@@ -910,7 +811,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pLQDEwPbEeWyav08LGx7TQ"/>
       </children>
       <element xmi:type="uml:Class" href="TrafficLights_Basic.uml#_tj8ikGXjEeS_4daqvwyFrg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YjdRtmXrEeS_4daqvwyFrg" x="40" y="40" width="576" height="310"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YjdRtmXrEeS_4daqvwyFrg" x="40" y="40" width="296" height="193"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_pMyUIAPbEeWyav08LGx7TQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_pMyUIQPbEeWyav08LGx7TQ" showTitle="true"/>
@@ -2215,14 +2116,6 @@
               <element xsi:nil="true"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UbAO0p3MEeWcqpdcWE1HVA" x="239" y="28"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_UbLN8J3MEeWcqpdcWE1HVA" type="StereotypeComment">
-              <styles xmi:type="notation:TitleStyle" xmi:id="_UbLN8Z3MEeWcqpdcWE1HVA" showTitle="true"/>
-              <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UbLN853MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-                <eObjectValue xmi:type="uml:State" href="TrafficLights_Basic.uml#_bZEJwHY6EeS0RrgkTcb0nA"/>
-              </styles>
-              <element xsi:nil="true"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UbLN8p3MEeWcqpdcWE1HVA" x="335" y="73"/>
-            </children>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxuYiHY6EeS0RrgkTcb0nA"/>
           </children>
           <element xmi:type="uml:Region" href="TrafficLights_Basic.uml#_ZxquIHY6EeS0RrgkTcb0nA"/>
@@ -2300,16 +2193,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbAO153MEeWcqpdcWE1HVA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbAO2J3MEeWcqpdcWE1HVA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UbLN9J3MEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_bZH0IHY6EeS0RrgkTcb0nA" target="_UbLN8J3MEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_UbLN9Z3MEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UbLN-Z3MEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:State" href="TrafficLights_Basic.uml#_bZEJwHY6EeS0RrgkTcb0nA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UbLN9p3MEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbLN953MEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbLN-J3MEeWcqpdcWE1HVA"/>
-    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_X_elgHY_EeSZ5dzE45Fd7w" type="CompositeStructure" name="csd | Top" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_Pr6ZkHZPEeSIdNh1440eVA" type="2073">
@@ -2327,7 +2210,7 @@
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZWlQcgPbEeWyav08LGx7TQ" key="is_default_navigation" value="true"/>
           </eAnnotations>
           <children xmi:type="notation:DecorationNode" xmi:id="_W8N-cnZPEeSIdNh1440eVA" type="5126"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_W8N-c3ZPEeSIdNh1440eVA" type="7077">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_W8N-c3ZPEeSIdNh1440eVA" visible="false" type="7077">
             <styles xmi:type="notation:TitleStyle" xmi:id="_W8N-dHZPEeSIdNh1440eVA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8N-dXZPEeSIdNh1440eVA"/>
           </children>
@@ -2355,7 +2238,7 @@
           <children xmi:type="notation:DecorationNode" xmi:id="_5k7GIR84EeWH-6iI1-tDiQ" type="6054">
             <layoutConstraint xmi:type="notation:Location" xmi:id="_5k7tMB84EeWH-6iI1-tDiQ" y="5"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_5k7tMR84EeWH-6iI1-tDiQ" type="7077">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5k7tMR84EeWH-6iI1-tDiQ" visible="false" type="7077">
             <children xmi:type="notation:Shape" xmi:id="_CmAFEB85EeWH-6iI1-tDiQ" type="StereotypeComment">
               <styles xmi:type="notation:TitleStyle" xmi:id="_CmAFER85EeWH-6iI1-tDiQ" showTitle="true"/>
               <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CmAFEx85EeWH-6iI1-tDiQ" name="BASE_ELEMENT">
@@ -2390,23 +2273,13 @@
           </children>
           <children xmi:type="notation:Shape" xmi:id="_CloRoB85EeWH-6iI1-tDiQ" type="3069">
             <children xmi:type="notation:DecorationNode" xmi:id="_CloRoh85EeWH-6iI1-tDiQ" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_CloRox85EeWH-6iI1-tDiQ" x="11" y="21"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_CloRox85EeWH-6iI1-tDiQ" x="12" y="-11"/>
             </children>
             <children xmi:type="notation:DecorationNode" xmi:id="_CloRpB85EeWH-6iI1-tDiQ" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_CloRpR85EeWH-6iI1-tDiQ" x="13" y="-12"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_CloRpR85EeWH-6iI1-tDiQ" x="13" y="-24"/>
             </children>
             <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_aIZ5QAR7EeWwIrWko-AbkA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CloRoR85EeWH-6iI1-tDiQ" x="257" y="51"/>
-          </children>
-          <children xmi:type="notation:Shape" xmi:id="_obQtkJ3LEeWcqpdcWE1HVA" type="3069">
-            <children xmi:type="notation:DecorationNode" xmi:id="_obRUoJ3LEeWcqpdcWE1HVA" type="5125">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_obRUoZ3LEeWcqpdcWE1HVA" x="25" y="3"/>
-            </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_obRUop3LEeWcqpdcWE1HVA" type="6029">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_obRUo53LEeWcqpdcWE1HVA" x="25" y="-10"/>
-            </children>
-            <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_sHBJAAR9EeWwIrWko-AbkA"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obQtkZ3LEeWcqpdcWE1HVA" x="-10" y="-10" width="20" height="20"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CloRoR85EeWH-6iI1-tDiQ" x="257" y="31"/>
           </children>
           <element xmi:type="uml:Property" href="TrafficLights_Basic.uml#_5ktqwB84EeWH-6iI1-tDiQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5k4p4R84EeWH-6iI1-tDiQ" x="24" y="113" width="257" height="77"/>
@@ -2427,14 +2300,6 @@
           <element xsi:nil="true"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CmOHgh85EeWH-6iI1-tDiQ" x="100" y="100"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_oc7hgJ3LEeWcqpdcWE1HVA" type="StereotypeComment">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_oc7hgZ3LEeWcqpdcWE1HVA" showTitle="true"/>
-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oc7hg53LEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-            <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_sHBJAAR9EeWwIrWko-AbkA"/>
-          </styles>
-          <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oc7hgp3LEeWcqpdcWE1HVA" x="190" y="-10"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_Pr8OwnZPEeSIdNh1440eVA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pr8Ow3ZPEeSIdNh1440eVA"/>
       </children>
@@ -2488,21 +2353,11 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cl27Jx85EeWH-6iI1-tDiQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cl27KB85EeWH-6iI1-tDiQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oc7hhJ3LEeWcqpdcWE1HVA" type="StereotypeCommentLink" source="_obQtkJ3LEeWcqpdcWE1HVA" target="_oc7hgJ3LEeWcqpdcWE1HVA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_oc7hhZ3LEeWcqpdcWE1HVA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_oc7hiZ3LEeWcqpdcWE1HVA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Port" href="TrafficLights_Basic.uml#_sHBJAAR9EeWwIrWko-AbkA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oc7hhp3LEeWcqpdcWE1HVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oc7hh53LEeWcqpdcWE1HVA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oc7hiJ3LEeWcqpdcWE1HVA"/>
-    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_45HXMHZOEeSIdNh1440eVA" type="PapyrusUMLStateMachineDiagram" name="smd | Top" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_45HXMXZOEeSIdNh1440eVA" type="2000">
       <children xmi:type="notation:DecorationNode" xmi:id="_45HXMnZOEeSIdNh1440eVA" type="2001">
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXM3ZOEeSIdNh1440eVA" width="436" height="16"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXM3ZOEeSIdNh1440eVA" width="436" height="28"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_45HXNHZOEeSIdNh1440eVA" type="2002">
         <children xmi:type="notation:Shape" xmi:id="_45HXNXZOEeSIdNh1440eVA" type="3000">
@@ -2530,15 +2385,47 @@
               <element xmi:type="uml:State" href="TrafficLights_Basic.uml#_44-0XnZOEeSIdNh1440eVA"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXSnZOEeSIdNh1440eVA" x="135" y="73" width="161" height="101"/>
             </children>
+            <children xmi:type="notation:Shape" xmi:id="_ZpC9oKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+              <styles xmi:type="notation:TitleStyle" xmi:id="_ZpC9oaKFEeWzz4qbGzYR8w" showTitle="true"/>
+              <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZpC9o6KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+                <eObjectValue xmi:type="uml:Pseudostate" href="TrafficLights_Basic.uml#_44-0XXZOEeSIdNh1440eVA"/>
+              </styles>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZpC9oqKFEeWzz4qbGzYR8w" x="239" y="28"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_ZpRAEKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+              <styles xmi:type="notation:TitleStyle" xmi:id="_ZpRAEaKFEeWzz4qbGzYR8w" showTitle="true"/>
+              <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZpRAE6KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+                <eObjectValue xmi:type="uml:State" href="TrafficLights_Basic.uml#_44-0XnZOEeSIdNh1440eVA"/>
+              </styles>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZpRAEqKFEeWzz4qbGzYR8w" x="335" y="73"/>
+            </children>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXS3ZOEeSIdNh1440eVA"/>
           </children>
           <element xmi:type="uml:Region" href="TrafficLights_Basic.uml#_44-0W3ZOEeSIdNh1440eVA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXUnZOEeSIdNh1440eVA" width="436" height="259"/>
         </children>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXU3ZOEeSIdNh1440eVA" y="16" width="436" height="259"/>
+        <children xmi:type="notation:Shape" xmi:id="_Zo2JUKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Zo2JUaKFEeWzz4qbGzYR8w" showTitle="true"/>
+          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Zo2JU6KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+            <eObjectValue xmi:type="uml:Region" href="TrafficLights_Basic.uml#_44-0W3ZOEeSIdNh1440eVA"/>
+          </styles>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zo2JUqKFEeWzz4qbGzYR8w" x="200"/>
+        </children>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXU3ZOEeSIdNh1440eVA" y="28" width="436" height="259"/>
       </children>
       <element xmi:type="uml:StateMachine" href="TrafficLights_Basic.uml#_44-0WnZOEeSIdNh1440eVA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXWnZOEeSIdNh1440eVA" x="30" y="30" width="436" height="275"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_45HXWnZOEeSIdNh1440eVA" x="30" y="30" width="436" height="287"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Zoye8KKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Zoye8aKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Zoye86KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:StateMachine" href="TrafficLights_Basic.uml#_44-0WnZOEeSIdNh1440eVA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zoye8qKFEeWzz4qbGzYR8w" x="230" y="30"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_45HXW3ZOEeSIdNh1440eVA" name="diagram_compatibility_version" stringValue="1.0.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_45HXXHZOEeSIdNh1440eVA"/>
@@ -2561,6 +2448,46 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_45HXZnZOEeSIdNh1440eVA" points="[17, 8, -79, -44]$[90, 32, -6, -20]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_45HXZ3ZOEeSIdNh1440eVA" id="(0.15,0.45)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Zoye9KKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_45HXMXZOEeSIdNh1440eVA" target="_Zoye8KKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Zoye9aKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZozGAKKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:StateMachine" href="TrafficLights_Basic.uml#_44-0WnZOEeSIdNh1440eVA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zoye9qKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zoye96KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zoye-KKFEeWzz4qbGzYR8w"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Zo2JVKKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_45HXNXZOEeSIdNh1440eVA" target="_Zo2JUKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Zo2JVaKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Zo2JWaKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Region" href="TrafficLights_Basic.uml#_44-0W3ZOEeSIdNh1440eVA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zo2JVqKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zo2JV6KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zo2JWKKFEeWzz4qbGzYR8w"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZpC9pKKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_45HXOXZOEeSIdNh1440eVA" target="_ZpC9oKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZpC9paKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZpDksKKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Pseudostate" href="TrafficLights_Basic.uml#_44-0XXZOEeSIdNh1440eVA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZpC9pqKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZpC9p6KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZpC9qKKFEeWzz4qbGzYR8w"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZpRAFKKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_45HXP3ZOEeSIdNh1440eVA" target="_ZpRAEKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZpRAFaKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ZpRnIqKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:State" href="TrafficLights_Basic.uml#_44-0XnZOEeSIdNh1440eVA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZpRAFqKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZpRnIKKFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZpRnIaKFEeWzz4qbGzYR8w"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="__1IrsAR4EeWwIrWko-AbkA" type="CompositeStructure" name="csd | TrafficLightIDProvider" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_AX9E4AR5EeWwIrWko-AbkA" type="2073">
@@ -2598,7 +2525,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u2PvYgR9EeWwIrWko-AbkA"/>
           </children>
           <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_sHBJAAR9EeWwIrWko-AbkA"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u2PIUQR9EeWwIrWko-AbkA" x="264" y="162"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u2PIUQR9EeWwIrWko-AbkA" x="16" y="68"/>
         </children>
         <children xmi:type="notation:Shape" xmi:id="_zkcg4ASeEeWVBr36vWtS8Q" type="StereotypeComment">
           <styles xmi:type="notation:TitleStyle" xmi:id="_zkcg4QSeEeWVBr36vWtS8Q" showTitle="true"/>
@@ -2639,16 +2566,16 @@
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vuof0wR_EeWwIrWko-AbkA" key="is_default_navigation" value="true"/>
         </eAnnotations>
         <children xmi:type="notation:DecorationNode" xmi:id="_aIgm8gR7EeWwIrWko-AbkA" type="5125">
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aIgm8wR7EeWwIrWko-AbkA" x="-159" y="-12"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aIgm8wR7EeWwIrWko-AbkA" x="12" y="-12"/>
         </children>
         <children xmi:type="notation:DecorationNode" xmi:id="_aIgm9AR7EeWwIrWko-AbkA" type="6029">
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_aIgm9QR7EeWwIrWko-AbkA" x="-36" y="22"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_aIgm9QR7EeWwIrWko-AbkA" x="13" y="-24"/>
         </children>
         <element xmi:type="uml:Port" href="TrafficLights_Basic.uml#_aIZ5QAR7EeWwIrWko-AbkA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aIgm8QR7EeWwIrWko-AbkA" y="71"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aIgm8QR7EeWwIrWko-AbkA" x="377" y="65"/>
       </children>
       <element xmi:type="uml:Class" href="TrafficLights_Basic.uml#_Zp3qgAR4EeWwIrWko-AbkA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AX9E4QR5EeWwIrWko-AbkA" x="177" y="40" width="377" height="257"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AX9E4QR5EeWwIrWko-AbkA" x="38" y="31" width="191" height="176"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_gri2KgR7EeWwIrWko-AbkA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_gri2KwR7EeWwIrWko-AbkA" showTitle="true"/>
@@ -2803,37 +2730,37 @@
       <element xmi:type="uml:CallEvent" href="TrafficLights_Basic.uml#_3jX0YAR5EeWwIrWko-AbkA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HGa2EQR7EeWwIrWko-AbkA" x="180" y="332"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1NQBoB9AEeWH-6iI1-tDiQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1NQBoR9AEeWH-6iI1-tDiQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NQosB9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_pdNZ8KKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pdNZ8aKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdNZ86KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Collaboration" href="TrafficLights_Basic.uml#_J2gqAAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1NQBoh9AEeWH-6iI1-tDiQ" x="541" y="70"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdNZ8qKFEeWzz4qbGzYR8w" x="541" y="70"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1NlY0B9AEeWH-6iI1-tDiQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1NlY0R9AEeWH-6iI1-tDiQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NlY0x9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_pdS5gKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pdS5gaKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdS5g6KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2nXsAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1NlY0h9AEeWH-6iI1-tDiQ" x="368" y="218"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdS5gqKFEeWzz4qbGzYR8w" x="368" y="218"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1N6wAB9AEeWH-6iI1-tDiQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1N6wAR9AEeWH-6iI1-tDiQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1N6wAx9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_pdV80KKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pdV80aKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdV806KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2sQMAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N6wAh9AEeWH-6iI1-tDiQ" x="715" y="218"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdV80qKFEeWzz4qbGzYR8w" x="715" y="218"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1OVmwB9AEeWH-6iI1-tDiQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1OVmwR9AEeWH-6iI1-tDiQ" showTitle="true"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1OVmwx9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_pdZAIKKFEeWzz4qbGzYR8w" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pdZAIaKFEeWzz4qbGzYR8w" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdZAI6KFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2xIsAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1OVmwh9AEeWH-6iI1-tDiQ" x="539" y="218"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdZAIqKFEeWzz4qbGzYR8w" x="539" y="218"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_GeZCMQR6EeWwIrWko-AbkA" name="diagram_compatibility_version" stringValue="1.1.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_GeZCMgR6EeWwIrWko-AbkA"/>
@@ -2893,45 +2820,45 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M_jMoAR7EeWwIrWko-AbkA" id="(0.38095238095238093,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M_Q4wAR7EeWwIrWko-AbkA" id="(0.40336134453781514,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1NQosR9AEeWH-6iI1-tDiQ" type="StereotypeCommentLink" source="_HGSIoAR6EeWwIrWko-AbkA" target="_1NQBoB9AEeWH-6iI1-tDiQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1NQosh9AEeWH-6iI1-tDiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NQoth9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_pdNZ9KKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_HGSIoAR6EeWwIrWko-AbkA" target="_pdNZ8KKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pdNZ9aKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdNZ-aKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Collaboration" href="TrafficLights_Basic.uml#_J2gqAAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1NQosx9AEeWH-6iI1-tDiQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NQotB9AEeWH-6iI1-tDiQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NQotR9AEeWH-6iI1-tDiQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdNZ9qKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdNZ96KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdNZ-KKFEeWzz4qbGzYR8w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1NlY1B9AEeWH-6iI1-tDiQ" type="StereotypeCommentLink" source="_Hie8cAR6EeWwIrWko-AbkA" target="_1NlY0B9AEeWH-6iI1-tDiQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1NlY1R9AEeWH-6iI1-tDiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1NlY2R9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_pdS5hKKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_Hie8cAR6EeWwIrWko-AbkA" target="_pdS5gKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pdS5haKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdTgkqKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2nXsAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1NlY1h9AEeWH-6iI1-tDiQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NlY1x9AEeWH-6iI1-tDiQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1NlY2B9AEeWH-6iI1-tDiQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdS5hqKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdTgkKKFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdTgkaKFEeWzz4qbGzYR8w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1N6wBB9AEeWH-6iI1-tDiQ" type="StereotypeCommentLink" source="_IHfuAAR6EeWwIrWko-AbkA" target="_1N6wAB9AEeWH-6iI1-tDiQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1N6wBR9AEeWH-6iI1-tDiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1N6wCR9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_pdV81KKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_IHfuAAR6EeWwIrWko-AbkA" target="_pdV80KKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pdV81aKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdV82aKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2sQMAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1N6wBh9AEeWH-6iI1-tDiQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1N6wBx9AEeWH-6iI1-tDiQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1N6wCB9AEeWH-6iI1-tDiQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdV81qKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdV816KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdV82KKFEeWzz4qbGzYR8w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1OVmxB9AEeWH-6iI1-tDiQ" type="StereotypeCommentLink" source="_IeXV4AR6EeWwIrWko-AbkA" target="_1OVmwB9AEeWH-6iI1-tDiQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1OVmxR9AEeWH-6iI1-tDiQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1OVmyR9AEeWH-6iI1-tDiQ" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_pdZAJKKFEeWzz4qbGzYR8w" type="StereotypeCommentLink" source="_IeXV4AR6EeWwIrWko-AbkA" target="_pdZAIKKFEeWzz4qbGzYR8w">
+      <styles xmi:type="notation:FontStyle" xmi:id="_pdZAJaKFEeWzz4qbGzYR8w"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdZnMKKFEeWzz4qbGzYR8w" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Interface" href="TrafficLights_Basic.uml#_J2xIsAR5EeWwIrWko-AbkA"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1OVmxh9AEeWH-6iI1-tDiQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OVmxx9AEeWH-6iI1-tDiQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1OVmyB9AEeWH-6iI1-tDiQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdZAJqKFEeWzz4qbGzYR8w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdZAJ6KFEeWzz4qbGzYR8w"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdZAKKKFEeWzz4qbGzYR8w"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_V7bQkAR9EeWwIrWko-AbkA" type="PapyrusUMLStateMachineDiagram" name="smd | TrafficLightIDProvider" measurementUnit="Pixel">
diff --git a/models/samples/TrafficLights/TrafficLights_Basic.uml b/models/samples/TrafficLights/TrafficLights_Basic.uml
index 01b182a..f6800c4 100644
--- a/models/samples/TrafficLights/TrafficLights_Basic.uml
+++ b/models/samples/TrafficLights/TrafficLights_Basic.uml
@@ -49,11 +49,11 @@
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_RfTDMHDzEeSwWKwNKw1iAA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_mQmXIGXrEeS_4daqvwyFrg" name="timer" aggregation="composite" isBehavior="true">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_mQmXIGXrEeS_4daqvwyFrg" name="timer" aggregation="composite" isBehavior="true" isService="false">
           <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_MxQZgGXsEeS_4daqvwyFrg"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Port" xmi:id="_qinMIHDyEeSwWKwNKw1iAA" name="betweenLights" type="_bilnMGXpEeS_4daqvwyFrg" aggregation="composite" isBehavior="true"/>
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_OC3EAAPcEeWyav08LGx7TQ" name="log" aggregation="composite">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_OC3EAAPcEeWyav08LGx7TQ" name="log" aggregation="composite" isBehavior="true" isService="false">
           <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Port" xmi:id="_m7YpQASLEeWVBr36vWtS8Q" name="iDProvider" visibility="protected" type="_J2gqAAR5EeWwIrWko-AbkA" isOrdered="true" aggregation="composite" isBehavior="true" isService="false"/>
@@ -111,7 +111,7 @@
             <subvertex xmi:type="uml:State" xmi:id="_QjrdkHD1EeSHgYnS5yntNQ" name="Initializing">
               <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_Vx2GIHGmEeSfbNhe044FSg" name="init_Ex_goLater" kind="exitPoint"/>
               <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_WKG1IHGmEeSfbNhe044FSg" name="init_Ex_goFirst" kind="exitPoint"/>
-              <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_0P5HUJ3NEeWcqpdcWE1HVA" name="EP1" kind="entryPoint"/>
+              <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_0P5HUJ3NEeWcqpdcWE1HVA" name="Init_EP_Init" kind="entryPoint"/>
               <entry xmi:type="uml:OpaqueBehavior" xmi:id="_lxUQMHasEeSNdv26s019Dg" name="initializing_EN">
                 <language>C++</language>
                 <body>log.show(&quot;[TrafficLights] # &quot;);
@@ -203,7 +203,7 @@
                   </effect>
                 </transition>
                 <subvertex xmi:type="uml:State" xmi:id="_B53HsHGpEeSfbNhe044FSg" name="synchronizing">
-                  <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_VSizoHGpEeSfbNhe044FSg" name="FA_En" kind="entryPoint"/>
+                  <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_VSizoHGpEeSfbNhe044FSg" name="Sync_EP_Init" kind="entryPoint"/>
                   <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_1DUdoHGpEeSfbNhe044FSg" name="FA_Ex" kind="exitPoint"/>
                   <entry xmi:type="uml:OpaqueBehavior" xmi:id="_wsNQcHasEeSNdv26s019Dg" name="Synchronizing_EN">
                     <language>C++</language>
@@ -490,7 +490,7 @@
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_Dd4-QQR9EeWwIrWko-AbkA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_sHBJAAR9EeWwIrWko-AbkA" name="log" aggregation="composite">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_sHBJAAR9EeWwIrWko-AbkA" name="log" aggregation="composite" isBehavior="true" isService="false">
           <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_6kIb0IeXEeSVyrlWP4nYew"/>
         </ownedAttribute>
         <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_NFejkAR9EeWwIrWko-AbkA" name="TrafficLightIDProvider_SM">
@@ -588,7 +588,7 @@
   <UMLRealTime:RTMessageSet xmi:id="_DOjwsGXrEeS_4daqvwyFrg" base_Interface="_lnDVwGXpEeS_4daqvwyFrg" rtMsgKind="out"/>
   <UMLRealTime:RTMessageSet xmi:id="_FM4ekGXrEeS_4daqvwyFrg" base_Interface="_mR97AGXpEeS_4daqvwyFrg" rtMsgKind="inOut"/>
   <UMLRealTime:RTPort xmi:id="_6qpmsHDyEeSwWKwNKw1iAA" base_Port="_qinMIHDyEeSwWKwNKw1iAA"/>
-  <UMLRealTime:RTPort xmi:id="_-OVv4HDyEeSwWKwNKw1iAA" base_Port="_mQmXIGXrEeS_4daqvwyFrg"/>
+  <UMLRealTime:RTPort xmi:id="_-OVv4HDyEeSwWKwNKw1iAA" isWired="false" base_Port="_mQmXIGXrEeS_4daqvwyFrg"/>
   <UMLRealTimeStateMach:RTStateMachine xmi:id="_gOKQcHY6EeS0RrgkTcb0nA" base_StateMachine="_WPSzkHY6EeS0RrgkTcb0nA"/>
   <UMLRealTimeStateMach:RTRegion xmi:id="_hmBbQHY6EeS0RrgkTcb0nA" base_Region="_ZxquIHY6EeS0RrgkTcb0nA"/>
   <UMLRealTimeStateMach:RTPseudostate xmi:id="_j2khkHY6EeS0RrgkTcb0nA" base_Pseudostate="_a3SSYHY6EeS0RrgkTcb0nA"/>
@@ -629,11 +629,11 @@
   <UMLRealTimeStateMach:RTState xmi:id="_45ULgHZOEeSIdNh1440eVA" base_State="_44-0XnZOEeSIdNh1440eVA"/>
   <UMLRealTime:CapsulePart xmi:id="_e6VrkHZPEeSIdNh1440eVA" base_Property="_W8C_UHZPEeSIdNh1440eVA"/>
   <UMLRealTime:RTPort xmi:id="_2_6c0ASLEeWVBr36vWtS8Q" isWired="false" base_Port="_m7YpQASLEeWVBr36vWtS8Q"/>
-  <UMLRealTime:RTPort xmi:id="_Ajg9MASQEeWVBr36vWtS8Q" base_Port="_OC3EAAPcEeWyav08LGx7TQ"/>
+  <UMLRealTime:RTPort xmi:id="_Ajg9MASQEeWVBr36vWtS8Q" isWired="false" base_Port="_OC3EAAPcEeWyav08LGx7TQ"/>
   <UMLRealTime:RTPort xmi:id="_grJNgAR7EeWwIrWko-AbkA" isNotification="true" isPublish="true" isWired="false" base_Port="_aIZ5QAR7EeWwIrWko-AbkA"/>
   <UMLRealTime:ProtocolContainer xmi:id="_J2mJkAR5EeWwIrWko-AbkA" base_Package="_J2jtUAR5EeWwIrWko-AbkA"/>
   <UMLRealTime:Capsule xmi:id="_ZqCpoAR4EeWwIrWko-AbkA" base_Class="_Zp3qgAR4EeWwIrWko-AbkA"/>
-  <UMLRealTime:RTPort xmi:id="_zj-m0ASeEeWVBr36vWtS8Q" base_Port="_sHBJAAR9EeWwIrWko-AbkA"/>
+  <UMLRealTime:RTPort xmi:id="_zj-m0ASeEeWVBr36vWtS8Q" isWired="false" base_Port="_sHBJAAR9EeWwIrWko-AbkA"/>
   <UMLRealTime:RTMessageSet xmi:id="_J2y94AR5EeWwIrWko-AbkA" base_Interface="_J2xIsAR5EeWwIrWko-AbkA" rtMsgKind="inOut"/>
   <UMLRealTime:RTMessageSet xmi:id="_J2uFYAR5EeWwIrWko-AbkA" base_Interface="_J2sQMAR5EeWwIrWko-AbkA" rtMsgKind="out"/>
   <UMLRealTime:RTMessageSet xmi:id="_J2pz8AR5EeWwIrWko-AbkA" base_Interface="_J2nXsAR5EeWwIrWko-AbkA"/>