diff --git a/tests/data/melodymodel/5_0/Melody Model Test.aird b/tests/data/melodymodel/5_0/Melody Model Test.aird
index 482f9c81f..ddb695cd6 100644
--- a/tests/data/melodymodel/5_0/Melody Model Test.aird	
+++ b/tests/data/melodymodel/5_0/Melody Model Test.aird	
@@ -12,7 +12,7 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#eeeb98a7-6063-4115-8b4b-40a51cc0df49"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg" changeId="58a7916e-f73e-4040-9b9c-b91a8313b87f">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#a94806d8-71bb-4eb8-987b-bdce6ca99cb8"/>
       </ownedRepresentationDescriptors>
@@ -48,7 +48,7 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Functional%20Chain%20Description']"/>
         <target xmi:type="org.polarsys.capella.core.data.fa:FunctionalChain" href="Melody%20Model%20Test.capella#dfc4341d-253a-4ae9-8a30-63a9d9faca39"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_RSYVoXPIEeyW3OIB4qRWZA" name="[LFCD] Test Chain" repPath="#_RSWgcHPIEeyW3OIB4qRWZA" changeId="372ed948-04e0-4da8-a18a-19d5e5d12929">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_RSYVoXPIEeyW3OIB4qRWZA" name="[LFCD] Test Chain" repPath="#_RSWgcHPIEeyW3OIB4qRWZA" changeId="caaf2e3e-3c16-4408-9e98-27d58b9e1e96">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Functional%20Chain%20Description']"/>
         <target xmi:type="org.polarsys.capella.core.data.fa:FunctionalChain" href="Melody%20Model%20Test.capella#22b9c1d6-a754-4614-9fcb-fa4f53837d9a"/>
       </ownedRepresentationDescriptors>
@@ -1691,7 +1691,7 @@
                 <styles xmi:type="notation:DrawerStyle" xmi:id="_o9zgR6yJEeqCdMaqCWkrKg"/>
               </children>
               <styles xmi:type="notation:ShapeStyle" xmi:id="_o9zgQayJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9zgQqyJEeqCdMaqCWkrKg" width="667" height="252"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9zgQqyJEeqCdMaqCWkrKg" width="667" height="173"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_o9y5MqyJEeqCdMaqCWkrKg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_o9y5M6yJEeqCdMaqCWkrKg"/>
@@ -1716,39 +1716,39 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_p_Lds6yJEeqCdMaqCWkrKg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_p_K2oayJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p_K2oqyJEeqCdMaqCWkrKg" x="299" y="330"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p_K2oqyJEeqCdMaqCWkrKg" x="299" y="320"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_KLMusayJEeqCdMaqCWkrKg"/>
         <edges xmi:type="notation:Edge" xmi:id="_uKhcwKyJEeqCdMaqCWkrKg" type="4001" element="_uJyc8KyJEeqCdMaqCWkrKg" source="_p_K2oKyJEeqCdMaqCWkrKg" target="_o9ySIKyJEeqCdMaqCWkrKg">
           <children xmi:type="notation:Node" xmi:id="_uKj5AKyJEeqCdMaqCWkrKg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKj5AayJEeqCdMaqCWkrKg" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKj5AayJEeqCdMaqCWkrKg" x="4" y="-99"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uKluMKyJEeqCdMaqCWkrKg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKluMayJEeqCdMaqCWkrKg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKluMayJEeqCdMaqCWkrKg" x="-8" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uKm8UKyJEeqCdMaqCWkrKg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKm8UayJEeqCdMaqCWkrKg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKm8UayJEeqCdMaqCWkrKg" x="-2" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_uKhcwayJEeqCdMaqCWkrKg"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_uKhcwqyJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKhcw6yJEeqCdMaqCWkrKg" points="[0, 0, 0, 29]$[0, -29, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKhcw6yJEeqCdMaqCWkrKg" points="[0, 0, 0, 21]$[0, -99, 0, -78]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oKyJEeqCdMaqCWkrKg" id="(0.1891891891891892,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oayJEeqCdMaqCWkrKg" id="(0.4484304932735426,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oayJEeqCdMaqCWkrKg" id="(0.4484304932735426,1.3881019830028327)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_uoi1gKyJEeqCdMaqCWkrKg" type="4001" element="_uoAC9KyJEeqCdMaqCWkrKg" source="_o9ySIKyJEeqCdMaqCWkrKg" target="_p_K2oKyJEeqCdMaqCWkrKg">
           <children xmi:type="notation:Node" xmi:id="_uoi1hKyJEeqCdMaqCWkrKg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1hayJEeqCdMaqCWkrKg" x="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1hayJEeqCdMaqCWkrKg" x="-3" y="-109"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uoi1hqyJEeqCdMaqCWkrKg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1h6yJEeqCdMaqCWkrKg" x="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1h6yJEeqCdMaqCWkrKg" x="12"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uojckKyJEeqCdMaqCWkrKg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uojckayJEeqCdMaqCWkrKg" x="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uojckayJEeqCdMaqCWkrKg" x="-25"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_uoi1gayJEeqCdMaqCWkrKg"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_uoi1gqyJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoi1g6yJEeqCdMaqCWkrKg" points="[0, 0, 0, -29]$[0, 29, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojckqyJEeqCdMaqCWkrKg" id="(0.5530642750373692,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoi1g6yJEeqCdMaqCWkrKg" points="[0, -78, 0, -99]$[0, 21, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojckqyJEeqCdMaqCWkrKg" id="(0.5530642750373692,1.3881019830028327)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojck6yJEeqCdMaqCWkrKg" id="(0.8198198198198198,0.0)"/>
         </edges>
       </data>
@@ -1858,7 +1858,7 @@
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Region']"/>
       </ownedDiagramElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uJyc8KyJEeqCdMaqCWkrKg" sourceNode="_p-qgUKyJEeqCdMaqCWkrKg" targetNode="_o9NqYKyJEeqCdMaqCWkrKg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uJyc8KyJEeqCdMaqCWkrKg" name="(WHEN) Early in the morning [SUN=1] " sourceNode="_p-qgUKyJEeqCdMaqCWkrKg" targetNode="_o9NqYKyJEeqCdMaqCWkrKg">
       <target xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#88d7f9a7-1fae-4884-8233-7582153cc5a7"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#88d7f9a7-1fae-4884-8233-7582153cc5a7"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uJzEAKyJEeqCdMaqCWkrKg" strokeColor="0,0,0">
@@ -1867,7 +1867,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@edgeMappings[name='MSM_Transition']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" name="(AT) Night, (WHEN) Sleeping [SUN=0] " sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
       <target xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uoAC9ayJEeqCdMaqCWkrKg" strokeColor="0,0,0">
@@ -13624,7 +13624,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Functional%20Chain%20Description']/@defaultLayer/@nodeMappings[name='FC_AbstractFunction']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNode" uid="_TmY_o3PIEeyW3OIB4qRWZA" name="teach  Potions" visible="false" width="10" height="5" resizeKind="NSEW">
+    <ownedDiagramElements xmi:type="diagram:DNode" uid="_TmY_o3PIEeyW3OIB4qRWZA" name="Teaching" visible="false" width="10" height="5" resizeKind="NSEW">
       <target xmi:type="org.polarsys.capella.core.data.fa:FunctionalChainInvolvementFunction" href="Melody%20Model%20Test.capella#8d80bc57-be92-47db-8a53-0dd2b518f6f6"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.fa:FunctionalChainInvolvementFunction" href="Melody%20Model%20Test.capella#8d80bc57-be92-47db-8a53-0dd2b518f6f6"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.la:LogicalFunction" href="Melody%20Model%20Test.capella#a7acb298-d14b-4707-a419-fea272434541"/>
diff --git a/tests/data/melodymodel/5_0/Melody Model Test.capella b/tests/data/melodymodel/5_0/Melody Model Test.capella
index 4e3f8c5ec..f908aa230 100644
--- a/tests/data/melodymodel/5_0/Melody Model Test.capella	
+++ b/tests/data/melodymodel/5_0/Melody Model Test.capella	
@@ -802,6 +802,61 @@ The predator is far away</bodies>
             id="37419abe-6c8e-42b2-a721-2b9cad51c689" name="float"/>
         <ownedDataTypes xsi:type="org.polarsys.capella.core.data.information.datatype:StringType"
             id="bc78f82d-aebc-4090-98da-86024629b383" name="str"/>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:ChangeEvent"
+            id="1b6f7817-569d-48b9-9ff3-b29bdca070ba" name="ChangeEvent 1" expression="#7e927ae4-f457-41a9-8d2f-3a42ab51b9e3">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="7e927ae4-f457-41a9-8d2f-3a42ab51b9e3" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="0dd849c7-cb67-4b1f-9e11-244cab0feb68">
+              <bodies>Early in the morning</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:TimeEvent"
+            id="3aa5695d-5cfa-49c3-b017-4d675b1e8342" name="TimeEvent 2" expression="#de567360-249b-4186-bd6d-ba166543ac1c">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="de567360-249b-4186-bd6d-ba166543ac1c" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="14fd463f-b242-453b-9c86-e3f2e1e886c7">
+              <bodies>Night</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:ChangeEvent"
+            id="77687971-34ea-40a4-972c-bd367029a516" name="ChangeEvent 3" expression="#f5544fa2-14be-4780-9da3-4b72b73630f1">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="f5544fa2-14be-4780-9da3-4b72b73630f1" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="7d189cbc-e514-47c9-babf-7bc353438460">
+              <bodies>Sun goes down</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:TimeEvent"
+            id="545a46d7-5786-4c4a-bcc9-b79e634903e0" name="TimeEvent 4" expression="#782c3969-0e4a-487a-b3df-6bab888b1eb8">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="782c3969-0e4a-487a-b3df-6bab888b1eb8" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="b2917c1b-b402-41db-8b26-af9805e6bc34">
+              <bodies>Night</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:ChangeEvent"
+            id="bacb091d-2b72-4826-8c1f-165141f226c1" name="ChangeEvent 5" expression="#c26a34b6-9c19-49bf-beae-01b543bdbd43">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="c26a34b6-9c19-49bf-beae-01b543bdbd43" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="0c7fb953-b225-4511-a959-12135421cd48">
+              <bodies>Sleeping</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
       </ownedDataPkg>
       <ownedRolePkg xsi:type="org.polarsys.capella.core.data.oa:RolePkg" id="bb3da84b-3be8-4d66-bb9d-38a4a485d149"
           name="Roles">
@@ -883,11 +938,33 @@ The predator is far away</bodies>
                       id="30f0aca9-150e-478e-8f27-5a2985b25f61" name="region"/>
                 </ownedStates>
                 <ownedTransitions xsi:type="org.polarsys.capella.core.data.capellacommon:StateTransition"
-                    id="88d7f9a7-1fae-4884-8233-7582153cc5a7" triggerDescription=""
-                    source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e"/>
+                    id="88d7f9a7-1fae-4884-8233-7582153cc5a7" name="Sunrise event"
+                    triggerDescription="" guard="#9a5d43a1-dad2-4687-b78e-f275015e7ac2"
+                    source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e"
+                    triggers="#1b6f7817-569d-48b9-9ff3-b29bdca070ba">
+                  <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+                      id="9a5d43a1-dad2-4687-b78e-f275015e7ac2" name="">
+                    <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                        id="96290ff7-9dac-4236-9cd3-06b8fc978dec">
+                      <bodies>SUN=1</bodies>
+                      <languages>capella:linkedText</languages>
+                    </ownedSpecification>
+                  </ownedConstraints>
+                </ownedTransitions>
                 <ownedTransitions xsi:type="org.polarsys.capella.core.data.capellacommon:StateTransition"
-                    id="d0ea4afa-4231-4a3d-b1db-03655738dab8" triggerDescription=""
-                    source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0"/>
+                    id="d0ea4afa-4231-4a3d-b1db-03655738dab8" name="Sunfall event"
+                    triggerDescription="" guard="#21e2b3fb-43cf-4826-99b9-b0a9f5d38a38"
+                    source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0"
+                    triggers="#545a46d7-5786-4c4a-bcc9-b79e634903e0 #bacb091d-2b72-4826-8c1f-165141f226c1">
+                  <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+                      id="21e2b3fb-43cf-4826-99b9-b0a9f5d38a38" name="">
+                    <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                        id="ad134f43-60b4-41e9-be6f-7106eea33a86">
+                      <bodies>SUN=0</bodies>
+                      <languages>capella:linkedText</languages>
+                    </ownedSpecification>
+                  </ownedConstraints>
+                </ownedTransitions>
               </ownedRegions>
             </ownedStateMachines>
           </ownedEntities>
diff --git a/tests/data/melodymodel/5_2/Melody Model Test.aird b/tests/data/melodymodel/5_2/Melody Model Test.aird
index 4f8029b44..b1549ab89 100644
--- a/tests/data/melodymodel/5_2/Melody Model Test.aird	
+++ b/tests/data/melodymodel/5_2/Melody Model Test.aird	
@@ -8,11 +8,11 @@
     </ownedViews>
     <ownedViews xmi:type="viewpoint:DView" uid="__FJxoKDzEeqf7Mw7EIo_Ew">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_7Ft7QKrxEeqOgqWuHJrXFA" documentation="&lt;p>This diagram shows the states that a Functional Human Being can have, as well as how it transitions between them.&lt;/p>&#xA;" name="[MSM] States of Functional Human Being" repPath="#_7FWu4KrxEeqOgqWuHJrXFA" changeId="fba16650-bdda-4b1d-b8a6-ca9d175a51d7">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_7Ft7QKrxEeqOgqWuHJrXFA" documentation="&lt;p>This diagram shows the states that a Functional Human Being can have, as well as how it transitions between them.&lt;/p>&#xA;" name="[MSM] States of Functional Human Being" repPath="#_7FWu4KrxEeqOgqWuHJrXFA" changeId="5752979d-da99-486d-b94f-add5c81d2fdf">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#eeeb98a7-6063-4115-8b4b-40a51cc0df49"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg" changeId="d229f163-d6ec-4ecf-88d2-b951b78beec5">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg" changeId="ad7ad644-891d-4133-bfa7-a2428cafaa7a">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#a94806d8-71bb-4eb8-987b-bdce6ca99cb8"/>
       </ownedRepresentationDescriptors>
@@ -700,6 +700,22 @@
                   <styles xmi:type="notation:FontStyle" xmi:id="_ificMrCCEeqP7JXhmLvOsg" fontName="Segoe UI" fontHeight="8"/>
                   <layoutConstraint xmi:type="notation:Location" xmi:id="_ificM7CCEeqP7JXhmLvOsg"/>
                 </children>
+                <children xmi:type="notation:Node" xmi:id="_Axl6YJV_Ee29rfs-jvAL5Q" type="3010" element="_AwwM4pV_Ee29rfs-jvAL5Q">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_Axl6YZV_Ee29rfs-jvAL5Q" fontName="Fira Code" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Axl6YpV_Ee29rfs-jvAL5Q"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AxnvkJV_Ee29rfs-jvAL5Q" type="3010" element="_Awz3QJV_Ee29rfs-jvAL5Q">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_AxnvkZV_Ee29rfs-jvAL5Q" fontName="Fira Code" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AxnvkpV_Ee29rfs-jvAL5Q"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Axnvk5V_Ee29rfs-jvAL5Q" type="3010" element="_Aw0eUZV_Ee29rfs-jvAL5Q">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_AxnvlJV_Ee29rfs-jvAL5Q" fontName="Fira Code" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AxnvlZV_Ee29rfs-jvAL5Q"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_AxoWoJV_Ee29rfs-jvAL5Q" type="3010" element="_Aw1FYZV_Ee29rfs-jvAL5Q">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_AxoWoZV_Ee29rfs-jvAL5Q" fontName="Fira Code" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AxoWopV_Ee29rfs-jvAL5Q"/>
+                </children>
                 <styles xmi:type="notation:SortingStyle" xmi:id="_ifh1JbCCEeqP7JXhmLvOsg"/>
                 <styles xmi:type="notation:FilteringStyle" xmi:id="_ifh1JrCCEeqP7JXhmLvOsg"/>
                 <styles xmi:type="notation:DrawerStyle" xmi:id="_ificMLCCEeqP7JXhmLvOsg"/>
@@ -1356,6 +1372,38 @@
           </ownedStyle>
           <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_DoActivity']"/>
         </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" uid="_AwwM4pV_Ee29rfs-jvAL5Q" name=" entry / Make Food">
+          <target xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#0e0164c3-076e-42c1-8f82-7a43ab84385c"/>
+          <semanticElements xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#0e0164c3-076e-42c1-8f82-7a43ab84385c"/>
+          <ownedStyle xmi:type="diagram:BundledImage" uid="_AwxbAJV_Ee29rfs-jvAL5Q" showIcon="false" labelAlignment="LEFT" labelPosition="node">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Entry']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Entry']"/>
+        </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" uid="_Awz3QJV_Ee29rfs-jvAL5Q" name=" exit / Sleep">
+          <target xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#ab016025-d456-4c2d-8359-d50cf9de3825"/>
+          <semanticElements xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#ab016025-d456-4c2d-8359-d50cf9de3825"/>
+          <ownedStyle xmi:type="diagram:BundledImage" uid="_Aw0eUJV_Ee29rfs-jvAL5Q" showIcon="false" labelAlignment="LEFT" labelPosition="node">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']"/>
+        </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" uid="_Aw0eUZV_Ee29rfs-jvAL5Q" name=" exit / Play games">
+          <target xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#f33bd79c-fa90-4c09-942b-581dc7f07d84"/>
+          <semanticElements xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#f33bd79c-fa90-4c09-942b-581dc7f07d84"/>
+          <ownedStyle xmi:type="diagram:BundledImage" uid="_Aw1FYJV_Ee29rfs-jvAL5Q" showIcon="false" labelAlignment="LEFT" labelPosition="node">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']"/>
+        </ownedElements>
+        <ownedElements xmi:type="diagram:DNodeListElement" uid="_Aw1FYZV_Ee29rfs-jvAL5Q" name=" exit / Search for animals">
+          <target xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#04babdbf-6cf6-4846-a207-bf27cfc8eb32"/>
+          <semanticElements xmi:type="org.polarsys.capella.core.data.oa:OperationalActivity" href="Melody%20Model%20Test.capella#04babdbf-6cf6-4846-a207-bf27cfc8eb32"/>
+          <ownedStyle xmi:type="diagram:BundledImage" uid="_Aw1FYpV_Ee29rfs-jvAL5Q" showIcon="false" labelAlignment="LEFT" labelPosition="node">
+            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Activities']/@subNodeMappings[name='MSM_Exit']"/>
+        </ownedElements>
       </ownedDiagramElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_Y_5QAKryEeqOgqWuHJrXFA" name="Cooking" outgoingEdges="_i8e08KryEeqOgqWuHJrXFA" incomingEdges="_CNeHcKr6EeqOgqWuHJrXFA" childrenPresentation="VerticalStack">
@@ -1681,7 +1729,7 @@
                 <styles xmi:type="notation:DrawerStyle" xmi:id="_o9zgR6yJEeqCdMaqCWkrKg"/>
               </children>
               <styles xmi:type="notation:ShapeStyle" xmi:id="_o9zgQayJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9zgQqyJEeqCdMaqCWkrKg" width="667" height="252"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o9zgQqyJEeqCdMaqCWkrKg" width="667" height="154"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_o9y5MqyJEeqCdMaqCWkrKg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_o9y5M6yJEeqCdMaqCWkrKg"/>
@@ -1706,40 +1754,40 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_p_Lds6yJEeqCdMaqCWkrKg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_p_K2oayJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p_K2oqyJEeqCdMaqCWkrKg" x="299" y="330"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p_K2oqyJEeqCdMaqCWkrKg" x="299" y="280"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_KLMusayJEeqCdMaqCWkrKg"/>
         <edges xmi:type="notation:Edge" xmi:id="_uoi1gKyJEeqCdMaqCWkrKg" type="4001" element="_uoAC9KyJEeqCdMaqCWkrKg" source="_o9ySIKyJEeqCdMaqCWkrKg" target="_p_K2oKyJEeqCdMaqCWkrKg">
           <children xmi:type="notation:Node" xmi:id="_uoi1hKyJEeqCdMaqCWkrKg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1hayJEeqCdMaqCWkrKg" x="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1hayJEeqCdMaqCWkrKg" x="2" y="-105"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uoi1hqyJEeqCdMaqCWkrKg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1h6yJEeqCdMaqCWkrKg" x="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uoi1h6yJEeqCdMaqCWkrKg" x="17"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uojckKyJEeqCdMaqCWkrKg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uojckayJEeqCdMaqCWkrKg" x="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uojckayJEeqCdMaqCWkrKg" x="-31"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_uoi1gayJEeqCdMaqCWkrKg"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_uoi1gqyJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoi1g6yJEeqCdMaqCWkrKg" points="[0, 0, 0, -29]$[0, 29, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojckqyJEeqCdMaqCWkrKg" id="(0.5530642750373692,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uoi1g6yJEeqCdMaqCWkrKg" points="[0, -98, 0, -78]$[0, -20, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojckqyJEeqCdMaqCWkrKg" id="(0.5530642750373692,1.5384615384615385)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uojck6yJEeqCdMaqCWkrKg" id="(0.8198198198198198,0.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_uKhcwKyJEeqCdMaqCWkrKg" type="4001" element="_uJyc8KyJEeqCdMaqCWkrKg" source="_p_K2oKyJEeqCdMaqCWkrKg" target="_o9ySIKyJEeqCdMaqCWkrKg">
           <children xmi:type="notation:Node" xmi:id="_uKj5AKyJEeqCdMaqCWkrKg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKj5AayJEeqCdMaqCWkrKg" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKj5AayJEeqCdMaqCWkrKg" x="-3" y="-101" width="178" height="41"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uKluMKyJEeqCdMaqCWkrKg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKluMayJEeqCdMaqCWkrKg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKluMayJEeqCdMaqCWkrKg" x="34" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uKm8UKyJEeqCdMaqCWkrKg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKm8UayJEeqCdMaqCWkrKg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKm8UayJEeqCdMaqCWkrKg" x="-8" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_uKhcwayJEeqCdMaqCWkrKg"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_uKhcwqyJEeqCdMaqCWkrKg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKhcw6yJEeqCdMaqCWkrKg" points="[0, 0, 0, 29]$[0, -29, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKhcw6yJEeqCdMaqCWkrKg" points="[0, 0, 0, -20]$[0, -78, 0, -98]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oKyJEeqCdMaqCWkrKg" id="(0.1891891891891892,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oayJEeqCdMaqCWkrKg" id="(0.4484304932735426,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKp_oayJEeqCdMaqCWkrKg" id="(0.4484304932735426,1.5384615384615385)"/>
         </edges>
       </data>
     </ownedAnnotationEntries>
@@ -1848,7 +1896,7 @@
         <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@containerMappings[name='MSM_ModeState_Container']/@subContainerMappings[name='MSM_Region']"/>
       </ownedDiagramElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uJyc8KyJEeqCdMaqCWkrKg" sourceNode="_p-qgUKyJEeqCdMaqCWkrKg" targetNode="_o9NqYKyJEeqCdMaqCWkrKg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uJyc8KyJEeqCdMaqCWkrKg" name="(WHEN) Early in the morning [SUN=1] " sourceNode="_p-qgUKyJEeqCdMaqCWkrKg" targetNode="_o9NqYKyJEeqCdMaqCWkrKg">
       <target xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#88d7f9a7-1fae-4884-8233-7582153cc5a7"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#88d7f9a7-1fae-4884-8233-7582153cc5a7"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uJzEAKyJEeqCdMaqCWkrKg" strokeColor="0,0,0">
@@ -1857,7 +1905,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@edgeMappings[name='MSM_Transition']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" name="(AT) Night, (WHEN) Sleeping [SUN = 0] " sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
       <target xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uoAC9ayJEeqCdMaqCWkrKg" strokeColor="0,0,0">
diff --git a/tests/data/melodymodel/5_2/Melody Model Test.capella b/tests/data/melodymodel/5_2/Melody Model Test.capella
index f0c8eaf66..f8113e57e 100644
--- a/tests/data/melodymodel/5_2/Melody Model Test.capella	
+++ b/tests/data/melodymodel/5_2/Melody Model Test.capella	
@@ -741,6 +741,50 @@ The predator is far away</bodies>
             id="fed1cc38-6dcd-45f3-bcd9-66177f33afee" name="not so good advise" exchangeMechanism="FLOW"/>
         <ownedClasses xsi:type="org.polarsys.capella.core.data.information:Class"
             id="8164ae8b-36d5-4502-a184-5ec064db4ec3" name="Twist"/>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:TimeEvent"
+            id="8f41d4b7-7d84-45e8-bdc2-bbb1846f8fb6" name="TimeEvent 1" expression="#9cc93554-77a2-49ae-8351-fa1d1b8d44d4">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="9cc93554-77a2-49ae-8351-fa1d1b8d44d4" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="a0ec8fe8-d224-40f8-8198-59c9d764c52c">
+              <bodies> juanvaccarezza c</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:ChangeEvent"
+            id="52723f9d-0f6d-48a4-933d-af416ba9d387" name="ChangeEvent 2" expression="#a0b4da07-ac02-4be3-9c4c-b230372b9d86">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="a0b4da07-ac02-4be3-9c4c-b230372b9d86" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="074a0aa1-3742-4dbb-b9da-ef38ea46332a">
+              <bodies>Early in the morning</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:TimeEvent"
+            id="680f13b6-c446-4510-974f-0de9da6bd2be" name="TimeEvent 3" expression="#20925467-cfbf-47bc-bad6-ad842973f4d4">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="20925467-cfbf-47bc-bad6-ad842973f4d4" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="1ef4d880-a8be-4b5c-83d7-a298f956bc91">
+              <bodies>Night</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
+        <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:ChangeEvent"
+            id="6e5d7b39-08a5-4146-bcb8-4091f127ae80" name="ChangeEvent 4" expression="#98abe98f-6b2b-46b4-9cd3-d335ec5a9680">
+          <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+              id="98abe98f-6b2b-46b4-9cd3-d335ec5a9680" name="">
+            <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                id="3d88945a-10f6-4780-9559-a1472bc245c0">
+              <bodies>Sleeping</bodies>
+              <languages>capella:linkedText</languages>
+            </ownedSpecification>
+          </ownedConstraints>
+        </ownedStateEvents>
       </ownedDataPkg>
       <ownedRolePkg xsi:type="org.polarsys.capella.core.data.oa:RolePkg" id="bb3da84b-3be8-4d66-bb9d-38a4a485d149"
           name="Roles">
@@ -822,11 +866,33 @@ The predator is far away</bodies>
                       id="30f0aca9-150e-478e-8f27-5a2985b25f61" name="region"/>
                 </ownedStates>
                 <ownedTransitions xsi:type="org.polarsys.capella.core.data.capellacommon:StateTransition"
-                    id="88d7f9a7-1fae-4884-8233-7582153cc5a7" triggerDescription=""
-                    source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e"/>
+                    id="88d7f9a7-1fae-4884-8233-7582153cc5a7" name="Sunrise event"
+                    triggerDescription="Does what it does" guard="#07787761-cc85-4947-8c27-746548fb8d78"
+                    source="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0" target="#91dc2eec-c878-4fdb-91d8-8f4a4527424e"
+                    triggers="#52723f9d-0f6d-48a4-933d-af416ba9d387">
+                  <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+                      id="07787761-cc85-4947-8c27-746548fb8d78" name="">
+                    <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                        id="1b9c43d1-64d4-4fc5-9f12-511c19509b24">
+                      <bodies>SUN=1</bodies>
+                      <languages>capella:linkedText</languages>
+                    </ownedSpecification>
+                  </ownedConstraints>
+                </ownedTransitions>
                 <ownedTransitions xsi:type="org.polarsys.capella.core.data.capellacommon:StateTransition"
-                    id="d0ea4afa-4231-4a3d-b1db-03655738dab8" triggerDescription=""
-                    source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0"/>
+                    id="d0ea4afa-4231-4a3d-b1db-03655738dab8" name="Sunfall event"
+                    summary="" description="" triggerDescription="" guard="#b5821811-fabf-4f2a-ae43-7a36e634e067"
+                    source="#91dc2eec-c878-4fdb-91d8-8f4a4527424e" target="#0687f6ce-f5fe-4ef5-a549-829ff8d9e2d0"
+                    triggers="#680f13b6-c446-4510-974f-0de9da6bd2be #6e5d7b39-08a5-4146-bcb8-4091f127ae80">
+                  <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
+                      id="b5821811-fabf-4f2a-ae43-7a36e634e067" name="">
+                    <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"
+                        id="0bb26cca-24ad-4643-8394-3828a3ec6268">
+                      <bodies>SUN = 0</bodies>
+                      <languages>capella:linkedText</languages>
+                    </ownedSpecification>
+                  </ownedConstraints>
+                </ownedTransitions>
               </ownedRegions>
             </ownedStateMachines>
           </ownedEntities>
diff --git a/tests/test_svg.py b/tests/test_svg.py
index d9540e89a..fde07a721 100644
--- a/tests/test_svg.py
+++ b/tests/test_svg.py
@@ -30,6 +30,7 @@
     "[OCB] Operational Capabilities",
     "[OPD] Obtain food via hunting",
     "[MSM] States of Functional Human Being",
+    "[MSM] Weather Modes",
     "[SAB] System",
     "[OEBD] Operational Context",
     "[PAB] Physical System",